X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d8399d3e188f2786c7a90661b7c806eb1ee7612b..9ec625e352fded4b12a36eb59920776e03e35846:/test/integration/user_creation_test.rb?ds=inline

diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index 179f9eae1..64f298ba1 100644
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -1,35 +1,40 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require "test_helper"
 
 class UserCreationTest < ActionDispatch::IntegrationTest
   fixtures :users
 
   def setup
-    openid_setup
+    OmniAuth.config.test_mode = true
+  end
+
+  def teardown
+    OmniAuth.config.mock_auth[:openid] = nil
+    OmniAuth.config.test_mode = false
   end
 
   def test_create_user_form
     I18n.available_locales.each do |locale|
-      get_via_redirect '/user/new', {}, {"HTTP_ACCEPT_LANGUAGE" => locale.to_s}
+      get_via_redirect "/user/new", {}, { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
       assert_response :success
-      assert_template 'user/new'
+      assert_template "user/new"
     end
   end
 
   def test_user_create_submit_duplicate_email
-    I18n.available_locales.each do |localer|
+    I18n.available_locales.each do |locale|
       dup_email = users(:public_user).email
-      display_name = "#{localer.to_s}_new_tester"
-      assert_difference('User.count', 0) do
-        assert_difference('ActionMailer::Base.deliveries.size', 0) do
-          post '/user/new',
-            {:user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},
-            {"HTTP_ACCEPT_LANGUAGE" => localer.to_s}
+      display_name = "#{locale}_new_tester"
+      assert_difference("User.count", 0) do
+        assert_difference("ActionMailer::Base.deliveries.size", 0) do
+          post "/user/new",
+               { :user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } },
+               { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
         end
       end
       assert_response :success
-      assert_template 'user/new'
-      assert_equal response.headers['Content-Language'][0..1], localer.to_s[0..1] unless localer == :root
-      assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_email"
+      assert_template "user/new"
+      assert_equal response.headers["Content-Language"][0..1], locale.to_s[0..1] unless locale == :root
+      assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email"
       assert_no_missing_translations
     end
   end
@@ -37,39 +42,39 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   def test_user_create_submit_duplicate_username
     I18n.available_locales.each do |locale|
       dup_display_name = users(:public_user).display_name
-      email = "#{locale.to_s}_new_tester"
-      assert_difference('User.count', 0) do
-        assert_difference('ActionMailer::Base.deliveries.size', 0) do
-          post '/user/new',
-          {:user => {:email => email, :email_confirmation => email, :display_name => dup_display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},
-          {"HTTP_ACCEPT_LANGUAGE" => locale.to_s}
+      email = "#{locale}_new_tester"
+      assert_difference("User.count", 0) do
+        assert_difference("ActionMailer::Base.deliveries.size", 0) do
+          post "/user/new",
+               { :user => { :email => email, :email_confirmation => email, :display_name => dup_display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } },
+               { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
         end
       end
       assert_response :success
-      assert_template 'user/new'
-      assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
+      assert_template "user/new"
+      assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name"
       assert_no_missing_translations
     end
   end
 
   def test_user_create_success
     I18n.available_locales.each do |locale|
-      new_email = "#{locale.to_s}newtester@osm.org"
-      display_name = "#{locale.to_s}_new_tester"
+      new_email = "#{locale}newtester@osm.org"
+      display_name = "#{locale}_new_tester"
 
-      assert_difference('User.count', 0) do
-        assert_difference('ActionMailer::Base.deliveries.size', 0) do
+      assert_difference("User.count", 0) do
+        assert_difference("ActionMailer::Base.deliveries.size", 0) do
           post "/user/new",
-            {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}}
-          end
+               :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }
+        end
       end
 
       assert_redirected_to "/user/terms"
 
-      assert_difference('User.count') do
-        assert_difference('ActionMailer::Base.deliveries.size', 1) do
+      assert_difference("User.count") do
+        assert_difference("ActionMailer::Base.deliveries.size", 1) do
           post_via_redirect "/user/save", {},
-            {"HTTP_ACCEPT_LANGUAGE" => "#{locale.to_s}"}
+                            { "HTTP_ACCEPT_LANGUAGE" => "#{locale}" }
         end
       end
 
@@ -82,7 +87,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
       # Check the page
       assert_response :success
-      assert_template 'user/confirm'
+      assert_template "user/confirm"
 
       ActionMailer::Base.deliveries.clear
     end
@@ -103,13 +108,13 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     password = "testtest"
     # nothing special about this page, just need a protected page to redirect back to.
     referer = "/traces/mine"
-    assert_difference('User.count') do
-      assert_difference('ActionMailer::Base.deliveries.size', 1) do
+    assert_difference("User.count") do
+      assert_difference("ActionMailer::Base.deliveries.size", 1) do
         post "/user/new",
-        {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password}, :referer => referer }
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password }, :referer => referer
         assert_redirected_to "/user/terms"
         post_via_redirect "/user/save",
-        {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password} }
+                          :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password }
       end
     end
 
@@ -126,36 +131,42 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
-    assert_template 'user/confirm'
+    assert_template "user/confirm"
 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
-    get "/user/#{display_name}/confirm", { :confirm_string => confirm_string }
+    get "/user/#{display_name}/confirm", :confirm_string => confirm_string
     assert_response :success
-    assert_template 'user/confirm'
+    assert_template "user/confirm"
 
-    post "user/#{display_name}/confirm", { :confirm_string => confirm_string }
+    post "/user/#{display_name}/confirm", :confirm_string => confirm_string
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'site/welcome'
+    assert_template "site/welcome"
   end
 
   def test_user_create_openid_success
+    OmniAuth.config.add_mock(:openid, :uid => "http://localhost:1123/new.tester")
+
     new_email = "newtester-openid@osm.org"
     display_name = "new_tester-openid"
     password = "testtest"
-    assert_difference('User.count') do
-      assert_difference('ActionMailer::Base.deliveries.size', 1) do
+    assert_difference("User.count") do
+      assert_difference("ActionMailer::Base.deliveries.size", 1) do
         post "/user/new",
-          {: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 => ""}}
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "", :pass_crypt_confirmation => "" }
+        assert_response :redirect
+        assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
+        follow_redirect!
+        assert_response :redirect
+        assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
+        follow_redirect!
         assert_response :redirect
-        res = openid_request(@response.redirect_url)
-        get "/user/new", res
         assert_redirected_to "/user/terms"
-        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", :pass_crypt => password, :pass_crypt_confirmation => password}}
+        post "/user/save",
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => password, :pass_crypt_confirmation => password }
         assert_response :redirect
         follow_redirect!
       end
@@ -163,24 +174,33 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
-    assert_template 'user/confirm'
+    assert_template "user/confirm"
 
     ActionMailer::Base.deliveries.clear
   end
 
   def test_user_create_openid_failure
+    OmniAuth.config.mock_auth[:openid] = :connection_failed
+
     new_email = "newtester-openid2@osm.org"
     display_name = "new_tester-openid2"
-    password = "testtest2"
-    assert_difference('User.count',0) do
-      assert_difference('ActionMailer::Base.deliveries.size',0) do
+    assert_difference("User.count", 0) do
+      assert_difference("ActionMailer::Base.deliveries.size", 0) do
         post "/user/new",
-          {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.failure=newuser", :pass_crypt => "", :pass_crypt_confirmation => ""}}
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "", :pass_crypt_confirmation => "" }
         assert_response :redirect
-        res = openid_request(@response.redirect_url)
-        get '/user/new', res
+        assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
+        follow_redirect!
+        assert_response :redirect
+        assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
+        follow_redirect!
+        assert_response :redirect
+        assert_redirected_to auth_failure_path(:strategy => "openid", :message => "connection_failed", :origin => "/user/new")
+        follow_redirect!
+        assert_response :redirect
+        follow_redirect!
         assert_response :success
-        assert_template 'user/new'
+        assert_template "user/new"
       end
     end
 
@@ -188,21 +208,26 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   end
 
   def test_user_create_openid_redirect
+    OmniAuth.config.add_mock(:openid, :uid => "http://localhost:1123/new.tester")
+
     new_email = "redirect_tester_openid@osm.org"
     display_name = "redirect_tester_openid"
-    password = ""
     # nothing special about this page, just need a protected page to redirect back to.
     referer = "/traces/mine"
-    assert_difference('User.count') do
-      assert_difference('ActionMailer::Base.deliveries.size', 1) do
+    assert_difference("User.count") do
+      assert_difference("ActionMailer::Base.deliveries.size", 1) do
         post "/user/new",
-          {: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 => ""}, :referer => referer }
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer
+        assert_response :redirect
+        assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
+        follow_redirect!
+        assert_response :redirect
+        assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
+        follow_redirect!
         assert_response :redirect
-        res = openid_request(@response.location)
-        get "/user/new", res
         assert_redirected_to "/user/terms"
         post_via_redirect "/user/save",
-          {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"} }
+                          :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }
       end
     end
 
@@ -219,19 +244,19 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
-    assert_template 'user/confirm'
+    assert_template "user/confirm"
 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
-    get "/user/#{display_name}/confirm", { :confirm_string => confirm_string }
+    get "/user/#{display_name}/confirm", :confirm_string => confirm_string
     assert_response :success
-    assert_template 'user/confirm'
+    assert_template "user/confirm"
 
-    post "/user/#{display_name}/confirm", { :confirm_string => confirm_string }
+    post "/user/#{display_name}/confirm", :confirm_string => confirm_string
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'site/welcome'
+    assert_template "site/welcome"
   end
 end