diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-05-02 15:54:06 +0200 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-05-02 15:54:06 +0200 |
| commit | fc42ba6c5da7c99cc3ad393cf23299d1051d8447 (patch) | |
| tree | dff01aa9a0c3d24e65800668c29a565018d04b43 /spec/lib/gitlab/ci | |
| parent | d3327e0dfacd27d547ffdb3b7f4a1a76c76ae281 (diff) | |
| parent | 75f6e91fcde12029068f48b6b7fb3fd13a612c61 (diff) | |
| download | gitlab-ce-fc42ba6c5da7c99cc3ad393cf23299d1051d8447.tar.gz | |
Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui
Diffstat (limited to 'spec/lib/gitlab/ci')
| -rw-r--r-- | spec/lib/gitlab/ci/pipeline/chain/create_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/ci/pipeline/seed/stage_spec.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb index dc12ba076bc..0edc3f315bb 100644 --- a/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb +++ b/spec/lib/gitlab/ci/pipeline/chain/create_spec.rb @@ -17,7 +17,7 @@ describe Gitlab::Ci::Pipeline::Chain::Create do context 'when pipeline is ready to be saved' do before do - pipeline.stages.build(name: 'test', project: project) + pipeline.stages.build(name: 'test', position: 0, project: project) step.perform! end diff --git a/spec/lib/gitlab/ci/pipeline/seed/stage_spec.rb b/spec/lib/gitlab/ci/pipeline/seed/stage_spec.rb index eb1b285c7bd..05ce3412fd8 100644 --- a/spec/lib/gitlab/ci/pipeline/seed/stage_spec.rb +++ b/spec/lib/gitlab/ci/pipeline/seed/stage_spec.rb @@ -24,7 +24,8 @@ describe Gitlab::Ci::Pipeline::Seed::Stage do describe '#attributes' do it 'returns hash attributes of a stage' do expect(subject.attributes).to be_a Hash - expect(subject.attributes).to include(:name, :project) + expect(subject.attributes) + .to include(:name, :position, :pipeline, :project) end end |