Commit 681f9aca authored by Paco Guzman's avatar Paco Guzman

Fix notification_service argument error of declined invitation emails

Removing unused access_level parameter.

Bug introduced here -> 6d103a2f
access_level parameter wasn’t needed since -> 88c26393
parent 12fe6a6f
...@@ -141,6 +141,7 @@ v 8.11.0 (unreleased) ...@@ -141,6 +141,7 @@ v 8.11.0 (unreleased)
- Each `File::exists?` replaced to `File::exist?` because of deprecate since ruby version 2.2.0 - Each `File::exists?` replaced to `File::exist?` because of deprecate since ruby version 2.2.0
- Add auto-completition in pipeline (Katarzyna Kobierska Ula Budziszewska) - Add auto-completition in pipeline (Katarzyna Kobierska Ula Budziszewska)
- Add pipelines tab to merge requests - Add pipelines tab to merge requests
- Fix notification_service argument error of declined invitation emails
- Fix a memory leak caused by Banzai::Filter::SanitizationFilter - Fix a memory leak caused by Banzai::Filter::SanitizationFilter
- Speed up todos queries by limiting the projects set we join with - Speed up todos queries by limiting the projects set we join with
- Ensure file editing in UI does not overwrite commited changes without warning user - Ensure file editing in UI does not overwrite commited changes without warning user
......
...@@ -242,7 +242,6 @@ class NotificationService ...@@ -242,7 +242,6 @@ class NotificationService
project_member.real_source_type, project_member.real_source_type,
project_member.project.id, project_member.project.id,
project_member.invite_email, project_member.invite_email,
project_member.access_level,
project_member.created_by_id project_member.created_by_id
).deliver_later ).deliver_later
end end
...@@ -269,7 +268,6 @@ class NotificationService ...@@ -269,7 +268,6 @@ class NotificationService
group_member.real_source_type, group_member.real_source_type,
group_member.group.id, group_member.group.id,
group_member.invite_email, group_member.invite_email,
group_member.access_level,
group_member.created_by_id group_member.created_by_id
).deliver_later ).deliver_later
end end
......
...@@ -1113,6 +1113,46 @@ describe NotificationService, services: true do ...@@ -1113,6 +1113,46 @@ describe NotificationService, services: true do
end end
end end
describe 'GroupMember' do
describe '#decline_group_invite' do
let(:creator) { create(:user) }
let(:group) { create(:group) }
let(:member) { create(:user) }
before(:each) do
group.add_owner(creator)
group.add_developer(member, creator)
end
it do
group_member = group.members.first
expect do
notification.decline_group_invite(group_member)
end.to change { ActionMailer::Base.deliveries.size }.by(1)
end
end
end
describe 'ProjectMember' do
describe '#decline_group_invite' do
let(:project) { create(:project) }
let(:member) { create(:user) }
before(:each) do
project.team << [member, :developer, project.owner]
end
it do
project_member = project.members.first
expect do
notification.decline_project_invite(project_member)
end.to change { ActionMailer::Base.deliveries.size }.by(1)
end
end
end
def build_team(project) def build_team(project)
@u_watcher = create_global_setting_for(create(:user), :watch) @u_watcher = create_global_setting_for(create(:user), :watch)
@u_participating = create_global_setting_for(create(:user), :participating) @u_participating = create_global_setting_for(create(:user), :participating)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment