summaryrefslogtreecommitdiff
path: root/users/test
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-12-22 01:45:41 -0800
committerelijah <elijah@riseup.net>2013-12-22 02:00:49 -0800
commit665964bcbba69829a4ff1e7d7bd936f90d49b3f7 (patch)
treebc5356220eaca2465bd135f45edf8000d6c254be /users/test
parent5bf1462140a7aa17ea815ccc5105ace6fa878d83 (diff)
locale prefix support:
* set locale based on request header * enforce locale path prefix when current locale is not the default * note: don't use root_path anymore, instead use home_path
Diffstat (limited to 'users/test')
-rw-r--r--users/test/functional/sessions_controller_test.rb6
-rw-r--r--users/test/functional/users_controller_test.rb2
-rw-r--r--users/test/support/auth_test_helper.rb2
3 files changed, 5 insertions, 5 deletions
diff --git a/users/test/functional/sessions_controller_test.rb b/users/test/functional/sessions_controller_test.rb
index 8b49005..fe7903f 100644
--- a/users/test/functional/sessions_controller_test.rb
+++ b/users/test/functional/sessions_controller_test.rb
@@ -17,11 +17,11 @@ class SessionsControllerTest < ActionController::TestCase
assert_template "sessions/new"
end
- test "redirect to root_url if logged in" do
+ test "redirect to home_url if logged in" do
login
get :new
assert_response :redirect
- assert_redirected_to root_url
+ assert_redirected_to home_url
end
test "renders json" do
@@ -53,7 +53,7 @@ class SessionsControllerTest < ActionController::TestCase
expect_logout
delete :destroy
assert_response :redirect
- assert_redirected_to root_url
+ assert_redirected_to home_url
end
end
diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index 9c5f8d9..002a011 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 root_path
+ assert_redirected_to home_path
end
test "non-admin can't destroy user" do
diff --git a/users/test/support/auth_test_helper.rb b/users/test/support/auth_test_helper.rb
index 50e9453..57f9f9b 100644
--- a/users/test/support/auth_test_helper.rb
+++ b/users/test/support/auth_test_helper.rb
@@ -27,7 +27,7 @@ module AuthTestHelper
else
if logged_in
assert_equal({:alert => I18n.t(:not_authorized)}, flash.to_hash)
- assert_redirected_to root_url
+ assert_redirected_to home_url
else
assert_equal({:alert => I18n.t(:not_authorized_login)}, flash.to_hash)
assert_redirected_to login_url