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:
authorRydkin Maxim <maks.rydkin@gmail.com>2017-03-18 17:49:01 +0300
committerRydkin Maxim <maks.rydkin@gmail.com>2017-04-04 21:11:24 +0300
commitb5c286995c350557fa96ab4b634c8495fa5e4888 (patch)
tree51885eba7e4509e42bc5e3c679c74a1153e6cb49 /spec/services
parenteffcbaf372001b238741fa1174dad588ef190b61 (diff)
fix rubocop
Diffstat (limited to 'spec/services')
-rw-r--r--spec/services/ci/create_pipeline_service_spec.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb
index 4c23a371484..b89ed7dcf44 100644
--- a/spec/services/ci/create_pipeline_service_spec.rb
+++ b/spec/services/ci/create_pipeline_service_spec.rb
@@ -39,17 +39,17 @@ describe Ci::CreatePipelineService, services: true do
)
end
- def previous_commit_sha_from_ref(ref)
- project.commit(ref).parent.sha
- end
-
before do
project.update(auto_cancel_pending_pipelines: 'enabled')
end
+ def previous_commit_sha_from_ref(ref)
+ project.commit(ref).parent.sha
+ end
+
it 'does not cancel HEAD pipeline' do
pipeline
- previous_pipeline = pipeline_on_previous_commit
+ pipeline_on_previous_commit
expect(pipeline.reload)
.to have_attributes(status: 'pending', auto_canceled_by_id: nil)