From: Tom Hughes <tom@compton.nu>
Date: Wed, 21 Dec 2022 15:56:22 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3852'
X-Git-Tag: live~1921
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7d80c7747f8d77045da516cafa71282b954d0538?hp=fd283efa51c0fee16b710efd97bf72da5a461288

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

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