1 files changed, 48 insertions, 25 deletions

diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb
index 90ce865cc00..0a7113a5559 100644
--- a/spec/features/admin/admin_settings_spec.rb
+++ b/spec/features/admin/admin_settings_spec.rb
@@ -251,40 +251,62 @@ RSpec.describe 'Admin updates settings' do
       end
     end
 
-    context 'when the Slack Notifications Service template is active' do
+    context 'when Service Templates are enabled' do
       before do
-        create(:service, :template, type: 'SlackService', active: true)
-
+        stub_feature_flags(disable_service_templates: false)
         visit general_admin_application_settings_path
       end
 
-      it 'change Slack Notifications Service template settings', :js do
-        first(:link, 'Service Templates').click
-        click_link 'Slack notifications'
-        fill_in 'Webhook', with: 'http://localhost'
-        fill_in 'Username', with: 'test_user'
-        fill_in 'service[push_channel]', with: '#test_channel'
-        page.check('Notify only broken pipelines')
-        page.select 'All branches', from: 'Branches to be notified'
+      it 'shows Service Templates link' do
+        expect(page).to have_link('Service Templates')
+      end
 
-        check_all_events
-        click_button 'Save changes'
+      context 'when the Slack Notifications Service template is active' do
+        before do
+          create(:service, :template, type: 'SlackService', active: true)
 
-        expect(page).to have_content 'Application settings saved successfully'
+          visit general_admin_application_settings_path
+        end
 
-        click_link 'Slack notifications'
+        it 'change Slack Notifications Service template settings', :js do
+          first(:link, 'Service Templates').click
+          click_link 'Slack notifications'
+          fill_in 'Webhook', with: 'http://localhost'
+          fill_in 'Username', with: 'test_user'
+          fill_in 'service[push_channel]', with: '#test_channel'
+          page.check('Notify only broken pipelines')
+          page.select 'All branches', from: 'Branches to be notified'
+          page.select 'Match any of the labels', from: 'Labels to be notified behavior'
+
+          check_all_events
+          click_button 'Save changes'
+
+          expect(page).to have_content 'Application settings saved successfully'
 
-        expect(page.all('input[type=checkbox]')).to all(be_checked)
-        expect(find_field('Webhook').value).to eq 'http://localhost'
-        expect(find_field('Username').value).to eq 'test_user'
-        expect(find('[name="service[push_channel]"]').value).to eq '#test_channel'
+          click_link 'Slack notifications'
+
+          expect(page.all('input[type=checkbox]')).to all(be_checked)
+          expect(find_field('Webhook').value).to eq 'http://localhost'
+          expect(find_field('Username').value).to eq 'test_user'
+          expect(find('[name="service[push_channel]"]').value).to eq '#test_channel'
+        end
+
+        it 'defaults Deployment events to false for chat notification template settings', :js do
+          first(:link, 'Service Templates').click
+          click_link 'Slack notifications'
+
+          expect(find_field('Deployment')).not_to be_checked
+        end
       end
+    end
 
-      it 'defaults Deployment events to false for chat notification template settings', :js do
-        first(:link, 'Service Templates').click
-        click_link 'Slack notifications'
+    context 'When Service templates are disabled' do
+      before do
+        stub_feature_flags(disable_service_templates: true)
+      end
 
-        expect(find_field('Deployment')).not_to be_checked
+      it 'does not show Service Templates link' do
+        expect(page).not_to have_link('Service Templates')
       end
     end
 
@@ -424,7 +446,8 @@ RSpec.describe 'Admin updates settings' do
           check 'Enable reCAPTCHA for login'
           fill_in 'IPs per user', with: 15
           check 'Enable Spam Check via external API endpoint'
-          fill_in 'URL of the external Spam Check endpoint', with: 'https://www.example.com/spamcheck'
+          fill_in 'URL of the external Spam Check endpoint', with: 'grpc://www.example.com/spamcheck'
+          fill_in 'Spam Check API Key', with: 'SPAM_CHECK_API_KEY'
           click_button 'Save changes'
         end
 
@@ -433,7 +456,7 @@ RSpec.describe 'Admin updates settings' do
         expect(current_settings.login_recaptcha_protection_enabled).to be true
         expect(current_settings.unique_ips_limit_per_user).to eq(15)
         expect(current_settings.spam_check_endpoint_enabled).to be true
-        expect(current_settings.spam_check_endpoint_url).to eq 'https://www.example.com/spamcheck'
+        expect(current_settings.spam_check_endpoint_url).to eq 'grpc://www.example.com/spamcheck'
       end
     end