summaryrefslogtreecommitdiff
path: root/users/test/functional
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-12-07 17:26:42 +0100
committerAzul <azul@leap.se>2012-12-07 17:26:42 +0100
commit8282b83c798ba4e5c1e26ec8243b82669b3ee6d4 (patch)
tree4df73c0a0f37ee9f16cd3f15fc2d23f458ca09ba /users/test/functional
parentbc2ead40468f0d9372372f73260d83d30e93bc9a (diff)
parentbfe61e5132b379461425ce868e980e3a1ea0260a (diff)
Merge branch 'feature/email-forwards-for-users'
Diffstat (limited to 'users/test/functional')
-rw-r--r--users/test/functional/users_controller_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index 939d105..1840a72 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/users/test/functional/users_controller_test.rb
@@ -35,7 +35,7 @@ class UsersControllerTest < ActionController::TestCase
end
test "should get edit view" do
- user = find_record User
+ user = find_record User, :email => nil, :email_forward => nil
login user
get :edit, :id => user.id