diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-26 15:10:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-26 15:10:53 +0300 |
commit | ff579119e2ecf2608370a1f24c4d791d28f269d9 (patch) | |
tree | 6f510ae943600102faf9dbc54df0f3e7f96c3417 /spec/models | |
parent | 2c49951e8c1f4fb95d15cac3dd0677d6882d2add (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/service_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb index 6dddcb0eca4..0c356fc5118 100644 --- a/spec/models/service_spec.rb +++ b/spec/models/service_spec.rb @@ -92,12 +92,12 @@ RSpec.describe Service do end end - describe '.by_group' do + describe '.for_group' do let!(:service1) { create(:jira_service, project_id: nil, group_id: group.id) } let!(:service2) { create(:jira_service) } it 'returns the right group service' do - expect(described_class.by_group(group)).to match_array([service1]) + expect(described_class.for_group(group)).to match_array([service1]) end end @@ -215,11 +215,11 @@ RSpec.describe Service do describe '.find_or_initialize_all' do shared_examples 'service instances' do it 'returns the available service instances' do - expect(Service.find_or_initialize_all(Service.instances).pluck(:type)).to match_array(Service.available_services_types) + expect(Service.find_or_initialize_all(Service.for_instance).pluck(:type)).to match_array(Service.available_services_types) end it 'does not create service instances' do - expect { Service.find_or_initialize_all(Service.instances) }.not_to change { Service.count } + expect { Service.find_or_initialize_all(Service.for_instance) }.not_to change { Service.count } end end |