Merge branch 'justin_ho-change-redirect-path-after-integration-save' into 'master'

Change redirect path after integration save

See merge request gitlab-org/gitlab!34697

app/controllers/admin/services_controller.rb

@@ -4,6 +4,9 @@ class Admin::ServicesController < Admin::ApplicationController
   include ServiceParams
 
   before_action :service, only: [:edit, :update]
+  before_action only: :edit do
+    push_frontend_feature_flag(:integration_form_refactor)
+  end
 
   def index
     @services = Service.find_or_create_templates.sort_by(&:title)

app/controllers/concerns/integrations_actions.rb

@@ -8,6 +8,9 @@ module IntegrationsActions
 
     before_action :not_found, unless: :integrations_enabled?
     before_action :integration, only: [:edit, :update, :test]
+    before_action only: :edit do
+      push_frontend_feature_flag(:integration_form_refactor)
+    end
   end
 
   def edit

app/controllers/projects/services_controller.rb

@@ -30,7 +30,7 @@ class Projects::ServicesController < Projects::ApplicationController
     respond_to do |format|
       format.html do
         if saved
-          target_url = safe_redirect_path(params[:redirect_to]).presence || project_settings_integrations_path(@project)
+          target_url = safe_redirect_path(params[:redirect_to]).presence || edit_project_service_path(@project, @service)
           redirect_to target_url, notice: success_message
         else
           render 'edit'

changelogs/unreleased/justin_ho-change-redirect-path-after-integration-save.yml

+---
+title: Change redirect path after integration save
+merge_request: 34697
+author:
+type: changed

spec/controllers/projects/services_controller_spec.rb

@@ -137,7 +137,7 @@ RSpec.describe Projects::ServicesController do
       let(:params)         { project_params(service: service_params) }
 
       let(:message) { 'Jira activated.' }
-      let(:redirect_url) { project_settings_integrations_path(project) }
+      let(:redirect_url) { edit_project_service_path(project, service) }
 
       before do
         put :update, params: params

spec/features/projects/services/user_activates_issue_tracker_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe 'User activates issue tracker', :js do
 
         it 'activates the service' do
           expect(page).to have_content("#{tracker} activated.")
-          expect(current_path).to eq(project_settings_integrations_path(project))
+          expect(current_path).to eq(edit_project_service_path(project, tracker.parameterize(separator: '_')))
         end
 
         it 'shows the link in the menu' do
@@ -50,7 +50,7 @@ RSpec.describe 'User activates issue tracker', :js do
           click_test_then_save_integration
 
           expect(page).to have_content("#{tracker} activated.")
-          expect(current_path).to eq(project_settings_integrations_path(project))
+          expect(current_path).to eq(edit_project_service_path(project, tracker.parameterize(separator: '_')))
         end
       end
     end
@@ -65,7 +65,7 @@ RSpec.describe 'User activates issue tracker', :js do
 
       it 'saves but does not activate the service' do
         expect(page).to have_content("#{tracker} settings saved, but not activated.")
-        expect(current_path).to eq(project_settings_integrations_path(project))
+        expect(current_path).to eq(edit_project_service_path(project, tracker.parameterize(separator: '_')))
       end
 
       it 'does not show the external tracker link in the menu' do

spec/features/projects/services/user_activates_jira_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe 'User activates Jira', :js do
 
       it 'activates the Jira service' do
         expect(page).to have_content('Jira activated.')
-        expect(current_path).to eq(project_settings_integrations_path(project))
+        expect(current_path).to eq(edit_project_service_path(project, :jira))
       end
 
       it 'shows the Jira link in the menu' do
@@ -61,7 +61,7 @@ RSpec.describe 'User activates Jira', :js do
         click_test_then_save_integration
 
         expect(page).to have_content('Jira activated.')
-        expect(current_path).to eq(project_settings_integrations_path(project))
+        expect(current_path).to eq(edit_project_service_path(project, :jira))
       end
     end
   end
@@ -75,7 +75,7 @@ RSpec.describe 'User activates Jira', :js do
 
     it 'saves but does not activate the Jira service' do
       expect(page).to have_content('Jira settings saved, but not activated.')
-      expect(current_path).to eq(project_settings_integrations_path(project))
+      expect(current_path).to eq(edit_project_service_path(project, :jira))
     end
 
     it 'does not show the Jira link in the menu' do

spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe 'Set up Mattermost slash commands', :js do
         click_active_toggle
         click_on 'Save changes'
 
-        expect(current_path).to eq(project_settings_integrations_path(project))
+        expect(current_path).to eq(edit_project_service_path(project, :mattermost_slash_commands))
         expect(page).to have_content('Mattermost slash commands settings saved, but not activated.')
       end
 
@@ -41,7 +41,7 @@ RSpec.describe 'Set up Mattermost slash commands', :js do
         fill_in 'service_token', with: token
         click_on 'Save changes'
 
-        expect(current_path).to eq(project_settings_integrations_path(project))
+        expect(current_path).to eq(edit_project_service_path(project, :mattermost_slash_commands))
         expect(page).to have_content('Mattermost slash commands activated.')
       end
 

spec/features/projects/services/user_activates_slack_slash_command_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe 'Slack slash commands', :js do
     click_active_toggle
     click_on 'Save'
 
-    expect(current_path).to eq(project_settings_integrations_path(project))
+    expect(current_path).to eq(edit_project_service_path(project, :slack_slash_commands))
     expect(page).to have_content('Slack slash commands settings saved, but not activated.')
   end
 
@@ -32,7 +32,7 @@ RSpec.describe 'Slack slash commands', :js do
     fill_in 'Token', with: 'token'
     click_on 'Save'
 
-    expect(current_path).to eq(project_settings_integrations_path(project))
+    expect(current_path).to eq(edit_project_service_path(project, :slack_slash_commands))
     expect(page).to have_content('Slack slash commands activated.')
   end