X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/52e5fa6ad78f375cec5a207a123a4aa3939c8ddf..21d60e359a6e972731e0385c51dd86536b7ea777:/test/integration/user_terms_seen_test.rb

diff --git a/test/integration/user_terms_seen_test.rb b/test/integration/user_terms_seen_test.rb
index eac5daf24..678492f3c 100644
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -1,14 +1,10 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require "test_helper"
 
-class UserTermsSeenTest < ActionController::IntegrationTest
+class UserTermsSeenTest < ActionDispatch::IntegrationTest
   fixtures :users
 
-  def auth_header(user, pass)
-    {"HTTP_AUTHORIZATION" => "Basic %s" % Base64.encode64("#{user}:#{pass}")}
-  end
-
   def test_api_blocked
-    if REQUIRE_TERMS_SEEN
+    with_terms_seen(true) do
       user = users(:terms_not_seen_user)
 
       get "/api/#{API_VERSION}/user/preferences", nil, auth_header(user.display_name, "test")
@@ -24,14 +20,14 @@ class UserTermsSeenTest < ActionController::IntegrationTest
   end
 
   def test_terms_presented_at_login
-    if REQUIRE_TERMS_SEEN
+    with_terms_seen(true) do
       user = users(:terms_not_seen_user)
 
       # try to log in
       get_via_redirect "/login"
       assert_response :success
-      assert_template 'user/login'
-      post "/login", {'username' => user.email, 'password' => 'test', :referer => "/"}
+      assert_template "user/login"
+      post "/login", "username" => user.email, "password" => "test", :referer => "/"
       assert_response :redirect
       # but now we need to look at the terms
       assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/"
@@ -39,10 +35,10 @@ class UserTermsSeenTest < ActionController::IntegrationTest
       assert_response :success
 
       # don't agree to the terms, but hit decline
-      post "/user/#{user.display_name}/save", {'decline' => 'decline', 'referer' => '/'}
+      post "/user/save", "decline" => "decline", "referer" => "/"
       assert_redirected_to "/"
       follow_redirect!
-      
+
       # should be carried through to a normal login with a message
       assert_response :success
       assert !flash[:notice].nil?
@@ -50,14 +46,14 @@ class UserTermsSeenTest < ActionController::IntegrationTest
   end
 
   def test_terms_cant_be_circumvented
-    if REQUIRE_TERMS_SEEN
+    with_terms_seen(true) do
       user = users(:terms_not_seen_user)
 
       # try to log in
       get_via_redirect "/login"
       assert_response :success
-      assert_template 'user/login'
-      post "/login", {'username' => user.email, 'password' => 'test', :referer => "/"}
+      assert_template "user/login"
+      post "/login", "username" => user.email, "password" => "test", :referer => "/"
       assert_response :redirect
       # but now we need to look at the terms
       assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/"
@@ -68,6 +64,24 @@ class UserTermsSeenTest < ActionController::IntegrationTest
       # back to the terms page.
       get "/traces/mine"
       assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/traces/mine"
+      get "/traces/mine", :referer => "/test"
+      assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/test"
     end
   end
+
+  private
+
+  def auth_header(user, pass)
+    { "HTTP_AUTHORIZATION" => format("Basic %s", Base64.encode64("#{user}:#{pass}")) }
+  end
+
+  def with_terms_seen(value)
+    require_terms_seen = Object.send("remove_const", "REQUIRE_TERMS_SEEN")
+    Object.const_set("REQUIRE_TERMS_SEEN", value)
+
+    yield
+
+    Object.send("remove_const", "REQUIRE_TERMS_SEEN")
+    Object.const_set("REQUIRE_TERMS_SEEN", require_terms_seen)
+  end
 end