Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 33 deletions

diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb
index c9c79680c1c..d5739386a30 100644
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
@@ -100,42 +100,16 @@ RSpec.describe 'Pipeline', :js, feature_category: :projects do
       end
     end
 
-    context 'with pipeline_name feature flag enabled' do
-      before do
-        stub_feature_flags(pipeline_name: true)
-      end
-
-      it 'displays pipeline name instead of commit title' do
-        visit_pipeline
-
-        within 'h3' do
-          expect(page).to have_content(pipeline.name)
-        end
-
-        within '.well-segment[data-testid="commit-row"]' do
-          expect(page).to have_content(project.commit.title)
-          expect(page).to have_content(project.commit.short_id)
-        end
-      end
-    end
+    it 'displays pipeline name instead of commit title' do
+      visit_pipeline
 
-    context 'with pipeline_name feature flag disabled' do
-      before do
-        stub_feature_flags(pipeline_name: false)
+      within 'h3' do
+        expect(page).to have_content(pipeline.name)
       end
 
-      it 'displays commit title' do
-        visit_pipeline
-
-        within 'h3' do
-          expect(page).not_to have_content(pipeline.name)
-          expect(page).to have_content(project.commit.title)
-        end
-
-        within '.well-segment[data-testid="commit-row"]' do
-          expect(page).not_to have_content(project.commit.title)
-          expect(page).to have_content(project.commit.short_id)
-        end
+      within '.well-segment[data-testid="commit-row"]' do
+        expect(page).to have_content(project.commit.title)
+        expect(page).to have_content(project.commit.short_id)
       end
     end