summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.rubocop_todo.yml1
-rw-r--r--test/functional/account_controller_test.rb2
2 files changed, 1 insertions, 2 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ecec91511..df5bd12c7 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -384,7 +384,6 @@ Lint/Loop:
Lint/ParenthesesAsGroupedExpression:
Exclude:
- - 'test/functional/account_controller_test.rb'
- 'test/functional/email_addresses_controller_test.rb'
- 'test/functional/my_controller_test.rb'
- 'test/functional/settings_controller_test.rb'
diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index a56fcdc03..8b9ced75a 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -547,7 +547,7 @@ class AccountControllerTest < Redmine::ControllerTest
user.reload
assert user.check_password?('newpass123')
assert_nil Token.find_by_id(token.id), "Token was not deleted"
- assert_not_nil (mail = ActionMailer::Base.deliveries.last)
+ assert_not_nil ActionMailer::Base.deliveries.last
assert_select_email do
assert_select 'a[href^=?]', 'http://localhost:3000/my/password', :text => 'Change password'
end