diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/features/projects/import_export/test_project_export.tar.gz | bin | 679415 -> 682154 bytes | |||
| -rw-r--r-- | spec/features/projects/services/slack_service_spec.rb | 4 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 2 | ||||
| -rw-r--r-- | spec/models/project_services/slack_service_spec.rb (renamed from spec/models/project_services/slack_notification_service_spec.rb) | 2 | ||||
| -rw-r--r-- | spec/models/project_spec.rb | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/spec/features/projects/import_export/test_project_export.tar.gz b/spec/features/projects/import_export/test_project_export.tar.gz Binary files differindex d3165d07d7b..7655c2b351f 100644 --- a/spec/features/projects/import_export/test_project_export.tar.gz +++ b/spec/features/projects/import_export/test_project_export.tar.gz diff --git a/spec/features/projects/services/slack_service_spec.rb b/spec/features/projects/services/slack_service_spec.rb index 320ed13a01d..16541f51d98 100644 --- a/spec/features/projects/services/slack_service_spec.rb +++ b/spec/features/projects/services/slack_service_spec.rb @@ -2,8 +2,8 @@ require 'spec_helper' feature 'Projects > Slack service > Setup events', feature: true do let(:user) { create(:user) } - let(:service) { SlackNotificationService.new } - let(:project) { create(:project, slack_notification_service: service) } + let(:service) { SlackService.new } + let(:project) { create(:project, slack_service: service) } background do service.fields diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index 7e618e2fcf5..155cf8565b5 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -137,7 +137,7 @@ project: - assembla_service - asana_service - gemnasium_service -- slack_notification_service +- slack_service - mattermost_notification_service - buildkite_service - bamboo_service diff --git a/spec/models/project_services/slack_notification_service_spec.rb b/spec/models/project_services/slack_service_spec.rb index 110b5bf2115..9a3ecc66d83 100644 --- a/spec/models/project_services/slack_notification_service_spec.rb +++ b/spec/models/project_services/slack_service_spec.rb @@ -1,5 +1,5 @@ require 'spec_helper' -describe SlackNotificationService, models: true do +describe SlackService, models: true do it_behaves_like "slack or mattermost notifications" end diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 0455cd2fe49..569071c0418 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -21,7 +21,7 @@ describe Project, models: true do it { is_expected.to have_many(:hooks).dependent(:destroy) } it { is_expected.to have_many(:protected_branches).dependent(:destroy) } it { is_expected.to have_one(:forked_project_link).dependent(:destroy) } - it { is_expected.to have_one(:slack_notification_service).dependent(:destroy) } + it { is_expected.to have_one(:slack_service).dependent(:destroy) } it { is_expected.to have_one(:mattermost_notification_service).dependent(:destroy) } it { is_expected.to have_one(:pushover_service).dependent(:destroy) } it { is_expected.to have_one(:asana_service).dependent(:destroy) } |