]> git.openstreetmap.org Git - rails.git/blobdiff - test/integration/user_terms_seen_test.rb
Merge remote-tracking branch 'origin/master' into routing
[rails.git] / test / integration / user_terms_seen_test.rb
index eac5daf2410511e62ea7a49d89df34b9a7bac8ea..1bed53bce8aa13533d1792b185d0d060e17657aa 100644 (file)
@@ -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,7 +20,7 @@ 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
@@ -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,7 +46,7 @@ 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
@@ -70,4 +66,20 @@ class UserTermsSeenTest < ActionController::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