Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 1 insertions, 13 deletions

diff --git a/spec/features/triggers_spec.rb b/spec/features/triggers_spec.rb
index 3616fdb2e8e..23a13994fa4 100644
--- a/spec/features/triggers_spec.rb
+++ b/spec/features/triggers_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe 'Triggers', :js, feature_category: :continuous_integration do
     wait_for_requests
   end
 
-  shared_examples 'triggers page' do
+  describe 'triggers page' do
     describe 'create trigger workflow' do
       it 'prevents adding new trigger with no description' do
         fill_in 'trigger_description', with: ''
@@ -139,16 +139,4 @@ RSpec.describe 'Triggers', :js, feature_category: :continuous_integration do
       end
     end
   end
-
-  context 'when ci_pipeline_triggers_settings_vue_ui is enabled' do
-    it_behaves_like 'triggers page'
-  end
-
-  context 'when ci_pipeline_triggers_settings_vue_ui is disabled' do
-    before do
-      stub_feature_flags(ci_pipeline_triggers_settings_vue_ui: false)
-    end
-
-    it_behaves_like 'triggers page'
-  end
 end