Merge remote-tracking branch 'upstream/pull/5703'

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

diff --git a/test/controllers/accounts_controller_test.rb b/test/controllers/accounts_controller_test.rb
index 18ad34f66692dcb6eb8ca3c6c818a75fc38ee22a..199bf4aab53ac23825d3ed6de8b25d4186510ac2 100644 (file)
--- a/test/controllers/accounts_controller_test.rb
+++ b/test/controllers/accounts_controller_test.rb
@@ -5,16 +5,23 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
   # test all routes which lead to this controller
   def test_routes
     assert_routing(
   # test all routes which lead to this controller
   def test_routes
     assert_routing(

-      { :path => "/account/edit", :method => :get },
-      { :controller => "accounts", :action => "edit" }
+      { :path => "/account", :method => :get },
+      { :controller => "accounts", :action => "show" }

     )
     assert_routing(
       { :path => "/account", :method => :put },
       { :controller => "accounts", :action => "update" }
     )
     )
     assert_routing(
       { :path => "/account", :method => :put },
       { :controller => "accounts", :action => "update" }
     )

+    assert_routing(
+      { :path => "/account", :method => :delete },
+      { :controller => "accounts", :action => "destroy" }
+    )
+
+    get "/account/edit"
+    assert_redirected_to "/account"

   end
 
   end
 

-  def test_account
+  def test_show_and_update

     # Get a user to work with - note that this user deliberately
     # conflicts with uppercase_user in the email and display name
     # fields to test that we can change other fields without any
     # Get a user to work with - note that this user deliberately
     # conflicts with uppercase_user in the email and display name
     # fields to test that we can change other fields without any


@@ -24,14 +31,14 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
 
     # Make sure that you are redirected to the login page when
     # you are not logged in
 
     # Make sure that you are redirected to the login page when
     # you are not logged in

-    get edit_account_path
-    assert_redirected_to login_path(:referer => "/account/edit")
+    get account_path
+    assert_redirected_to login_path(:referer => account_path)

 
     # Make sure we get the page when we are logged in as the right user
     session_for(user)
 
     # Make sure we get the page when we are logged in as the right user
     session_for(user)

-    get edit_account_path
+    get account_path

     assert_response :success
     assert_response :success

-    assert_template :edit
+    assert_template :show

     assert_select "form#accountForm" do |form|
       assert_equal "post", form.attr("method").to_s
       assert_select "input[name='_method']", true
     assert_select "form#accountForm" do |form|
       assert_equal "post", form.attr("method").to_s
       assert_select "input[name='_method']", true


@@ -41,9 +48,9 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     # Updating the description using GET should fail
     user.description = "new description"
     user.preferred_editor = "default"
     # Updating the description using GET should fail
     user.description = "new description"
     user.preferred_editor = "default"

-    get edit_account_path, :params => { :user => user.attributes }
+    get account_path, :params => { :user => user.attributes }

     assert_response :success
     assert_response :success

-    assert_template :edit
+    assert_template :show

     assert_not_equal user.description, User.find(user.id).description
 
     # Adding external authentication should redirect to the auth provider
     assert_not_equal user.description, User.find(user.id).description
 
     # Adding external authentication should redirect to the auth provider


@@ -56,7 +63,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name)
     patch account_path, :params => { :user => new_attributes }
     assert_response :success
     new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name)
     patch account_path, :params => { :user => new_attributes }
     assert_response :success

-    assert_template :edit
+    assert_template :show

     assert_select ".alert-success", false
     assert_select "form#accountForm > div > input.is-invalid#user_display_name"
 
     assert_select ".alert-success", false
     assert_select "form#accountForm > div > input.is-invalid#user_display_name"
 


@@ -64,17 +71,17 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name.upcase)
     patch account_path, :params => { :user => new_attributes }
     assert_response :success
     new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name.upcase)
     patch account_path, :params => { :user => new_attributes }
     assert_response :success

-    assert_template :edit
+    assert_template :show

     assert_select ".alert-success", false
     assert_select "form#accountForm > div > input.is-invalid#user_display_name"
 
     # Changing name to one that doesn't exist should work
     new_attributes = user.attributes.dup.merge(:display_name => "new tester")
     patch account_path, :params => { :user => new_attributes }
     assert_select ".alert-success", false
     assert_select "form#accountForm > div > input.is-invalid#user_display_name"
 
     # Changing name to one that doesn't exist should work
     new_attributes = user.attributes.dup.merge(:display_name => "new tester")
     patch account_path, :params => { :user => new_attributes }

-    assert_redirected_to edit_account_url
-    get edit_account_path
+    assert_redirected_to account_path
+    follow_redirect!

     assert_response :success
     assert_response :success

-    assert_template :edit
+    assert_template :show

     assert_select ".alert-success", /^User information updated successfully/
     assert_select "form#accountForm > div > input#user_display_name[value=?]", "new tester"
 
     assert_select ".alert-success", /^User information updated successfully/
     assert_select "form#accountForm > div > input#user_display_name[value=?]", "new tester"
 


@@ -89,7 +96,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
       end
     end
     assert_response :success
       end
     end
     assert_response :success

-    assert_template :edit
+    assert_template :show

     assert_select ".alert-success", false
     assert_select "form#accountForm > div > input.is-invalid#user_new_email"
 
     assert_select ".alert-success", false
     assert_select "form#accountForm > div > input.is-invalid#user_new_email"
 


@@ -101,7 +108,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
       end
     end
     assert_response :success
       end
     end
     assert_response :success

-    assert_template :edit
+    assert_template :show

     assert_select ".alert-success", false
     assert_select "form#accountForm > div > input.is-invalid#user_new_email"
 
     assert_select ".alert-success", false
     assert_select "form#accountForm > div > input.is-invalid#user_new_email"
 


@@ -112,31 +119,30 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
         patch account_path, :params => { :user => user.attributes }
       end
     end
         patch account_path, :params => { :user => user.attributes }
       end
     end

-    assert_redirected_to edit_account_url
-    get edit_account_path
+    assert_redirected_to account_path
+    follow_redirect!

     assert_response :success
     assert_response :success

-    assert_template :edit
+    assert_template :show

     assert_select ".alert-success", /^User information updated successfully/
     assert_select "form#accountForm > div > input#user_new_email[value=?]", user.new_email
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_equal user.new_email, email.to.first
     assert_select ".alert-success", /^User information updated successfully/
     assert_select "form#accountForm > div > input#user_new_email[value=?]", user.new_email
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_equal user.new_email, email.to.first

-    ActionMailer::Base.deliveries.clear

   end
 
   end
 

-  def test_private_account
+  def test_show_private_account

     user = create(:user, :data_public => false)
 
     # Make sure that you are redirected to the login page when
     # you are not logged in
     user = create(:user, :data_public => false)
 
     # Make sure that you are redirected to the login page when
     # you are not logged in

-    get edit_account_path
-    assert_redirected_to login_path(:referer => "/account/edit")
+    get account_path
+    assert_redirected_to login_path(:referer => account_path)

 
     # Make sure we get the page when we are logged in as the right user
     session_for(user)
 
     # Make sure we get the page when we are logged in as the right user
     session_for(user)

-    get edit_account_path
+    get account_path

     assert_response :success
     assert_response :success

-    assert_template :edit
+    assert_template :show

     assert_select "form#accountForm" do |form|
       assert_equal "post", form.attr("method").to_s
       assert_select "input[name='_method']", true
     assert_select "form#accountForm" do |form|
       assert_equal "post", form.attr("method").to_s
       assert_select "input[name='_method']", true