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

[rails.git] / test / system / user_signup_test.rb

diff --git a/test/system/user_signup_test.rb b/test/system/user_signup_test.rb
index e97046800738edf107ce30c586873f96d6e958b1..0e02b904f7f44a830fa5d2eba043fef1e7c70ba6 100644 (file)
--- a/test/system/user_signup_test.rb
+++ b/test/system/user_signup_test.rb
@@ -4,29 +4,20 @@ class UserSignupTest < ApplicationSystemTestCase
   test "Sign up from login page" do
     visit login_path
 
-    click_on "Register now"
+    click_on "Sign up"
 
     assert_content "Confirm Password"
   end
 
-  test "externally redirect when contributor terms declined" do
-    user = build(:user)
-
-    visit root_path
-    click_on "Sign Up"
+  test "Show OpenID form when OpenID provider button is clicked" do
+    visit login_path
 
-    within ".new_user" do
-      fill_in "Email", :with => user.email
-      fill_in "Email Confirmation", :with => user.email
-      fill_in "Display Name", :with => user.display_name
-      fill_in "Password", :with => "testtest"
-      fill_in "Confirm Password", :with => "testtest"
-      click_on "Sign Up"
-    end
+    assert_no_field "OpenID URL"
+    assert_no_button "Continue"
 
-    assert_content "Contributor terms"
-    click_on "Cancel"
+    click_on "Log in with OpenID"
 
-    assert_current_path "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
+    assert_field "OpenID URL"
+    assert_button "Continue"
   end
 end