Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
d1425441
Commit
d1425441
authored
7 years ago
by
Matt Jankowski
Committed by
Eugen Rochko
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Spec coverage and refactor of digest mailer worker (#2961)
parent
7ac09251
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/workers/digest_mailer_worker.rb
+13
-2
13 additions, 2 deletions
app/workers/digest_mailer_worker.rb
spec/workers/digest_mailer_worker_spec.rb
+36
-0
36 additions, 0 deletions
spec/workers/digest_mailer_worker_spec.rb
with
49 additions
and
2 deletions
app/workers/digest_mailer_worker.rb
+
13
−
2
View file @
d1425441
...
...
@@ -5,10 +5,21 @@ class DigestMailerWorker
sidekiq_options
queue:
'mailers'
attr_reader
:user
def
perform
(
user_id
)
user
=
User
.
find
(
user_id
)
return
unless
user
.
settings
.
notification_emails
[
'digest'
]
@user
=
User
.
find
(
user_id
)
deliver_digest
if
user_receives_digest?
end
private
def
deliver_digest
NotificationMailer
.
digest
(
user
.
account
).
deliver_now!
user
.
touch
(
:last_emailed_at
)
end
def
user_receives_digest?
user
.
settings
.
notification_emails
[
'digest'
]
end
end
This diff is collapsed.
Click to expand it.
spec/workers/digest_mailer_worker_spec.rb
0 → 100644
+
36
−
0
View file @
d1425441
# frozen_string_literal: true
require
'rails_helper'
describe
DigestMailerWorker
do
describe
'perform'
do
let
(
:user
)
{
Fabricate
(
:user
,
last_emailed_at:
3
.
days
.
ago
)
}
context
'for a user who receives digests'
do
it
'sends the email'
do
service
=
double
(
deliver_now!:
nil
)
allow
(
NotificationMailer
).
to
receive
(
:digest
).
and_return
(
service
)
update_user_digest_setting
(
true
)
described_class
.
perform_async
(
user
.
id
)
expect
(
NotificationMailer
).
to
have_received
(
:digest
)
expect
(
user
.
reload
.
last_emailed_at
).
to
be_within
(
1
).
of
(
Time
.
now
.
utc
)
end
end
context
'for a user who does not receive digests'
do
it
'does not send the email'
do
allow
(
NotificationMailer
).
to
receive
(
:digest
)
update_user_digest_setting
(
false
)
described_class
.
perform_async
(
user
.
id
)
expect
(
NotificationMailer
).
not_to
have_received
(
:digest
)
expect
(
user
.
last_emailed_at
).
to
be_within
(
1
).
of
(
3
.
days
.
ago
)
end
end
def
update_user_digest_setting
(
value
)
user
.
settings
[
'notification_emails'
]
=
user
.
settings
[
'notification_emails'
].
merge
(
'digest'
=>
value
)
end
end
end
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment