Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-09-14 14:37:18 +0300
committerValery Sizov <vsv2711@gmail.com>2015-09-14 14:37:18 +0300
commit4c53cc0ebac36560d806732ff1fefba9206c75f3 (patch)
treeb617210202a10c2913075f5c21fd3b583fdfea2c /spec/models
parent95037c9c559dae1d4482a2003ca2f0f778678d09 (diff)
rubocop satisfy
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/ci/build_spec.rb26
-rw-r--r--spec/models/ci/mail_service_spec.rb16
-rw-r--r--spec/models/ci/project_spec.rb16
3 files changed, 29 insertions, 29 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index b62c5862c0c..4f57003565a 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -211,14 +211,14 @@ describe Ci::Build do
end
describe :options do
- let(:options) {
+ let(:options) do
{
- :image => "ruby:2.1",
- :services => [
+ image: "ruby:2.1",
+ services: [
"postgres"
]
}
- }
+ end
subject { build.options }
it { is_expected.to eq(options) }
@@ -308,20 +308,20 @@ describe Ci::Build do
context 'returns variables' do
subject { build.variables }
- let(:variables) {
+ let(:variables) do
[
- {key: :DB_NAME, value: 'postgres', public: true}
+ { key: :DB_NAME, value: 'postgres', public: true }
]
- }
+ end
it { is_expected.to eq(variables) }
context 'and secure variables' do
- let(:secure_variables) {
+ let(:secure_variables) do
[
- {key: 'SECRET_KEY', value: 'secret_value', public: false}
+ { key: 'SECRET_KEY', value: 'secret_value', public: false }
]
- }
+ end
before do
build.project.variables << Ci::Variable.new(key: 'SECRET_KEY', value: 'secret_value')
@@ -332,11 +332,11 @@ describe Ci::Build do
context 'and trigger variables' do
let(:trigger) { FactoryGirl.create :ci_trigger, project: project }
let(:trigger_request) { FactoryGirl.create :ci_trigger_request_with_variables, commit: commit, trigger: trigger }
- let(:trigger_variables) {
+ let(:trigger_variables) do
[
- {key: :TRIGGER_KEY, value: 'TRIGGER_VALUE', public: false}
+ { key: :TRIGGER_KEY, value: 'TRIGGER_VALUE', public: false }
]
- }
+ end
before do
build.trigger_request = trigger_request
diff --git a/spec/models/ci/mail_service_spec.rb b/spec/models/ci/mail_service_spec.rb
index e3f326d783b..51511641afc 100644
--- a/spec/models/ci/mail_service_spec.rb
+++ b/spec/models/ci/mail_service_spec.rb
@@ -75,12 +75,12 @@ describe Ci::MailService do
end
describe 'successfull build and project has email_recipients' do
- let(:project) {
+ let(:project) do
FactoryGirl.create(:ci_project,
email_add_pusher: true,
email_only_broken_builds: false,
email_recipients: "jeroen@example.com")
- }
+ end
let(:commit) { FactoryGirl.create(:ci_commit, project: project) }
let(:build) { FactoryGirl.create(:ci_build, status: :success, commit: commit) }
@@ -103,12 +103,12 @@ describe Ci::MailService do
end
describe 'successful build and notify only broken builds' do
- let(:project) {
+ let(:project) do
FactoryGirl.create(:ci_project,
email_add_pusher: true,
email_only_broken_builds: true,
email_recipients: "jeroen@example.com")
- }
+ end
let(:commit) { FactoryGirl.create(:ci_commit, project: project) }
let(:build) { FactoryGirl.create(:ci_build, status: :success, commit: commit) }
@@ -131,12 +131,12 @@ describe Ci::MailService do
end
describe 'successful build and can test service' do
- let(:project) {
+ let(:project) do
FactoryGirl.create(:ci_project,
email_add_pusher: true,
email_only_broken_builds: false,
email_recipients: "jeroen@example.com")
- }
+ end
let(:commit) { FactoryGirl.create(:ci_commit, project: project) }
let(:build) { FactoryGirl.create(:ci_build, status: :success, commit: commit) }
@@ -153,12 +153,12 @@ describe Ci::MailService do
end
describe 'retried build should not receive email' do
- let(:project) {
+ let(:project) do
FactoryGirl.create(:ci_project,
email_add_pusher: true,
email_only_broken_builds: true,
email_recipients: "jeroen@example.com")
- }
+ end
let(:commit) { FactoryGirl.create(:ci_commit, project: project) }
let(:build) { FactoryGirl.create(:ci_build, status: :failed, commit: commit) }
diff --git a/spec/models/ci/project_spec.rb b/spec/models/ci/project_spec.rb
index 1be276a9ef8..48f76e11ce9 100644
--- a/spec/models/ci/project_spec.rb
+++ b/spec/models/ci/project_spec.rb
@@ -94,33 +94,33 @@ describe Ci::Project do
end
describe '#broken_or_success?' do
- it {
+ it do
project = FactoryGirl.create :ci_project, email_add_pusher: true
allow(project).to receive(:broken?).and_return(true)
allow(project).to receive(:success?).and_return(true)
expect(project.broken_or_success?).to eq(true)
- }
+ end
- it {
+ it do
project = FactoryGirl.create :ci_project, email_add_pusher: true
allow(project).to receive(:broken?).and_return(true)
allow(project).to receive(:success?).and_return(false)
expect(project.broken_or_success?).to eq(true)
- }
+ end
- it {
+ it do
project = FactoryGirl.create :ci_project, email_add_pusher: true
allow(project).to receive(:broken?).and_return(false)
allow(project).to receive(:success?).and_return(true)
expect(project.broken_or_success?).to eq(true)
- }
+ end
- it {
+ it do
project = FactoryGirl.create :ci_project, email_add_pusher: true
allow(project).to receive(:broken?).and_return(false)
allow(project).to receive(:success?).and_return(false)
expect(project.broken_or_success?).to eq(false)
- }
+ end
end
describe 'Project.parse' do