Merge branch '42798-fix-hardcoded-id-in-spinach' into 'master'

Resolve "features/project/commits/commits.feature is failing on master"

Closes #42798

See merge request gitlab-org/gitlab-ce!16940

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