From ace8e9a9c376a7bc1df4a89733f04386a1e5f333 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 21 Dec 2022 15:39:23 +0000 Subject: [PATCH] Fix redirection to wiki when terms are declined Adds missing test to pick this up. Fixes #3826. --- app/controllers/users_controller.rb | 2 +- test/system/user_signup_test.rb | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6d98c17f6..abd998030 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -151,7 +151,7 @@ class UsersController < ApplicationController redirect_to referer || edit_account_path elsif params[:decline] - redirect_to t("users.terms.declined") + redirect_to t("users.terms.declined"), :allow_other_host => true else redirect_to :action => :terms end diff --git a/test/system/user_signup_test.rb b/test/system/user_signup_test.rb index 7e2c6ba54..5bd88f5a4 100644 --- a/test/system/user_signup_test.rb +++ b/test/system/user_signup_test.rb @@ -8,4 +8,22 @@ 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" + 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_on "Cancel" + + assert_current_path "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" + end end -- 2.39.5