Commit 94668490 authored by Sean McGivern's avatar Sean McGivern

Merge branch '30676-project-export-email' into 'master'

Fix email not being sent after project export

Closes #30676

See merge request !10578
parents c98add15 3a33a795
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Project #{@project.name} was exported successfully. Project #{@project.name} was exported successfully.
%p %p
The project export can be downloaded from: The project export can be downloaded from:
= link_to download_export_namespace_project_url(@project.namespace, @project), rel: 'nofollow', download: '', do = link_to download_export_namespace_project_url(@project.namespace, @project), rel: 'nofollow', download: '' do
= @project.name_with_namespace + " export" = @project.name_with_namespace + " export"
%p %p
The download link will expire in 24 hours. The download link will expire in 24 hours.
...@@ -1181,6 +1181,22 @@ describe NotificationService, services: true do ...@@ -1181,6 +1181,22 @@ describe NotificationService, services: true do
should_not_email(@u_disabled) should_not_email(@u_disabled)
end end
end end
describe '#project_exported' do
it do
notification.project_exported(project, @u_disabled)
should_only_email(@u_disabled)
end
end
describe '#project_not_exported' do
it do
notification.project_not_exported(project, @u_disabled, ['error'])
should_only_email(@u_disabled)
end
end
end end
describe 'GroupMember' do describe 'GroupMember' do
......
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