diff options
author | Valery Sizov <valery@gitlab.com> | 2017-04-19 18:17:46 +0300 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2017-04-20 13:28:04 +0300 |
commit | 36a8cc3eca62c28ff9001be9378f76b7d59a2f4d (patch) | |
tree | e572b7b46037171d8a7e154a43c04265d0e4c176 /spec | |
parent | 59a330f4cde708986b9112883b4d4f92b76e5c08 (diff) | |
download | gitlab-ce-36a8cc3eca62c28ff9001be9378f76b7d59a2f4d.tar.gz |
Remove helpers assigned_issuables_count and cached_assigned_issuables_countuassign_on_member_removing
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/issue_spec.rb | 5 | ||||
-rw-r--r-- | spec/models/merge_request_spec.rb | 10 | ||||
-rw-r--r-- | spec/services/members/authorized_destroy_service_spec.rb | 8 |
3 files changed, 14 insertions, 9 deletions
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb index d057c9cf6e9..11befd4edfe 100644 --- a/spec/models/issue_spec.rb +++ b/spec/models/issue_spec.rb @@ -361,7 +361,10 @@ describe Issue, models: true do it 'updates when assignees change' do user1 = create(:user) user2 = create(:user) - issue = create(:issue, assignee: user1) + project = create(:empty_project) + issue = create(:issue, assignee: user1, project: project) + project.add_developer(user1) + project.add_developer(user2) expect(user1.assigned_open_issues_count).to eq(1) expect(user2.assigned_open_issues_count).to eq(0) diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 90b3a2ba42d..415d3e7b200 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -820,15 +820,17 @@ describe MergeRequest, models: true do user1 = create(:user) user2 = create(:user) mr = create(:merge_request, assignee: user1) + mr.project.add_developer(user1) + mr.project.add_developer(user2) - expect(user1.assigned_open_merge_request_count).to eq(1) - expect(user2.assigned_open_merge_request_count).to eq(0) + expect(user1.assigned_open_merge_requests_count).to eq(1) + expect(user2.assigned_open_merge_requests_count).to eq(0) mr.assignee = user2 mr.save - expect(user1.assigned_open_merge_request_count).to eq(0) - expect(user2.assigned_open_merge_request_count).to eq(1) + expect(user1.assigned_open_merge_requests_count).to eq(0) + expect(user2.assigned_open_merge_requests_count).to eq(1) end end diff --git a/spec/services/members/authorized_destroy_service_spec.rb b/spec/services/members/authorized_destroy_service_spec.rb index 5cf2a4f656c..3b35a3b8e3a 100644 --- a/spec/services/members/authorized_destroy_service_spec.rb +++ b/spec/services/members/authorized_destroy_service_spec.rb @@ -21,8 +21,8 @@ describe Members::AuthorizedDestroyService, services: true do member = group.members.find_by(user_id: member_user.id) - expect{ described_class.new(member, member_user).execute } - .to change{ number_of_assigned_issuables(member_user) }.from(4).to(2) + expect { described_class.new(member, member_user).execute } + .to change { number_of_assigned_issuables(member_user) }.from(4).to(2) expect(issue.reload.assignee_id).to be_nil expect(merge_request.reload.assignee_id).to be_nil @@ -38,8 +38,8 @@ describe Members::AuthorizedDestroyService, services: true do member = project.members.find_by(user_id: member_user.id) - expect{ described_class.new(member, member_user).execute } - .to change{ number_of_assigned_issuables(member_user) }.from(2).to(0) + expect { described_class.new(member, member_user).execute } + .to change { number_of_assigned_issuables(member_user) }.from(2).to(0) end end end |