diff options
| author | jessib <jessib@riseup.net> | 2014-01-27 10:30:11 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2014-01-27 10:30:11 -0800 |
| commit | 7e0573f3347dca6323eae05127849431ecbceb77 (patch) | |
| tree | 8a6ff58fdcc93493b5a8f332350b0a9292119906 /users/test/functional | |
| parent | 3bfbf0ad20bb5b8e4689fda287cd47738571d10d (diff) | |
| parent | d578c07e196cd9758fbf1752a9bb8477c260bb30 (diff) | |
Merge branch 'develop' into feature/messages_api
Conflicts:
users/config/locales/en.yml
Diffstat (limited to 'users/test/functional')
| -rw-r--r-- | users/test/functional/users_controller_test.rb | 2 |
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 002a011..57ae94d 100644 --- a/users/test/functional/users_controller_test.rb +++ b/users/test/functional/users_controller_test.rb @@ -103,7 +103,7 @@ class UsersControllerTest < ActionController::TestCase delete :destroy, :id => @current_user.id assert_response :redirect - assert_redirected_to home_path + assert_redirected_to bye_url end test "non-admin can't destroy user" do |