From c8cc2fe990c52cabcb9912b2b01b5bf16b33d88f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 18 Jun 2021 15:10:16 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../admin/services/admin_visits_service_templates_spec.rb | 14 +++++++------- spec/features/issuables/markdown_references/jira_spec.rb | 8 ++++---- spec/features/issues/user_bulk_edits_issues_spec.rb | 8 ++++---- spec/features/merge_requests/user_mass_updates_spec.rb | 6 +++--- .../projects/integrations/user_activates_jira_spec.rb | 12 ++++++------ .../services/user_activates_slack_notifications_spec.rb | 10 +++++----- 6 files changed, 29 insertions(+), 29 deletions(-) (limited to 'spec/features') diff --git a/spec/features/admin/services/admin_visits_service_templates_spec.rb b/spec/features/admin/services/admin_visits_service_templates_spec.rb index 9d011b97f63..d367867ebb5 100644 --- a/spec/features/admin/services/admin_visits_service_templates_spec.rb +++ b/spec/features/admin/services/admin_visits_service_templates_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' RSpec.describe 'Admin visits service templates' do let(:admin) { create(:user, :admin) } - let(:slack_service) { Integration.for_template.find { |s| s.type == 'SlackService' } } + let(:slack_integration) { Integration.for_template.find { |s| s.type == 'SlackService' } } before do sign_in(admin) @@ -23,7 +23,7 @@ RSpec.describe 'Admin visits service templates' do context 'with an active service template' do before do - create(:slack_service, :template, active: true) + create(:integrations_slack, :template, active: true) visit(admin_application_settings_services_path) end @@ -33,20 +33,20 @@ RSpec.describe 'Admin visits service templates' do context 'without instance-level integration' do it 'shows a link to service template' do - expect(page).to have_link('Slack', href: edit_admin_application_settings_service_path(slack_service.id)) - expect(page).not_to have_link('Slack', href: edit_admin_application_settings_integration_path(slack_service)) + expect(page).to have_link('Slack', href: edit_admin_application_settings_service_path(slack_integration.id)) + expect(page).not_to have_link('Slack', href: edit_admin_application_settings_integration_path(slack_integration)) end end context 'with instance-level integration' do before do - create(:slack_service, instance: true, project: nil) + create(:integrations_slack, instance: true, project: nil) visit(admin_application_settings_services_path) end it 'shows a link to instance-level integration' do - expect(page).not_to have_link('Slack', href: edit_admin_application_settings_service_path(slack_service.id)) - expect(page).to have_link('Slack', href: edit_admin_application_settings_integration_path(slack_service)) + expect(page).not_to have_link('Slack', href: edit_admin_application_settings_service_path(slack_integration.id)) + expect(page).to have_link('Slack', href: edit_admin_application_settings_integration_path(slack_integration)) end end end diff --git a/spec/features/issuables/markdown_references/jira_spec.rb b/spec/features/issuables/markdown_references/jira_spec.rb index a3a259e21a1..ae9c8d31c02 100644 --- a/spec/features/issuables/markdown_references/jira_spec.rb +++ b/spec/features/issuables/markdown_references/jira_spec.rb @@ -81,7 +81,7 @@ RSpec.describe "Jira", :js do context "when both external and internal issues trackers are enabled for the actual project" do before do - create(:jira_service, project: actual_project) + create(:jira_integration, project: actual_project) end include_examples "correct references" do @@ -94,7 +94,7 @@ RSpec.describe "Jira", :js do let(:actual_project) { create(:project, :public, :repository, :issues_disabled) } before do - create(:jira_service, project: actual_project) + create(:jira_integration, project: actual_project) end include_examples "correct references" do @@ -125,7 +125,7 @@ RSpec.describe "Jira", :js do context "when both external and internal issues trackers are enabled for the actual project" do before do - create(:jira_service, project: actual_project) + create(:jira_integration, project: actual_project) end include_examples "correct references" do @@ -138,7 +138,7 @@ RSpec.describe "Jira", :js do let(:actual_project) { create(:project, :public, :repository, :issues_disabled) } before do - create(:jira_service, project: actual_project) + create(:jira_integration, project: actual_project) end include_examples "correct references" do diff --git a/spec/features/issues/user_bulk_edits_issues_spec.rb b/spec/features/issues/user_bulk_edits_issues_spec.rb index e34c16e27ba..44c23813e3c 100644 --- a/spec/features/issues/user_bulk_edits_issues_spec.rb +++ b/spec/features/issues/user_bulk_edits_issues_spec.rb @@ -13,26 +13,26 @@ RSpec.describe 'Multiple issue updating from issues#index', :js do end context 'status' do - it 'sets to closed' do + it 'sets to closed', :js do visit project_issues_path(project) click_button 'Edit issues' check 'Select all' click_button 'Select status' - click_link 'Closed' + click_button 'Closed' click_update_issues_button expect(page).to have_selector('.issue', count: 0) end - it 'sets to open' do + it 'sets to open', :js do create_closed visit project_issues_path(project, state: 'closed') click_button 'Edit issues' check 'Select all' click_button 'Select status' - click_link 'Open' + click_button 'Open' click_update_issues_button expect(page).to have_selector('.issue', count: 0) diff --git a/spec/features/merge_requests/user_mass_updates_spec.rb b/spec/features/merge_requests/user_mass_updates_spec.rb index 0fe69c5ca5b..46c12784ea8 100644 --- a/spec/features/merge_requests/user_mass_updates_spec.rb +++ b/spec/features/merge_requests/user_mass_updates_spec.rb @@ -18,7 +18,7 @@ RSpec.describe 'Merge requests > User mass updates', :js do visit project_merge_requests_path(project) end - it 'closes merge request' do + it 'closes merge request', :js do change_status('Closed') expect(page).to have_selector('.merge-request', count: 0) @@ -31,7 +31,7 @@ RSpec.describe 'Merge requests > User mass updates', :js do visit project_merge_requests_path(project, state: 'closed') end - it 'reopens merge request' do + it 'reopens merge request', :js do change_status('Open') expect(page).to have_selector('.merge-request', count: 0) @@ -109,7 +109,7 @@ RSpec.describe 'Merge requests > User mass updates', :js do click_button 'Edit merge requests' check 'Select all' click_button 'Select status' - click_link text + click_button text click_update_merge_requests_button end diff --git a/spec/features/projects/integrations/user_activates_jira_spec.rb b/spec/features/projects/integrations/user_activates_jira_spec.rb index 10f84aae93f..d7679d38cae 100644 --- a/spec/features/projects/integrations/user_activates_jira_spec.rb +++ b/spec/features/projects/integrations/user_activates_jira_spec.rb @@ -65,7 +65,7 @@ RSpec.describe 'User activates Jira', :js do include JiraServiceHelper before do - stub_jira_service_test + stub_jira_integration_test visit_project_integration('Jira') fill_form(disable: true) click_save_integration @@ -105,14 +105,14 @@ RSpec.describe 'User activates Jira', :js do click_save_integration expect(page).to have_content('Jira settings saved and active.') - expect(project.reload.jira_service.data_fields).to have_attributes( + expect(project.reload.jira_integration.data_fields).to have_attributes( jira_issue_transition_automatic: false, jira_issue_transition_id: '1, 2, 3' ) end it 'using automatic transitions' do - create(:jira_service, project: project, jira_issue_transition_automatic: false, jira_issue_transition_id: '1, 2, 3') + create(:jira_integration, project: project, jira_issue_transition_automatic: false, jira_issue_transition_id: '1, 2, 3') visit_project_integration('Jira') expect(page).to have_field('Enable Jira transitions', checked: true) @@ -123,14 +123,14 @@ RSpec.describe 'User activates Jira', :js do click_save_integration expect(page).to have_content('Jira settings saved and active.') - expect(project.reload.jira_service.data_fields).to have_attributes( + expect(project.reload.jira_integration.data_fields).to have_attributes( jira_issue_transition_automatic: true, jira_issue_transition_id: '' ) end it 'disabling issue transitions' do - create(:jira_service, project: project, jira_issue_transition_automatic: true, jira_issue_transition_id: '1, 2, 3') + create(:jira_integration, project: project, jira_issue_transition_automatic: true, jira_issue_transition_id: '1, 2, 3') visit_project_integration('Jira') expect(page).to have_field('Enable Jira transitions', checked: true) @@ -140,7 +140,7 @@ RSpec.describe 'User activates Jira', :js do click_save_integration expect(page).to have_content('Jira settings saved and active.') - expect(project.reload.jira_service.data_fields).to have_attributes( + expect(project.reload.jira_integration.data_fields).to have_attributes( jira_issue_transition_automatic: false, jira_issue_transition_id: '' ) 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 dec83ff1489..d5fe8b083ba 100644 --- a/spec/features/projects/services/user_activates_slack_notifications_spec.rb +++ b/spec/features/projects/services/user_activates_slack_notifications_spec.rb @@ -20,12 +20,12 @@ RSpec.describe 'User activates Slack notifications', :js do end context 'when service is already configured' do - let(:service) { Integrations::Slack.new } - let(:project) { create(:project, slack_service: service) } + let(:integration) { Integrations::Slack.new } + let(:project) { create(:project, slack_integration: integration) } before do - service.fields - service.update!( + integration.fields + integration.update!( push_channel: 1, issue_channel: 2, merge_request_channel: 3, @@ -34,7 +34,7 @@ RSpec.describe 'User activates Slack notifications', :js do pipeline_channel: 6, wiki_page_channel: 7) - visit(edit_project_service_path(project, service)) + visit(edit_project_service_path(project, integration)) end it 'filters events by channel' do -- cgit v1.2.1