diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-14 13:17:18 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-14 13:17:18 +0000 |
commit | 2d9e0f3ffb59a4323e794fcc4bf122274c82c67f (patch) | |
tree | f08836cc0be6254807f784d50cc228a20fc48e7a /spec/views | |
parent | 577832598f1b35187efafc426068ef7ac36ae09f (diff) | |
download | gitlab-ce-2d9e0f3ffb59a4323e794fcc4bf122274c82c67f.tar.gz |
Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'"revert-3a50fc5d
This reverts merge request !26853
Diffstat (limited to 'spec/views')
-rw-r--r-- | spec/views/projects/commit/_commit_box.html.haml_spec.rb | 4 | ||||
-rw-r--r-- | spec/views/projects/jobs/_build.html.haml_spec.rb | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/spec/views/projects/commit/_commit_box.html.haml_spec.rb b/spec/views/projects/commit/_commit_box.html.haml_spec.rb index 457dd2e940f..1086546c10d 100644 --- a/spec/views/projects/commit/_commit_box.html.haml_spec.rb +++ b/spec/views/projects/commit/_commit_box.html.haml_spec.rb @@ -27,7 +27,7 @@ describe 'projects/commit/_commit_box.html.haml' do render - expect(rendered).to have_text("Pipeline ##{third_pipeline.id} (##{third_pipeline.iid}) failed") + expect(rendered).to have_text("Pipeline ##{third_pipeline.id} failed") end end @@ -40,7 +40,7 @@ describe 'projects/commit/_commit_box.html.haml' do it 'shows correct pipeline description' do render - expect(rendered).to have_text "Pipeline ##{pipeline.id} (##{pipeline.iid}) " \ + expect(rendered).to have_text "Pipeline ##{pipeline.id} " \ 'waiting for manual action' end end diff --git a/spec/views/projects/jobs/_build.html.haml_spec.rb b/spec/views/projects/jobs/_build.html.haml_spec.rb index 97b25a6976f..1d58891036e 100644 --- a/spec/views/projects/jobs/_build.html.haml_spec.rb +++ b/spec/views/projects/jobs/_build.html.haml_spec.rb @@ -4,7 +4,7 @@ describe 'projects/ci/jobs/_build' do include Devise::Test::ControllerHelpers let(:project) { create(:project, :repository) } - let(:pipeline) { create(:ci_empty_pipeline, id: 1337, iid: 57, project: project, sha: project.commit.id) } + let(:pipeline) { create(:ci_empty_pipeline, id: 1337, project: project, sha: project.commit.id) } let(:build) { create(:ci_build, pipeline: pipeline, stage: 'test', stage_idx: 1, name: 'rspec 0:2', status: :pending) } before do @@ -15,14 +15,14 @@ describe 'projects/ci/jobs/_build' do it 'won\'t include a column with a link to its pipeline by default' do render partial: 'projects/ci/builds/build', locals: { build: build } - expect(rendered).not_to have_link('#1337 (#57)') - expect(rendered).not_to have_text('#1337 (#57) by API') + expect(rendered).not_to have_link('#1337') + expect(rendered).not_to have_text('#1337 by API') end it 'can include a column with a link to its pipeline' do render partial: 'projects/ci/builds/build', locals: { build: build, pipeline_link: true } - expect(rendered).to have_link('#1337 (#57)') - expect(rendered).to have_text('#1337 (#57) by API') + expect(rendered).to have_link('#1337') + expect(rendered).to have_text('#1337 by API') end end |