From: Tom Hughes <tom@compton.nu>
Date: Sun, 29 Sep 2013 14:43:16 +0000 (+0100)
Subject: Make sure the "terms seen" tests actually run
X-Git-Tag: live~4687
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/25720e3ee3e835c0a578336367c1e5d5aae51c4c?hp=76d8bed5d12fc10a785366bfa1a411aa4e0c39d8

Make sure the "terms seen" tests actually run
---

diff --git a/test/integration/user_terms_seen_test.rb b/test/integration/user_terms_seen_test.rb
index d1841f507..7063e39c5 100644
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -3,12 +3,8 @@ require File.dirname(__FILE__) + '/../test_helper'
 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,7 +20,7 @@ class UserTermsSeenTest < ActionDispatch::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
@@ -42,7 +38,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
       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,7 +46,7 @@ class UserTermsSeenTest < ActionDispatch::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
@@ -70,4 +66,20 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
       assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/traces/mine"
     end
   end
+
+private
+
+  def auth_header(user, pass)
+    {"HTTP_AUTHORIZATION" => "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