Fix tests which do logins to handle the cookie test.

diff --git a/test/integration/client_application_test.rb b/test/integration/client_application_test.rb
index d4fd68a14d028c43a170db6dca7657ed73778933..8e08cbda0f9da15d8df3d46bb5896b519285a8d1 100644 (file)
--- a/test/integration/client_application_test.rb
+++ b/test/integration/client_application_test.rb
@@ -7,6 +7,11 @@ class ClientApplicationTest < ActionController::IntegrationTest
   # run through the procedure of creating a client application and checking
   # that it shows up on the user's account page.
   def test_create_application
   # run through the procedure of creating a client application and checking
   # that it shows up on the user's account page.
   def test_create_application

+    get '/login'
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+    follow_redirect!
+    assert_response :success

     post '/login', {'user[email]' => "test@example.com", 'user[password]' => "test", :referer => '/user/test2'}
     assert_response :redirect
     follow_redirect!
     post '/login', {'user[email]' => "test@example.com", 'user[password]' => "test", :referer => '/user/test2'}
     assert_response :redirect
     follow_redirect!

diff --git a/test/integration/user_blocks_test.rb b/test/integration/user_blocks_test.rb
index f0b9070d6d2a0d3c50eb09dd2283cfc7cc7733ff..ecd1d37c5204fe0cc87acee8dcc3d31fa3bd415a 100644 (file)
--- a/test/integration/user_blocks_test.rb
+++ b/test/integration/user_blocks_test.rb
@@ -37,6 +37,11 @@ class UserBlocksTest < ActionController::IntegrationTest
     assert_response :forbidden
 
     # revoke the ban
     assert_response :forbidden
 
     # revoke the ban

+    get '/login'
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+    follow_redirect!
+    assert_response :success

     post '/login', {'user[email]' => moderator.email, 'user[password]' => "test", :referer => "/blocks/#{block.id}/revoke"}
     assert_response :redirect
     follow_redirect!
     post '/login', {'user[email]' => moderator.email, 'user[password]' => "test", :referer => "/blocks/#{block.id}/revoke"}
     assert_response :redirect
     follow_redirect!

diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb
index df8b1561f0083d5aa26dc9a32685b0d43eb146a0..0691edc8ea0e763436cc5ca7e0e218ede1022d66 100644 (file)
--- a/test/integration/user_roles_test.rb
+++ b/test/integration/user_roles_test.rb
@@ -17,6 +17,11 @@ class UserRolesControllerTest < ActionController::IntegrationTest
   end
 
   def check_fail(action, user, role)
   end
 
   def check_fail(action, user, role)

+    get '/login'
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+    follow_redirect!
+    assert_response :success

     post '/login', {'user[email]' => users(user).email, 'user[password]' => "test", :referer => "/"}
     assert_response :redirect
     follow_redirect!
     post '/login', {'user[email]' => users(user).email, 'user[password]' => "test", :referer => "/"}
     assert_response :redirect
     follow_redirect!


@@ -30,6 +35,11 @@ class UserRolesControllerTest < ActionController::IntegrationTest
   end
 
   def check_success(action, user, role)
   end
 
   def check_success(action, user, role)

+    get '/login'
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+    follow_redirect!
+    assert_response :success

     post '/login', {'user[email]' => users(user).email, 'user[password]' => "test", :referer => "/"}
     assert_response :redirect
     follow_redirect!
     post '/login', {'user[email]' => users(user).email, 'user[password]' => "test", :referer => "/"}
     assert_response :redirect
     follow_redirect!