Commit 41b5bb57 authored by Rémy Coutable's avatar Rémy Coutable 🏔

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
parents 1a430836 0f5ccd38
Pipeline #17153153 passed with stages
in 34 minutes and 29 seconds
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment