summaryrefslogtreecommitdiff
path: root/spec/features/projects
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-06-14 13:17:18 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-06-14 13:17:18 +0000
commit2d9e0f3ffb59a4323e794fcc4bf122274c82c67f (patch)
treef08836cc0be6254807f784d50cc228a20fc48e7a /spec/features/projects
parent577832598f1b35187efafc426068ef7ac36ae09f (diff)
downloadgitlab-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/features/projects')
-rw-r--r--spec/features/projects/commits/user_browses_commits_spec.rb2
-rw-r--r--spec/features/projects/jobs/user_browses_jobs_spec.rb6
-rw-r--r--spec/features/projects/jobs_spec.rb2
3 files changed, 2 insertions, 8 deletions
diff --git a/spec/features/projects/commits/user_browses_commits_spec.rb b/spec/features/projects/commits/user_browses_commits_spec.rb
index a84fee34669..fc74a370e72 100644
--- a/spec/features/projects/commits/user_browses_commits_spec.rb
+++ b/spec/features/projects/commits/user_browses_commits_spec.rb
@@ -61,7 +61,7 @@ describe 'User browses commits' do
it 'renders commit ci info' do
visit project_commit_path(project, sample_commit.id)
- expect(page).to have_content "Pipeline ##{pipeline.id} (##{pipeline.iid}) pending"
+ expect(page).to have_content "Pipeline ##{pipeline.id} pending"
end
end
diff --git a/spec/features/projects/jobs/user_browses_jobs_spec.rb b/spec/features/projects/jobs/user_browses_jobs_spec.rb
index bd6c73f4b85..ebc20d15d67 100644
--- a/spec/features/projects/jobs/user_browses_jobs_spec.rb
+++ b/spec/features/projects/jobs/user_browses_jobs_spec.rb
@@ -16,12 +16,6 @@ describe 'User browses jobs' do
visit(project_jobs_path(project))
end
- it 'shows pipeline id and IID' do
- page.within('td.pipeline-link') do
- expect(page).to have_content("##{pipeline.id} (##{pipeline.iid})")
- end
- end
-
it 'shows the coverage' do
page.within('td.coverage') do
expect(page).to have_content('99.9%')
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index 03562bd382e..f4ed89adc0f 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -129,7 +129,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
visit project_job_path(project, job)
within '.js-pipeline-info' do
- expect(page).to have_content("Pipeline ##{pipeline.id} (##{pipeline.iid}) for #{pipeline.ref}")
+ expect(page).to have_content("Pipeline ##{pipeline.id} for #{pipeline.ref}")
end
end