From: Tom Hughes <tom@compton.nu>
Date: Fri, 9 Oct 2009 09:13:13 +0000 (+0000)
Subject: Fix tests which do logins to handle the cookie test.
X-Git-Tag: live~6557
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fc9df968fc1403a2130e5774552c430b2c0acf59

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 d4fd68a14..8e08cbda0 100644
--- 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
+    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!
diff --git a/test/integration/user_blocks_test.rb b/test/integration/user_blocks_test.rb
index f0b9070d6..ecd1d37c5 100644
--- 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
+    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!
diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb
index df8b1561f..0691edc8e 100644
--- 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)
+    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!
@@ -30,6 +35,11 @@ class UserRolesControllerTest < ActionController::IntegrationTest
   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!