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

[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 d4da01436be9c4183fd26588ab35dd94ebb7b82c..88899d7105b2fc2b74a896c7291a017c7f080701 100644 (file)
--- a/test/system/user_signup_test.rb
+++ b/test/system/user_signup_test.rb
@@ -4,8 +4,26 @@ class UserSignupTest < ApplicationSystemTestCase
   test "Sign up from login page" do
     visit login_path
 
   test "Sign up from login page" do
     visit login_path
 

-    click_on "Register now"
+    click_link "Register now"

 
 

-    assert page.has_content? "Confirm Password"
+    assert_content "Confirm Password"
+  end
+
+  test "externally redirect when contributor terms declined" do
+    user = build(:user)
+
+    visit root_path
+    click_link "Sign Up"
+    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_button "Sign Up"
+
+    assert_content "Contributor terms"
+    click_button "Cancel"
+
+    assert_current_path "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"

   end
 end
   end
 end