Fix specs and hide old views when ff is enabled

- Stub existing specs to not use the feature flag.
- Only show wither the HAML or Vue version of triggers.

app/assets/javascripts/integrations/edit/components/trigger_fields.vue

@@ -44,7 +44,7 @@ export default {
 </script>
 
 <template>
-  <gl-form-group label="Trigger" label-for="trigger-fields">
+  <gl-form-group :label="__('Trigger')" label-for="trigger-fields">
     <div id="trigger-fields">
       <gl-form-group v-for="event in events" :key="event.title" :description="event.description">
         <input :name="checkboxName(event.name)" type="hidden" value="false" />

app/views/shared/_service_settings.html.haml

@@ -11,7 +11,7 @@
   .js-vue-integration-settings{ data: { show_active: @service.show_active_box?.to_s, activated: (@service.active || @service.new_record?).to_s, type: @service.to_param, merge_request_events: @service.merge_requests_events.to_s,
 commit_events: @service.commit_events.to_s, enable_comments: @service.comment_on_event_enabled.to_s, comment_detail: @service.comment_detail, trigger_events: Feature.enabled?(:integration_form_refactor) ? @service.configurable_events_json : [] } }
 
-  - if @service.configurable_events.present? && !@service.is_a?(JiraService)
+  - if @service.configurable_events.present? && !@service.is_a?(JiraService) && Feature.disabled?(:integration_form_refactor)
     .form-group.row
       %label.col-form-label.col-sm-2= _('Trigger')
 

spec/features/admin/admin_settings_spec.rb

@@ -198,7 +198,7 @@ describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_not_moc
 
     context 'Integrations page' do
       before do
-        stub_feature_flags(instance_level_integrations: false)
+        stub_feature_flags(instance_level_integrations: false, integration_form_refactor: false)
         visit integrations_admin_application_settings_path
       end
 

spec/support/shared_contexts/project_service_shared_context.rb

@@ -5,6 +5,7 @@ shared_context 'project service activation' do
   let(:user) { create(:user) }
 
   before do
+    stub_feature_flags(integration_form_refactor: false)
     project.add_maintainer(user)
     sign_in(user)
   end

spec/views/projects/services/_form.haml_spec.rb

@@ -7,6 +7,8 @@ describe 'projects/services/_form' do
   let(:user) { create(:admin) }
 
   before do
+    stub_feature_flags(integration_form_refactor: false)
+
     assign(:project, project)
 
     allow(controller).to receive(:current_user).and_return(user)