diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /spec/features/admin/services/admin_visits_service_templates_spec.rb | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'spec/features/admin/services/admin_visits_service_templates_spec.rb')
-rw-r--r-- | spec/features/admin/services/admin_visits_service_templates_spec.rb | 14 |
1 files changed, 7 insertions, 7 deletions
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 |