diff options
author | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-02-12 12:48:31 -0600 |
---|---|---|
committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-02-12 12:48:31 -0600 |
commit | c833a09d9156e26851746250460ddd2f091e73cd (patch) | |
tree | 01791c2a8461b53c797b3d5b91858f98b07eb477 /features/steps/project/commits | |
parent | 46ae03628de47d1bef2683a3a5fe4963b3df7d52 (diff) | |
parent | 0a22ff267b2d3d787d3da44d927caac7bd442832 (diff) | |
download | gitlab-ce-c833a09d9156e26851746250460ddd2f091e73cd.tar.gz |
Merge branch 'master' into jivl-update-katex
Diffstat (limited to 'features/steps/project/commits')
-rw-r--r-- | features/steps/project/commits/commits.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb index bd3011b1cd8..959cf7d3e54 100644 --- a/features/steps/project/commits/commits.rb +++ b/features/steps/project/commits/commits.rb @@ -154,8 +154,8 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps step 'commit has ci status' do @project.enable_ci - pipeline = create :ci_pipeline, project: @project, sha: sample_commit.id - create :ci_build, pipeline: pipeline + @pipeline = create(:ci_pipeline, project: @project, sha: sample_commit.id) + create(:ci_build, pipeline: @pipeline) end step 'repository contains ".gitlab-ci.yml" file' do @@ -163,7 +163,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps end step 'I see commit ci info' do - expect(page).to have_content "Pipeline #1 pending" + expect(page).to have_content "Pipeline ##{@pipeline.id} pending" end step 'I search "submodules" commits' do |