Add latest changes from gitlab-org/gitlab@13-1-stable-ee

21 files changed, 37 insertions, 37 deletions

diff --git a/spec/features/projects/services/disable_triggers_spec.rb b/spec/features/projects/services/disable_triggers_spec.rb
index d07abb94208..8f87d0e7ff1 100644
--- a/spec/features/projects/services/disable_triggers_spec.rb
+++ b/spec/features/projects/services/disable_triggers_spec.rb
@@ -2,10 +2,10 @@
 
 require 'spec_helper'
 
-describe 'Disable individual triggers' do
+RSpec.describe 'Disable individual triggers', :js do
   include_context 'project service activation'
 
-  let(:checkbox_selector) { 'input[type=checkbox][id$=_events]' }
+  let(:checkbox_selector) { 'input[type=checkbox][name$="_events]"]' }
 
   before do
     visit_project_integration(service_name)
diff --git a/spec/features/projects/services/prometheus_external_alerts_spec.rb b/spec/features/projects/services/prometheus_external_alerts_spec.rb
index 1a706f20352..4c32905a8c5 100644
--- a/spec/features/projects/services/prometheus_external_alerts_spec.rb
+++ b/spec/features/projects/services/prometheus_external_alerts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Prometheus external alerts', :js do
+RSpec.describe 'Prometheus external alerts', :js do
   include_context 'project service activation'
 
   let(:alerts_section_selector) { '.js-prometheus-alerts' }
diff --git a/spec/features/projects/services/user_activates_alerts_spec.rb b/spec/features/projects/services/user_activates_alerts_spec.rb
index 47de7fab859..95642f49d61 100644
--- a/spec/features/projects/services/user_activates_alerts_spec.rb
+++ b/spec/features/projects/services/user_activates_alerts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Alerts', :js do
+RSpec.describe 'User activates Alerts', :js do
   let_it_be(:project) { create(:project) }
   let_it_be(:user) { create(:user) }
 
diff --git a/spec/features/projects/services/user_activates_asana_spec.rb b/spec/features/projects/services/user_activates_asana_spec.rb
index dac60fce6e9..3e24d106be0 100644
--- a/spec/features/projects/services/user_activates_asana_spec.rb
+++ b/spec/features/projects/services/user_activates_asana_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Asana' do
+RSpec.describe 'User activates Asana' do
   include_context 'project service activation'
 
   it 'activates service', :js do
diff --git a/spec/features/projects/services/user_activates_assembla_spec.rb b/spec/features/projects/services/user_activates_assembla_spec.rb
index 999a95e3e23..2e49f4caa82 100644
--- a/spec/features/projects/services/user_activates_assembla_spec.rb
+++ b/spec/features/projects/services/user_activates_assembla_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Assembla' do
+RSpec.describe 'User activates Assembla' do
   include_context 'project service activation'
 
   before do
diff --git a/spec/features/projects/services/user_activates_atlassian_bamboo_ci_spec.rb b/spec/features/projects/services/user_activates_atlassian_bamboo_ci_spec.rb
index 28ed08f71b6..7b89b9ac4a7 100644
--- a/spec/features/projects/services/user_activates_atlassian_bamboo_ci_spec.rb
+++ b/spec/features/projects/services/user_activates_atlassian_bamboo_ci_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Atlassian Bamboo CI' do
+RSpec.describe 'User activates Atlassian Bamboo CI' do
   include_context 'project service activation'
 
   before do
@@ -23,6 +23,6 @@ describe 'User activates Atlassian Bamboo CI' do
     # Password field should not be filled in.
     click_link('Atlassian Bamboo CI')
 
-    expect(find_field('Enter new password').value).to be_blank
+    expect(find_field('Enter new Password').value).to be_blank
   end
 end
diff --git a/spec/features/projects/services/user_activates_emails_on_push_spec.rb b/spec/features/projects/services/user_activates_emails_on_push_spec.rb
index 42c069eb29e..40947027146 100644
--- a/spec/features/projects/services/user_activates_emails_on_push_spec.rb
+++ b/spec/features/projects/services/user_activates_emails_on_push_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Emails on push' do
+RSpec.describe 'User activates Emails on push' do
   include_context 'project service activation'
 
   it 'activates service', :js do
diff --git a/spec/features/projects/services/user_activates_flowdock_spec.rb b/spec/features/projects/services/user_activates_flowdock_spec.rb
index 4762363b3fe..9581d718400 100644
--- a/spec/features/projects/services/user_activates_flowdock_spec.rb
+++ b/spec/features/projects/services/user_activates_flowdock_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Flowdock' do
+RSpec.describe 'User activates Flowdock' do
   include_context 'project service activation' do
     let(:project) { create(:project, :repository) }
   end
diff --git a/spec/features/projects/services/user_activates_hipchat_spec.rb b/spec/features/projects/services/user_activates_hipchat_spec.rb
index 2fb056f3533..a2820c4bb0f 100644
--- a/spec/features/projects/services/user_activates_hipchat_spec.rb
+++ b/spec/features/projects/services/user_activates_hipchat_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates HipChat', :js do
+RSpec.describe 'User activates HipChat', :js do
   include_context 'project service activation'
 
   context 'with standart settings' do
diff --git a/spec/features/projects/services/user_activates_irker_spec.rb b/spec/features/projects/services/user_activates_irker_spec.rb
index 56df403499c..fad40fa6085 100644
--- a/spec/features/projects/services/user_activates_irker_spec.rb
+++ b/spec/features/projects/services/user_activates_irker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Irker (IRC gateway)' do
+RSpec.describe 'User activates Irker (IRC gateway)' do
   include_context 'project service activation'
 
   it 'activates service', :js do
diff --git a/spec/features/projects/services/user_activates_issue_tracker_spec.rb b/spec/features/projects/services/user_activates_issue_tracker_spec.rb
index 3c5005d0c0c..a2a2604c610 100644
--- a/spec/features/projects/services/user_activates_issue_tracker_spec.rb
+++ b/spec/features/projects/services/user_activates_issue_tracker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates issue tracker', :js do
+RSpec.describe 'User activates issue tracker', :js do
   include_context 'project service activation'
 
   let(:url) { 'http://tracker.example.com' }
diff --git a/spec/features/projects/services/user_activates_jetbrains_teamcity_ci_spec.rb b/spec/features/projects/services/user_activates_jetbrains_teamcity_ci_spec.rb
index 8c84a81ac89..8ee369eb6ec 100644
--- a/spec/features/projects/services/user_activates_jetbrains_teamcity_ci_spec.rb
+++ b/spec/features/projects/services/user_activates_jetbrains_teamcity_ci_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates JetBrains TeamCity CI' do
+RSpec.describe 'User activates JetBrains TeamCity CI' do
   include_context 'project service activation'
 
   before do
@@ -12,7 +12,7 @@ describe 'User activates JetBrains TeamCity CI' do
   it 'activates service', :js do
     visit_project_integration('JetBrains TeamCity CI')
     check('Push')
-    check('Merge request')
+    check('Merge Request')
     fill_in('Teamcity url', with: 'http://teamcity.example.com')
     fill_in('Build type', with: 'GitlabTest_Build')
     fill_in('Username', with: 'user')
diff --git a/spec/features/projects/services/user_activates_jira_spec.rb b/spec/features/projects/services/user_activates_jira_spec.rb
index a14dbf9c14d..1da8a49699b 100644
--- a/spec/features/projects/services/user_activates_jira_spec.rb
+++ b/spec/features/projects/services/user_activates_jira_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Jira', :js do
+RSpec.describe 'User activates Jira', :js do
   include_context 'project service activation'
 
   let(:url) { 'http://jira.example.com' }
diff --git a/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb b/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb
index c6825ee663a..a6b4aaccfb5 100644
--- a/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb
+++ b/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Set up Mattermost slash commands', :js do
+RSpec.describe 'Set up Mattermost slash commands', :js do
   describe 'user visits the mattermost slash command config page' do
     include_context 'project service activation'
 
diff --git a/spec/features/projects/services/user_activates_packagist_spec.rb b/spec/features/projects/services/user_activates_packagist_spec.rb
index 274f293ebf3..70cf612bb2a 100644
--- a/spec/features/projects/services/user_activates_packagist_spec.rb
+++ b/spec/features/projects/services/user_activates_packagist_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Packagist' do
+RSpec.describe 'User activates Packagist' do
   include_context 'project service activation'
 
   before do
diff --git a/spec/features/projects/services/user_activates_pivotaltracker_spec.rb b/spec/features/projects/services/user_activates_pivotaltracker_spec.rb
index c81c5081867..8e99c6e303b 100644
--- a/spec/features/projects/services/user_activates_pivotaltracker_spec.rb
+++ b/spec/features/projects/services/user_activates_pivotaltracker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates PivotalTracker' do
+RSpec.describe 'User activates PivotalTracker' do
   include_context 'project service activation'
 
   before do
diff --git a/spec/features/projects/services/user_activates_prometheus_spec.rb b/spec/features/projects/services/user_activates_prometheus_spec.rb
index 76dc7d1bbc8..89b1f447c32 100644
--- a/spec/features/projects/services/user_activates_prometheus_spec.rb
+++ b/spec/features/projects/services/user_activates_prometheus_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Prometheus' do
+RSpec.describe 'User activates Prometheus' do
   include_context 'project service activation'
 
   before do
diff --git a/spec/features/projects/services/user_activates_pushover_spec.rb b/spec/features/projects/services/user_activates_pushover_spec.rb
index 62e03e68aee..789cc30a42e 100644
--- a/spec/features/projects/services/user_activates_pushover_spec.rb
+++ b/spec/features/projects/services/user_activates_pushover_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Pushover' do
+RSpec.describe 'User activates Pushover' do
   include_context 'project service activation'
 
   before do
diff --git a/spec/features/projects/services/user_activates_slack_notifications_spec.rb b/spec/features/projects/services/user_activates_slack_notifications_spec.rb
index 12f15699e26..20e2bd3f085 100644
--- a/spec/features/projects/services/user_activates_slack_notifications_spec.rb
+++ b/spec/features/projects/services/user_activates_slack_notifications_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Slack notifications' do
+RSpec.describe 'User activates Slack notifications', :js do
   include_context 'project service activation'
 
   context 'when service is not configured yet' do
@@ -10,7 +10,7 @@ describe 'User activates Slack notifications' do
       visit_project_integration('Slack notifications')
     end
 
-    it 'activates service', :js do
+    it 'activates service' do
       fill_in('Webhook', with: 'https://hooks.slack.com/services/SVRWFV0VVAR97N/B02R25XN3/ZBqu7xMupaEEICInN685')
 
       click_test_then_save_integration
@@ -38,13 +38,13 @@ describe 'User activates Slack notifications' do
     end
 
     it 'filters events by channel' do
-      expect(page.find_field('service_push_channel').value).to have_content('1')
-      expect(page.find_field('service_issue_channel').value).to have_content('2')
-      expect(page.find_field('service_merge_request_channel').value).to have_content('3')
-      expect(page.find_field('service_note_channel').value).to have_content('4')
-      expect(page.find_field('service_tag_push_channel').value).to have_content('5')
-      expect(page.find_field('service_pipeline_channel').value).to have_content('6')
-      expect(page.find_field('service_wiki_page_channel').value).to have_content('7')
+      expect(page.find_field(name: 'service[push_channel]').value).to have_content('1')
+      expect(page.find_field(name: 'service[issue_channel]').value).to have_content('2')
+      expect(page.find_field(name: 'service[merge_request_channel]').value).to have_content('3')
+      expect(page.find_field(name: 'service[note_channel]').value).to have_content('4')
+      expect(page.find_field(name: 'service[tag_push_channel]').value).to have_content('5')
+      expect(page.find_field(name: 'service[pipeline_channel]').value).to have_content('6')
+      expect(page.find_field(name: 'service[wiki_page_channel]').value).to have_content('7')
     end
   end
 end
diff --git a/spec/features/projects/services/user_activates_slack_slash_command_spec.rb b/spec/features/projects/services/user_activates_slack_slash_command_spec.rb
index 05f1a0c6b17..360e462b935 100644
--- a/spec/features/projects/services/user_activates_slack_slash_command_spec.rb
+++ b/spec/features/projects/services/user_activates_slack_slash_command_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Slack slash commands' do
+RSpec.describe 'Slack slash commands', :js do
   include_context 'project service activation'
 
   before do
@@ -10,7 +10,7 @@ describe 'Slack slash commands' do
   end
 
   it 'shows a token placeholder' do
-    token_placeholder = find_field('service_token')['placeholder']
+    token_placeholder = find_field('Token')['placeholder']
 
     expect(token_placeholder).to eq('XXxxXXxxXXxxXXxxXXxxXXxx')
   end
@@ -19,8 +19,8 @@ describe 'Slack slash commands' do
     expect(page).to have_content('This service allows users to perform common')
   end
 
-  it 'redirects to the integrations page after saving but not activating', :js do
-    fill_in 'service_token', with: 'token'
+  it 'redirects to the integrations page after saving but not activating' do
+    fill_in 'Token', with: 'token'
     click_active_toggle
     click_on 'Save'
 
@@ -28,8 +28,8 @@ describe 'Slack slash commands' do
     expect(page).to have_content('Slack slash commands settings saved, but not activated.')
   end
 
-  it 'redirects to the integrations page after activating', :js do
-    fill_in 'service_token', with: 'token'
+  it 'redirects to the integrations page after activating' do
+    fill_in 'Token', with: 'token'
     click_on 'Save'
 
     expect(current_path).to eq(project_settings_integrations_path(project))
diff --git a/spec/features/projects/services/user_views_services_spec.rb b/spec/features/projects/services/user_views_services_spec.rb
index 6df0123c30a..fef6b7bd991 100644
--- a/spec/features/projects/services/user_views_services_spec.rb
+++ b/spec/features/projects/services/user_views_services_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views services' do
+RSpec.describe 'User views services' do
   include_context 'project service activation'
 
   it 'shows the list of available services' do