X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c34ed1e3706020c59aa8dc70ece41c36a8a30930..87ea9fcb021b9b67a79d35cb719a064a34a7784d:/test/controllers/accounts_controller_test.rb?ds=sidebyside

diff --git a/test/controllers/accounts_controller_test.rb b/test/controllers/accounts_controller_test.rb
index 7e8cd7cc2..173bcf22c 100644
--- a/test/controllers/accounts_controller_test.rb
+++ b/test/controllers/accounts_controller_test.rb
@@ -48,13 +48,16 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     assert_not_equal user.description, User.find(user.id).description
 
     # Adding external authentication should redirect to the auth provider
-    put account_path, :params => { :user => user.attributes.merge(:auth_provider => "openid", :auth_uid => "gmail.com") }
+    patch account_path, :params => { :user => user.attributes.merge(:auth_provider => "google") }
     assert_response :redirect
-    assert_redirected_to auth_path(:provider => "openid", :openid_url => "https://www.google.com/accounts/o8/id", :origin => "/account")
+    assert_redirected_to auth_path(:provider => "google", :origin => "/account")
+    follow_redirect!
+    assert_response :redirect
+    assert_redirected_to %r{^https://accounts.google.com/o/oauth2/auth\?.*}
 
     # Changing name to one that exists should fail
     new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name)
-    put account_path, :params => { :user => new_attributes }
+    patch account_path, :params => { :user => new_attributes }
     assert_response :success
     assert_template :edit
     assert_select ".notice", false
@@ -62,7 +65,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
 
     # Changing name to one that exists should fail, regardless of case
     new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name.upcase)
-    put account_path, :params => { :user => new_attributes }
+    patch account_path, :params => { :user => new_attributes }
     assert_response :success
     assert_template :edit
     assert_select ".notice", false
@@ -70,7 +73,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
 
     # Changing name to one that doesn't exist should work
     new_attributes = user.attributes.dup.merge(:display_name => "new tester")
-    put account_path, :params => { :user => new_attributes }
+    patch account_path, :params => { :user => new_attributes }
     assert_response :redirect
     assert_redirected_to edit_account_url
     get edit_account_path
@@ -86,7 +89,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     user.new_email = create(:user).email
     assert_no_difference "ActionMailer::Base.deliveries.size" do
       perform_enqueued_jobs do
-        put account_path, :params => { :user => user.attributes }
+        patch account_path, :params => { :user => user.attributes }
       end
     end
     assert_response :success
@@ -98,7 +101,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     user.new_email = create(:user).email.upcase
     assert_no_difference "ActionMailer::Base.deliveries.size" do
       perform_enqueued_jobs do
-        put account_path, :params => { :user => user.attributes }
+        patch account_path, :params => { :user => user.attributes }
       end
     end
     assert_response :success
@@ -110,7 +113,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     user.new_email = "new_tester@example.com"
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
       perform_enqueued_jobs do
-        put account_path, :params => { :user => user.attributes }
+        patch account_path, :params => { :user => user.attributes }
       end
     end
     assert_response :redirect
@@ -125,4 +128,28 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     assert_equal user.new_email, email.to.first
     ActionMailer::Base.deliveries.clear
   end
+
+  def test_private_account
+    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_response :redirect
+    assert_redirected_to login_path(:referer => "/account/edit")
+
+    # Make sure we get the page when we are logged in as the right user
+    session_for(user)
+    get edit_account_path
+    assert_response :success
+    assert_template :edit
+    assert_select "form#accountForm" do |form|
+      assert_equal "post", form.attr("method").to_s
+      assert_select "input[name='_method']", true
+      assert_equal "/account", form.attr("action").to_s
+    end
+
+    # Make sure we have a button to "go public"
+    assert_select "form.button_to[action='/user/go_public']", true
+  end
 end