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:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-06-02 16:05:14 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-06-02 16:05:14 +0300
commit626cb8edc3f4421fe7e866c51fddc2715875ddda (patch)
tree9f2430c172dfdc64bf60829259c32b9a834c462c /spec/services/ci
parentfe0b2f81c7c9680a11288e0cdffc3e80dc1e8d58 (diff)
Fix invalid conditional in pipeline create service
Diffstat (limited to 'spec/services/ci')
-rw-r--r--spec/services/ci/create_pipeline_service_spec.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb
index 674de2d80c1..fe5de2ce227 100644
--- a/spec/services/ci/create_pipeline_service_spec.rb
+++ b/spec/services/ci/create_pipeline_service_spec.rb
@@ -9,10 +9,10 @@ describe Ci::CreatePipelineService, :services do
end
describe '#execute' do
- def execute_service(after: project.commit.id, message: 'Message', ref: 'refs/heads/master')
+ def execute_service(after_sha: project.commit.id, message: 'Message', ref: 'refs/heads/master')
params = { ref: ref,
before: '00000000',
- after: after,
+ after: after_sha,
commits: [{ message: message }] }
described_class.new(project, user, params).execute
@@ -30,6 +30,7 @@ describe Ci::CreatePipelineService, :services do
it 'creates a pipeline' do
expect(pipeline).to be_kind_of(Ci::Pipeline)
expect(pipeline).to be_valid
+ expect(pipeline).to be_persisted
expect(pipeline).to eq(project.pipelines.last)
expect(pipeline).to have_attributes(user: user)
expect(pipeline).to have_attributes(status: 'pending')