Use resourceful routes for user new/create actions

[rails.git] / test / controllers / users_controller_test.rb

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index ba1af9509e0fbfaff740a279668f9aa4d247976c..10875b068b9d586c8c81ae38b438364d3ad33447 100644 (file)
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -10,7 +10,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     )
 
     assert_routing(
-      { :path => "/user/new", :method => :post },
+      { :path => "/user", :method => :post },
       { :controller => "users", :action => "create" }
     )
 
@@ -50,11 +50,11 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
   end
 
   # The user creation page loads
-  def test_new_view
-    get user_new_path
-    assert_redirected_to user_new_path(:cookie_test => "true")
+  def test_new
+    get new_user_path
+    assert_redirected_to new_user_path(:cookie_test => "true")
 
-    get user_new_path, :params => { :cookie_test => "true" }
+    get new_user_path, :params => { :cookie_test => "true" }
     assert_response :success
 
     assert_select "html", :count => 1 do
@@ -63,7 +63,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
       end
       assert_select "body", :count => 1 do
         assert_select "div#content", :count => 1 do
-          assert_select "form[action='/user/new'][method='post']", :count => 1 do
+          assert_select "form[action='/user'][method='post']", :count => 1 do
             assert_select "input[id='user_email']", :count => 1
             assert_select "input[id='user_display_name']", :count => 1
             assert_select "input[id='user_pass_crypt'][type='password']", :count => 1
@@ -75,23 +75,23 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
-  def test_new_view_logged_in
+  def test_new_logged_in
     session_for(create(:user))
 
-    get user_new_path
+    get new_user_path
     assert_redirected_to root_path
 
-    get user_new_path, :params => { :referer => "/test" }
+    get new_user_path, :params => { :referer => "/test" }
     assert_redirected_to "/test"
   end
 
-  def test_new_success
+  def test_create_success
     user = build(:user, :pending)
 
     assert_difference "User.count", 1 do
       assert_difference "ActionMailer::Base.deliveries.size", 1 do
         perform_enqueued_jobs do
-          post user_new_path, :params => { :user => user.attributes }
+          post users_path, :params => { :user => user.attributes }
         end
       end
     end
@@ -108,14 +108,14 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     ActionMailer::Base.deliveries.clear
   end
 
-  def test_new_duplicate_email
+  def test_create_duplicate_email
     user = build(:user, :pending)
     create(:user, :email => user.email)
 
     assert_no_difference "User.count" do
       assert_no_difference "ActionMailer::Base.deliveries.size" do
         perform_enqueued_jobs do
-          post user_new_path, :params => { :user => user.attributes }
+          post users_path, :params => { :user => user.attributes }
         end
       end
     end
@@ -125,14 +125,14 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_select "form > div > input.is-invalid#user_email"
   end
 
-  def test_new_duplicate_email_uppercase
+  def test_create_duplicate_email_uppercase
     user = build(:user, :pending)
     create(:user, :email => user.email.upcase)
 
     assert_no_difference "User.count" do
       assert_no_difference "ActionMailer::Base.deliveries.size" do
         perform_enqueued_jobs do
-          post user_new_path, :params => { :user => user.attributes }
+          post users_path, :params => { :user => user.attributes }
         end
       end
     end
@@ -142,14 +142,14 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_select "form > div > input.is-invalid#user_email"
   end
 
-  def test_new_duplicate_name
+  def test_create_duplicate_name
     user = build(:user, :pending)
     create(:user, :display_name => user.display_name)
 
     assert_no_difference "User.count" do
       assert_no_difference "ActionMailer::Base.deliveries.size" do
         perform_enqueued_jobs do
-          post user_new_path, :params => { :user => user.attributes }
+          post users_path, :params => { :user => user.attributes }
         end
       end
     end
@@ -159,14 +159,14 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_select "form > div > input.is-invalid#user_display_name"
   end
 
-  def test_new_duplicate_name_uppercase
+  def test_create_duplicate_name_uppercase
     user = build(:user, :pending)
     create(:user, :display_name => user.display_name.upcase)
 
     assert_no_difference "User.count" do
       assert_no_difference "ActionMailer::Base.deliveries.size" do
         perform_enqueued_jobs do
-          post user_new_path, :params => { :user => user.attributes }
+          post users_path, :params => { :user => user.attributes }
         end
       end
     end
@@ -176,7 +176,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_select "form > div > input.is-invalid#user_display_name"
   end
 
-  def test_new_blocked_domain
+  def test_create_blocked_domain
     user = build(:user, :pending, :email => "user@example.net")
 
     # Now block that domain
@@ -186,7 +186,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_no_difference "User.count" do
       assert_no_difference "ActionMailer::Base.deliveries.size" do
         perform_enqueued_jobs do
-          post user_new_path, :params => { :user => user.attributes }
+          post users_path, :params => { :user => user.attributes }
         end
       end
     end
@@ -195,12 +195,12 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_template "blocked"
   end
 
-  def test_save_referer_params
+  def test_create_referer_params
     user = build(:user, :pending)
 
     assert_difference "User.count", 1 do
       assert_difference "ActionMailer::Base.deliveries.size", 1 do
-        post user_new_path, :params => { :user => user.attributes, :referer => "/edit?editor=id#map=1/2/3" }
+        post users_path, :params => { :user => user.attributes, :referer => "/edit?editor=id#map=1/2/3" }
         assert_enqueued_with :job => ActionMailer::MailDeliveryJob,
                              :args => proc { |args| args[3][:args][2] == welcome_path(:editor => "id", :zoom => 1, :lat => 2, :lon => 3) }
         perform_enqueued_jobs