summaryrefslogtreecommitdiffstats
path: root/test/integration/admin_test.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-12-20 16:09:28 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-12-20 16:09:28 +0000
commitc2eb894f6759e49e225d2c30f01d1869498bb6bd (patch)
treea701faa68cbf5e94653c17592a0a3fcde1e115a0 /test/integration/admin_test.rb
parentc5697e01e4a90ebfbf4e5ba4cbe828a4ac49fb23 (diff)
downloadredmine-c2eb894f6759e49e225d2c30f01d1869498bb6bd.tar.gz
redmine-c2eb894f6759e49e225d2c30f01d1869498bb6bd.zip
Merged r16059, r16060, r16064, r16072.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16107 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/integration/admin_test.rb')
-rw-r--r--test/integration/admin_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/admin_test.rb b/test/integration/admin_test.rb
index 22a675a71..1884645ab 100644
--- a/test/integration/admin_test.rb
+++ b/test/integration/admin_test.rb
@@ -48,7 +48,7 @@ class AdminTest < Redmine::IntegrationTest
put "/users/#{user.id}", :id => user.id, :user => { :status => User::STATUS_LOCKED }
assert_redirected_to "/users/#{ user.id }/edit"
locked_user = User.try_to_login("psmith", "psmith09")
- assert_equal nil, locked_user
+ assert_nil locked_user
end
test "Add a user as an anonymous user should fail" do