Fixup tests to work after changes to user controller

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 25b46f6f8a8967dc1e109bdbe834c4b5d1b712a4..9802783fd0da0b7dfece5ca063f7ec3013497ad2 100644 (file)
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -72,7 +72,7 @@ administrator_user:
 openid_user:
   id: 7
   email: openid-user@example.com
 openid_user:
   id: 7
   email: openid-user@example.com

-  active: true
+  status: active

   pass_crypt: <%= Digest::MD5.hexdigest('test') %>
   creation_time: "2008-05-01 01:23:45"
   display_name: openIDuser
   pass_crypt: <%= Digest::MD5.hexdigest('test') %>
   creation_time: "2008-05-01 01:23:45"
   display_name: openIDuser

diff --git a/test/integration/client_application_test.rb b/test/integration/client_application_test.rb
index 8e08cbda0f9da15d8df3d46bb5896b519285a8d1..80da36deb38edb975e5753dcbf465c24fe9adf3a 100644 (file)
--- a/test/integration/client_application_test.rb
+++ b/test/integration/client_application_test.rb
@@ -12,7 +12,7 @@ class ClientApplicationTest < ActionController::IntegrationTest
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
     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'}
+    post '/login', {'username' => "test@example.com", 'password' => "test", :referer => '/user/test2'}

     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success

diff --git a/test/integration/user_blocks_test.rb b/test/integration/user_blocks_test.rb
index ecd1d37c5204fe0cc87acee8dcc3d31fa3bd415a..942a94302de8ec4195f2afdb46a0545aa3573af6 100644 (file)
--- a/test/integration/user_blocks_test.rb
+++ b/test/integration/user_blocks_test.rb
@@ -42,7 +42,7 @@ class UserBlocksTest < ActionController::IntegrationTest
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
     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"}
+    post '/login', {'username' => moderator.email, 'password' => "test", :referer => "/blocks/#{block.id}/revoke"}

     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success

diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index da0ffd76872c3a8a5afdcc750b76f3bae2b5f02e..9d937e2596b78b1e6f2e0e32fb092ba4a824a387 100644 (file)
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -134,7 +134,7 @@ class UserCreationTest < ActionController::IntegrationTest
     assert_difference('User.count') do
       assert_difference('ActionMailer::Base.deliveries.size', 1) do
         post "/user/save",
     assert_difference('User.count') do
       assert_difference('ActionMailer::Base.deliveries.size', 1) do
         post "/user/save",

-          {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser"}}
+          {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => "", :pass_crypt_confirmation => ""}}

         assert_response :redirect
         res = openid_request(@response.redirected_to)
         post '/user/save', res
         assert_response :redirect
         res = openid_request(@response.redirected_to)
         post '/user/save', res

diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb
index b686fbac9132d858d6165c3ef33127418efee62a..fab05894fe924a6b55f48629c6bec2d0fa291339 100644 (file)
--- a/test/integration/user_diaries_test.rb
+++ b/test/integration/user_diaries_test.rb
@@ -11,7 +11,7 @@ class UserDiariesTest < ActionController::IntegrationTest
     assert_response :success
     assert_template 'user/login'
     # We can now login
     assert_response :success
     assert_template 'user/login'
     # We can now login

-    post  '/login', {'user[email]' => "test@openstreetmap.org", 'user[password]' => "test", :referer => '/diary/new'}
+    post  '/login', {'username' => "test@openstreetmap.org", 'password' => "test", :referer => '/diary/new'}

     assert_response :redirect
     #print @response.body
     # Check that there is some payload alerting the user to the redirect
     assert_response :redirect
     #print @response.body
     # Check that there is some payload alerting the user to the redirect

diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb
index 0fe5b657043571dc3905613ba359beda7cf01ff3..a272f7bad041962c4cf91bf6e4b80f0c86240fb0 100644 (file)
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -9,16 +9,16 @@ class UserLoginTest < ActionController::IntegrationTest
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success

-    post '/login', {'user[openid_url]' => "http://localhost:1123/john.doe?openid.success=true", :referer => "/browse"}
+    post '/login', {'openid_url' => "http://localhost:1123/john.doe?openid.success=true", :referer => "/browse"}

     assert_response :redirect
 
     assert_response :redirect
 

-       res = openid_request(@response.redirected_to)
-       res2 = post '/login', res
+    res = openid_request(@response.redirected_to)
+    res2 = post '/login', res

 
     assert_response :redirect
     follow_redirect!
 
     assert_response :redirect
     follow_redirect!

-       assert_response :success
-       assert_template 'changeset/list'
+    assert_response :success
+    assert_template 'changeset/list'

   end
 
   def test_login_openid_cancel
   end
 
   def test_login_openid_cancel


@@ -27,14 +27,16 @@ class UserLoginTest < ActionController::IntegrationTest
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success

-    post '/login', {'user[openid_url]' => "http://localhost:1123/john.doe", :referer => "/diary"}
+    post '/login', {'openid_url' => "http://localhost:1123/john.doe", :referer => "/diary"}

     assert_response :redirect
 
     assert_response :redirect
 

-       res = openid_request(@response.redirected_to)
-       post '/login', res
+    res = openid_request(@response.redirected_to)
+    post '/login', res

 
 

-       assert_response :success
-       assert_template 'login'
+    assert_response :redirect
+    follow_redirect!
+    assert_response :success
+    assert_template 'login'

   end
 
   def test_login_openid_invalid_provider
   end
 
   def test_login_openid_invalid_provider


@@ -43,10 +45,12 @@ class UserLoginTest < ActionController::IntegrationTest
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success

-       #Use a different port that doesn't have the OpenID provider running on to test an invalid openID
-    post '/login', {'user[openid_url]' => "http://localhost:1124/john.doe", :referer => "/diary"}
+    #Use a different port that doesn't have the OpenID provider running on to test an invalid openID
+    post '/login', {'openid_url' => "http://localhost:1124/john.doe", :referer => "/diary"}
+    assert_response :redirect
+    follow_redirect!

     assert_response :success
     assert_response :success

-       assert_template 'login'
+    assert_template 'login'

   end
 
   def test_login_openid_invalid_url
   end
 
   def test_login_openid_invalid_url


@@ -55,10 +59,12 @@ class UserLoginTest < ActionController::IntegrationTest
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success

-       #Use a url with an invalid protocol to make sure it handles that correctly too
-    post '/login', {'user[openid_url]' => "htt://localhost:1123/john.doe", :referer => "/diary"}
+    #Use a url with an invalid protocol to make sure it handles that correctly too
+    post '/login', {'openid_url' => "htt://localhost:1123/john.doe", :referer => "/diary"}
+    assert_response :redirect
+    follow_redirect!

     assert_response :success
     assert_response :success

-       assert_template 'login'
+    assert_template 'login'

   end
 
   def test_login_openid_unknown
   end
 
   def test_login_openid_unknown


@@ -67,15 +73,15 @@ class UserLoginTest < ActionController::IntegrationTest
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success

-    post '/login', {'user[openid_url]' => "http://localhost:1123/john.doe?openid.success=true_somethingelse", :referer => "/diary"}
+    post '/login', {'openid_url' => "http://localhost:1123/john.doe?openid.success=true_somethingelse", :referer => "/diary"}

     assert_response :redirect
 
     assert_response :redirect
 

-       res = openid_request(@response.redirected_to)
-       res2 = post '/login', res
+    res = openid_request(@response.redirected_to)
+    res2 = post '/login', res

 
     assert_response :redirect
     follow_redirect!
 
     assert_response :redirect
     follow_redirect!

-       assert_response :success
-       assert_template 'user/new'
+    assert_response :success
+    assert_template 'user/new'

   end
 end
   end
 end

diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb
index 0691edc8ea0e763436cc5ca7e0e218ede1022d66..8bf06374fc41601ed914b0197d2d51712cc26dd4 100644 (file)
--- a/test/integration/user_roles_test.rb
+++ b/test/integration/user_roles_test.rb
@@ -22,7 +22,7 @@ class UserRolesControllerTest < ActionController::IntegrationTest
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
     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 => "/"}
+    post '/login', {'username' => users(user).email, 'password' => "test", :referer => "/"}

     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success


@@ -40,7 +40,7 @@ class UserRolesControllerTest < ActionController::IntegrationTest
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
     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 => "/"}
+    post '/login', {'username' => users(user).email, 'password' => "test", :referer => "/"}

     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success