X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8b12abd5bb1b96567ab882a3aca0780d0e4af67a..d1727377a817ca66acb65b5c854dad35aed19ac1:/test/integration/user_terms_seen_test.rb?ds=sidebyside

diff --git a/test/integration/user_terms_seen_test.rb b/test/integration/user_terms_seen_test.rb
index fc42c2353..eac5daf24 100644
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -8,38 +8,66 @@ class UserTermsSeenTest < ActionController::IntegrationTest
   end
 
   def test_api_blocked
-    user = users(:terms_not_seen_user)
+    if REQUIRE_TERMS_SEEN
+      user = users(:terms_not_seen_user)
 
-    get "/api/#{API_VERSION}/user/details", nil, auth_header(user.display_name, "test")
-    assert_response :forbidden
+      get "/api/#{API_VERSION}/user/preferences", nil, auth_header(user.display_name, "test")
+      assert_response :forbidden
 
-    # touch it so that the user has seen the terms
-    user.terms_seen = true
-    user.save
+      # touch it so that the user has seen the terms
+      user.terms_seen = true
+      user.save
 
-    get "/api/#{API_VERSION}/user/details", nil, auth_header(user.display_name, "test")
-    assert_response :success
+      get "/api/#{API_VERSION}/user/preferences", nil, auth_header(user.display_name, "test")
+      assert_response :success
+    end
   end
 
   def test_terms_presented_at_login
-    user = users(:terms_not_seen_user)
-
-    # try to log in
-    get_via_redirect "/login"
-    assert_response :success
-    assert_template 'user/login'
-    post "/login", {'user[email]' => user.email, 'user[password]' => 'test', :referer => "/"}
-    assert_response :redirect
-    # but now we need to look at the terms
-    assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/"
-    follow_redirect!
-    assert_response :success
-
-    # don't agree to the terms, but hit decline
-    
-    # should be carried through to a normal login
+    if REQUIRE_TERMS_SEEN
+      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_response :redirect
+      # but now we need to look at the terms
+      assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/"
+      follow_redirect!
+      assert_response :success
+
+      # don't agree to the terms, but hit decline
+      post "/user/#{user.display_name}/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?
+    end
   end
 
-end
+  def test_terms_cant_be_circumvented
+    if REQUIRE_TERMS_SEEN
+      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_response :redirect
+      # but now we need to look at the terms
+      assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/"
+      follow_redirect!
+      assert_response :success
+
+      # check that if we go somewhere else now, it redirects
+      # back to the terms page.
+      get "/traces/mine"
+      assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/traces/mine"
+    end
+  end
+end