Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
22db34b0
Commit
22db34b0
authored
Apr 26, 2021
by
Abdul Wadood
Committed by
Kerri Miller
Apr 26, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Rails/SaveBang offenses in ee/spec/mailers
parent
8169fe18
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
.rubocop_manual_todo.yml
.rubocop_manual_todo.yml
+0
-1
ee/changelogs/unreleased/rails-save-bang-ee-spec-mailers.yml
ee/changelogs/unreleased/rails-save-bang-ee-spec-mailers.yml
+5
-0
ee/spec/mailers/notify_spec.rb
ee/spec/mailers/notify_spec.rb
+4
-8
No files found.
.rubocop_manual_todo.yml
View file @
22db34b0
...
...
@@ -60,7 +60,6 @@ Rails/SaveBang:
-
'
ee/spec/lib/gitlab/git_access_spec.rb'
-
'
ee/spec/lib/gitlab/import_export/group/relation_factory_spec.rb'
-
'
ee/spec/lib/gitlab/mirror_spec.rb'
-
'
ee/spec/mailers/notify_spec.rb'
-
'
ee/spec/models/application_setting_spec.rb'
-
'
ee/spec/models/approval_merge_request_rule_spec.rb'
-
'
ee/spec/models/approval_project_rule_spec.rb'
...
...
ee/changelogs/unreleased/rails-save-bang-ee-spec-mailers.yml
0 → 100644
View file @
22db34b0
---
title
:
Fix Rails/SaveBang rubocop offenses in ee/spec/mailers
merge_request
:
58097
author
:
Abdul Wadood @abdulwd
type
:
fixed
ee/spec/mailers/notify_spec.rb
View file @
22db34b0
...
...
@@ -93,8 +93,8 @@ RSpec.describe Notify do
subject
{
described_class
.
approved_merge_request_email
(
recipient
.
id
,
merge_request
.
id
,
last_approver
.
id
)
}
before
do
merge_request
.
approvals
.
create
(
user:
assignee
)
merge_request
.
approvals
.
create
(
user:
last_approver
)
merge_request
.
approvals
.
create
!
(
user:
assignee
)
merge_request
.
approvals
.
create
!
(
user:
last_approver
)
end
it_behaves_like
'a multiple recipients email'
...
...
@@ -141,7 +141,7 @@ RSpec.describe Notify do
context
'when merge request has no assignee'
do
before
do
merge_request
.
update
(
assignees:
[])
merge_request
.
update
!
(
assignees:
[])
end
it
'does not show the assignee'
do
...
...
@@ -156,7 +156,7 @@ RSpec.describe Notify do
subject
{
described_class
.
unapproved_merge_request_email
(
recipient
.
id
,
merge_request
.
id
,
last_unapprover
.
id
)
}
before
do
merge_request
.
approvals
.
create
(
user:
assignee
)
merge_request
.
approvals
.
create
!
(
user:
assignee
)
end
it_behaves_like
'a multiple recipients email'
...
...
@@ -209,10 +209,6 @@ RSpec.describe Notify do
subject
{
described_class
.
unapproved_merge_request_email
(
recipient
.
id
,
merge_request_without_assignee
.
id
,
last_unapprover
.
id
)
}
before
do
merge_request_without_assignee
.
approvals
.
create
(
user:
merge_request_without_assignee
.
assignees
.
first
)
end
it
'contains the new status'
do
is_expected
.
to
have_body_text
(
'unapproved'
)
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment