diff options
Diffstat (limited to 'spec/services')
| -rw-r--r-- | spec/services/alert_management/alerts/update_service_spec.rb | 3 | ||||
| -rw-r--r-- | spec/services/event_create_service_spec.rb | 10 | ||||
| -rw-r--r-- | spec/services/resource_access_tokens/create_service_spec.rb | 11 | ||||
| -rw-r--r-- | spec/services/todo_service_spec.rb | 30 |
4 files changed, 33 insertions, 21 deletions
diff --git a/spec/services/alert_management/alerts/update_service_spec.rb b/spec/services/alert_management/alerts/update_service_spec.rb index 91b02325bad..ee04fc55984 100644 --- a/spec/services/alert_management/alerts/update_service_spec.rb +++ b/spec/services/alert_management/alerts/update_service_spec.rb @@ -147,8 +147,7 @@ RSpec.describe AlertManagement::Alerts::UpdateService do end it_behaves_like 'does not add a system note' - # TODO: We should not add another todo in this scenario - it_behaves_like 'adds a todo' + it_behaves_like 'does not add a todo' end context 'with multiple users included' do diff --git a/spec/services/event_create_service_spec.rb b/spec/services/event_create_service_spec.rb index 57382b7e5a0..edd585cb4b6 100644 --- a/spec/services/event_create_service_spec.rb +++ b/spec/services/event_create_service_spec.rb @@ -207,7 +207,7 @@ RSpec.describe EventCreateService do tracking_params = { event_action: counter_class::WIKI_ACTION, date_from: Date.yesterday, date_to: Date.today } expect { create_event } - .to change { counter_class.count_unique_events(tracking_params) } + .to change { counter_class.count_unique(tracking_params) } .by(1) end end @@ -249,7 +249,7 @@ RSpec.describe EventCreateService do tracking_params = { event_action: counter_class::PUSH_ACTION, date_from: Date.yesterday, date_to: Date.today } expect { subject } - .to change { counter_class.count_unique_events(tracking_params) } + .to change { counter_class.count_unique(tracking_params) } .from(0).to(1) end end @@ -273,7 +273,7 @@ RSpec.describe EventCreateService do tracking_params = { event_action: counter_class::PUSH_ACTION, date_from: Date.yesterday, date_to: Date.today } expect { subject } - .to change { counter_class.count_unique_events(tracking_params) } + .to change { counter_class.count_unique(tracking_params) } .from(0).to(1) end end @@ -328,7 +328,7 @@ RSpec.describe EventCreateService do tracking_params = { event_action: counter_class::DESIGN_ACTION, date_from: Date.yesterday, date_to: Date.today } expect { result } - .to change { counter_class.count_unique_events(tracking_params) } + .to change { counter_class.count_unique(tracking_params) } .from(0).to(1) end end @@ -356,7 +356,7 @@ RSpec.describe EventCreateService do tracking_params = { event_action: counter_class::DESIGN_ACTION, date_from: Date.yesterday, date_to: Date.today } expect { result } - .to change { counter_class.count_unique_events(tracking_params) } + .to change { counter_class.count_unique(tracking_params) } .from(0).to(1) end end diff --git a/spec/services/resource_access_tokens/create_service_spec.rb b/spec/services/resource_access_tokens/create_service_spec.rb index f22c379cd30..7dbd55a6909 100644 --- a/spec/services/resource_access_tokens/create_service_spec.rb +++ b/spec/services/resource_access_tokens/create_service_spec.rb @@ -34,6 +34,16 @@ RSpec.describe ResourceAccessTokens::CreateService do end end + shared_examples 'fails on gitlab.com' do + before do + allow(Gitlab).to receive(:com?) { true } + end + + it 'returns nil' do + expect(subject).to be nil + end + end + shared_examples 'allows creation of bot with valid params' do it { expect { subject }.to change { User.count }.by(1) } @@ -171,6 +181,7 @@ RSpec.describe ResourceAccessTokens::CreateService do it_behaves_like 'fails when user does not have the permission to create a Resource Bot' it_behaves_like 'fails when flag is disabled' + it_behaves_like 'fails on gitlab.com' context 'user with valid permission' do before_all do diff --git a/spec/services/todo_service_spec.rb b/spec/services/todo_service_spec.rb index 13da76263b1..94d4b61933d 100644 --- a/spec/services/todo_service_spec.rb +++ b/spec/services/todo_service_spec.rb @@ -59,6 +59,10 @@ RSpec.describe TodoService do should_not_create_todo(user: guest, target: addressed_target_assigned, action: Todo::DIRECTLY_ADDRESSED) end + + it 'does not create a todo if already assigned' do + should_not_create_any_todo { service.send(described_method, target_assigned, author, [john_doe]) } + end end describe 'Issues' do @@ -573,10 +577,10 @@ RSpec.describe TodoService do end end - describe '#reassigned_issuable' do - let(:described_method) { :reassigned_issuable } + describe '#reassigned_assignable' do + let(:described_method) { :reassigned_assignable } - context 'issuable is a merge request' do + context 'assignable is a merge request' do it_behaves_like 'reassigned target' do let(:target_assigned) { create(:merge_request, source_project: project, author: author, assignees: [john_doe], description: "- [ ] Task 1\n- [ ] Task 2 #{mentions}") } let(:addressed_target_assigned) { create(:merge_request, source_project: project, author: author, assignees: [john_doe], description: "#{directly_addressed}\n- [ ] Task 1\n- [ ] Task 2") } @@ -584,13 +588,21 @@ RSpec.describe TodoService do end end - context 'issuable is an issue' do + context 'assignable is an issue' do it_behaves_like 'reassigned target' do let(:target_assigned) { create(:issue, project: project, author: author, assignees: [john_doe], description: "- [ ] Task 1\n- [ ] Task 2 #{mentions}") } let(:addressed_target_assigned) { create(:issue, project: project, author: author, assignees: [john_doe], description: "#{directly_addressed}\n- [ ] Task 1\n- [ ] Task 2") } let(:target_unassigned) { create(:issue, project: project, author: author, assignees: []) } end end + + context 'assignable is an alert' do + it_behaves_like 'reassigned target' do + let(:target_assigned) { create(:alert_management_alert, project: project, assignees: [john_doe]) } + let(:addressed_target_assigned) { create(:alert_management_alert, project: project, assignees: [john_doe]) } + let(:target_unassigned) { create(:alert_management_alert, project: project, assignees: []) } + end + end end describe 'Merge Requests' do @@ -778,16 +790,6 @@ RSpec.describe TodoService do end end - describe '#assign_alert' do - let(:described_method) { :assign_alert } - - it_behaves_like 'reassigned target' do - let(:target_assigned) { create(:alert_management_alert, project: project, assignees: [john_doe]) } - let(:addressed_target_assigned) { create(:alert_management_alert, project: project, assignees: [john_doe]) } - let(:target_unassigned) { create(:alert_management_alert, project: project, assignees: []) } - end - end - describe '#merge_request_build_failed' do let(:merge_participants) { [mr_unassigned.author, admin] } |