Merge login and terms screens, assume TOU and contributor terms are accepted on /user/new form
This eliminates the need for "terms" screen after /user/new form.. Terms screen is still required for legacy users who never accepted the terms.
This commit is contained in:
parent
64083f0264
commit
1276fb944a
8 changed files with 156 additions and 427 deletions
|
@ -13,10 +13,6 @@ class ConfirmationResendSystemTest < ApplicationSystemTestCase
|
|||
fill_in "Confirm Password", :with => "testtest"
|
||||
click_on "Sign Up"
|
||||
end
|
||||
|
||||
check "I have read and agree to the above contributor terms"
|
||||
check "I have read and agree to the Terms of Use"
|
||||
click_on "Continue"
|
||||
end
|
||||
|
||||
test "flash message should not contain raw html" do
|
||||
|
|
|
@ -8,25 +8,4 @@ class UserSignupTest < ApplicationSystemTestCase
|
|||
|
||||
assert_content "Confirm Password"
|
||||
end
|
||||
|
||||
test "externally redirect when contributor terms declined" do
|
||||
user = build(:user)
|
||||
|
||||
visit root_path
|
||||
click_on "Sign Up"
|
||||
|
||||
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_content "Contributor terms"
|
||||
click_on "Cancel"
|
||||
|
||||
assert_current_path "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue