Make it clear that notes are for map improvements

[rails.git] / test / functional / user_controller_test.rb

diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb
index 66fcef78509ff78e0efd5795fb8c157228f5ff35..3a9c93238c0c7cfa66895fcf8dcf070ea2db3000 100644 (file)
--- a/test/functional/user_controller_test.rb
+++ b/test/functional/user_controller_test.rb
@@ -49,10 +49,6 @@ class UserControllerTest < ActionController::TestCase
       { :path => "/user/new", :method => :get },
       { :controller => "user", :action => "new" }
     )
       { :path => "/user/new", :method => :get },
       { :controller => "user", :action => "new" }
     )

-    assert_recognizes(
-      { :controller => "user", :action => "new" },
-      { :path => "/create-account.html", :method => :get }
-    )

 
     assert_routing(
       { :path => "/user/new", :method => :post },
 
     assert_routing(
       { :path => "/user/new", :method => :post },


@@ -112,10 +108,6 @@ class UserControllerTest < ActionController::TestCase
       { :path => "/user/forgot-password", :method => :post },
       { :controller => "user", :action => "lost_password" }
     )
       { :path => "/user/forgot-password", :method => :post },
       { :controller => "user", :action => "lost_password" }
     )

-    assert_recognizes(
-      { :controller => "user", :action => "lost_password" },
-      { :path => "/forgot-password.html", :method => :get }
-    )

     assert_routing(
       { :path => "/user/reset-password", :method => :get },
       { :controller => "user", :action => "reset_password" }
     assert_routing(
       { :path => "/user/reset-password", :method => :get },
       { :controller => "user", :action => "reset_password" }


@@ -260,7 +252,7 @@ class UserControllerTest < ActionController::TestCase
 
     assert_response :success
     assert_template 'new'
 
     assert_response :success
     assert_template 'new'

-    assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_email"
+    assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email"

   end
 
   def test_user_create_submit_duplicate_email_uppercase
   end
 
   def test_user_create_submit_duplicate_email_uppercase


@@ -275,7 +267,7 @@ class UserControllerTest < ActionController::TestCase
 
     assert_response :success
     assert_template 'new'
 
     assert_response :success
     assert_template 'new'

-    assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_email"
+    assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email"

   end
     
   def test_user_create_submit_duplicate_name
   end
     
   def test_user_create_submit_duplicate_name


@@ -290,7 +282,7 @@ class UserControllerTest < ActionController::TestCase
 
     assert_response :success
     assert_template 'new'
 
     assert_response :success
     assert_template 'new'

-    assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
+    assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name"

   end
   
   def test_user_create_submit_duplicate_name_uppercase
   end
   
   def test_user_create_submit_duplicate_name_uppercase


@@ -305,7 +297,7 @@ class UserControllerTest < ActionController::TestCase
 
     assert_response :success
     assert_template 'new'
 
     assert_response :success
     assert_template 'new'

-    assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
+    assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name"

   end
 
   def test_user_save_referer_params
   end
 
   def test_user_save_referer_params


@@ -397,7 +389,7 @@ class UserControllerTest < ActionController::TestCase
     end
     assert_response :success
     assert_template :lost_password
     end
     assert_response :success
     assert_template :lost_password

-    assert_select "div#error", /^Could not find that email address/
+    assert_select ".error", /^Could not find that email address/

 
     # Test resetting using the address as recorded for a user that has an
     # address which is case insensitively unique
 
     # Test resetting using the address as recorded for a user that has an
     # address which is case insensitively unique


@@ -476,7 +468,7 @@ class UserControllerTest < ActionController::TestCase
     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false
     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false

-    assert_select "div#notice", /^User information updated successfully/
+    assert_select ".notice", /^User information updated successfully/

     assert_select "form#accountForm > fieldset > div.form-row > div#user_description_container > div#user_description_content > textarea#user_description", user.description
 
     # Changing name to one that exists should fail
     assert_select "form#accountForm > fieldset > div.form-row > div#user_description_container > div#user_description_content > textarea#user_description", user.description
 
     # Changing name to one that exists should fail


@@ -484,18 +476,18 @@ class UserControllerTest < ActionController::TestCase
     post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id }
     assert_response :success
     assert_template :account
     post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id }
     assert_response :success
     assert_template :account

-    assert_select "div#notice", false
+    assert_select ".notice", false

     assert_select "div#errorExplanation"
     assert_select "div#errorExplanation"

-    assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
+    assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_display_name"

 
     # Changing name to one that exists should fail, regardless of case
     new_attributes = user.attributes.dup.merge(:display_name => users(:public_user).display_name.upcase)
     post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id }
     assert_response :success
     assert_template :account
 
     # Changing name to one that exists should fail, regardless of case
     new_attributes = user.attributes.dup.merge(:display_name => users(:public_user).display_name.upcase)
     post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id }
     assert_response :success
     assert_template :account

-    assert_select "div#notice", false
+    assert_select ".notice", false

     assert_select "div#errorExplanation"
     assert_select "div#errorExplanation"

-    assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
+    assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_display_name"

 
     # Changing name to one that doesn't exist should work
     new_attributes = user.attributes.dup.merge(:display_name => "new tester")
 
     # Changing name to one that doesn't exist should work
     new_attributes = user.attributes.dup.merge(:display_name => "new tester")


@@ -503,7 +495,7 @@ class UserControllerTest < ActionController::TestCase
     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false
     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false

-    assert_select "div#notice", /^User information updated successfully/
+    assert_select ".notice", /^User information updated successfully/

     assert_select "form#accountForm > fieldset > div.form-row > input#user_display_name[value=?]", "new tester"
 
     # Record the change of name
     assert_select "form#accountForm > fieldset > div.form-row > input#user_display_name[value=?]", "new tester"
 
     # Record the change of name


@@ -514,18 +506,18 @@ class UserControllerTest < ActionController::TestCase
     post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
     assert_response :success
     assert_template :account
     post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
     assert_response :success
     assert_template :account

-    assert_select "div#notice", false
+    assert_select ".notice", false

     assert_select "div#errorExplanation"
     assert_select "div#errorExplanation"

-    assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_new_email"
+    assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_new_email"

 
     # Changing email to one that exists should fail, regardless of case
     user.new_email = users(:public_user).email.upcase
     post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
     assert_response :success
     assert_template :account
 
     # Changing email to one that exists should fail, regardless of case
     user.new_email = users(:public_user).email.upcase
     post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
     assert_response :success
     assert_template :account

-    assert_select "div#notice", false
+    assert_select ".notice", false

     assert_select "div#errorExplanation"
     assert_select "div#errorExplanation"

-    assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_new_email"
+    assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_new_email"

 
     # Changing email to one that doesn't exist should work
     user.new_email = "new_tester@example.com"
 
     # Changing email to one that doesn't exist should work
     user.new_email = "new_tester@example.com"


@@ -533,7 +525,7 @@ class UserControllerTest < ActionController::TestCase
     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false
     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false

-    assert_select "div#notice", /^User information updated successfully/
+    assert_select ".notice", /^User information updated successfully/

     assert_select "form#accountForm > fieldset > div.form-row > input#user_new_email[value=?]", user.new_email
   end
   
     assert_select "form#accountForm > fieldset > div.form-row > input#user_new_email[value=?]", user.new_email
   end
   


@@ -548,7 +540,7 @@ class UserControllerTest < ActionController::TestCase
     get :view, {:display_name => "test"}
     assert_response :success
     assert_select "div#userinformation" do
     get :view, {:display_name => "test"}
     assert_response :success
     assert_select "div#userinformation" do

-      assert_select "a[href=/user/test/edits]", 1
+      assert_select "a[href^=/user/test/history]", 1

       assert_select "a[href=/user/test/traces]", 1
       assert_select "a[href=/user/test/diary]", 1
       assert_select "a[href=/user/test/diary/comments]", 1
       assert_select "a[href=/user/test/traces]", 1
       assert_select "a[href=/user/test/diary]", 1
       assert_select "a[href=/user/test/diary/comments]", 1


@@ -562,7 +554,7 @@ class UserControllerTest < ActionController::TestCase
     get :view, {:display_name => "blocked"}
     assert_response :success
     assert_select "div#userinformation" do
     get :view, {:display_name => "blocked"}
     assert_response :success
     assert_select "div#userinformation" do

-      assert_select "a[href=/user/blocked/edits]", 1
+      assert_select "a[href^=/user/blocked/history]", 1

       assert_select "a[href=/user/blocked/traces]", 1
       assert_select "a[href=/user/blocked/diary]", 1
       assert_select "a[href=/user/blocked/diary/comments]", 1
       assert_select "a[href=/user/blocked/traces]", 1
       assert_select "a[href=/user/blocked/diary]", 1
       assert_select "a[href=/user/blocked/diary/comments]", 1


@@ -576,7 +568,7 @@ class UserControllerTest < ActionController::TestCase
     get :view, {:display_name => "moderator"}
     assert_response :success
     assert_select "div#userinformation" do
     get :view, {:display_name => "moderator"}
     assert_response :success
     assert_select "div#userinformation" do

-      assert_select "a[href=/user/moderator/edits]", 1
+      assert_select "a[href^=/user/moderator/history]", 1

       assert_select "a[href=/user/moderator/traces]", 1
       assert_select "a[href=/user/moderator/diary]", 1
       assert_select "a[href=/user/moderator/diary/comments]", 1
       assert_select "a[href=/user/moderator/traces]", 1
       assert_select "a[href=/user/moderator/diary]", 1
       assert_select "a[href=/user/moderator/diary/comments]", 1


@@ -593,7 +585,7 @@ class UserControllerTest < ActionController::TestCase
     get :view, {:display_name => "test"}
     assert_response :success
     assert_select "div#userinformation" do
     get :view, {:display_name => "test"}
     assert_response :success
     assert_select "div#userinformation" do

-      assert_select "a[href=/user/test/edits]", 1
+      assert_select "a[href^=/user/test/history]", 1

       assert_select "a[href=/traces/mine]", 1
       assert_select "a[href=/user/test/diary]", 1
       assert_select "a[href=/user/test/diary/comments]", 1
       assert_select "a[href=/traces/mine]", 1
       assert_select "a[href=/user/test/diary]", 1
       assert_select "a[href=/user/test/diary/comments]", 1


@@ -610,7 +602,7 @@ class UserControllerTest < ActionController::TestCase
     get :view, {:display_name => "test"}
     assert_response :success
     assert_select "div#userinformation" do
     get :view, {:display_name => "test"}
     assert_response :success
     assert_select "div#userinformation" do

-      assert_select "a[href=/user/test/edits]", 1
+      assert_select "a[href^=/user/test/history]", 1

       assert_select "a[href=/user/test/traces]", 1
       assert_select "a[href=/user/test/diary]", 1
       assert_select "a[href=/user/test/diary/comments]", 1
       assert_select "a[href=/user/test/traces]", 1
       assert_select "a[href=/user/test/diary]", 1
       assert_select "a[href=/user/test/diary/comments]", 1