X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8b12abd5bb1b96567ab882a3aca0780d0e4af67a..001fed4fd7d321a079568f5de9479adfbff21778:/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..d419003d9 100644
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -1,45 +1,61 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class UserTermsSeenTest < ActionController::IntegrationTest
-  fixtures :users
-
-  def auth_header(user, pass)
-    {"HTTP_AUTHORIZATION" => "Basic %s" % Base64.encode64("#{user}:#{pass}")}
-  end
+require "test_helper"
 
+class UserTermsSeenTest < ActionDispatch::IntegrationTest
   def test_api_blocked
-    user = users(:terms_not_seen_user)
+    user = create(:user, :terms_seen => false, :terms_agreed => nil)
 
-    get "/api/#{API_VERSION}/user/details", nil, auth_header(user.display_name, "test")
+    get "/api/#{Settings.api_version}/user/preferences", :headers => bearer_authorization_header(user)
     assert_response :forbidden
 
     # 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")
+    get "/api/#{Settings.api_version}/user/preferences", :headers => bearer_authorization_header(user)
     assert_response :success
   end
 
   def test_terms_presented_at_login
-    user = users(:terms_not_seen_user)
+    user = create(:user, :terms_seen => false, :terms_agreed => nil)
 
     # try to log in
-    get_via_redirect "/login"
+    get "/login"
+    follow_redirect!
     assert_response :success
-    assert_template 'user/login'
-    post "/login", {'user[email]' => user.email, 'user[password]' => 'test', :referer => "/"}
-    assert_response :redirect
+    assert_template "sessions/new"
+    post "/login", :params => { :username => user.email, :password => "test", :referer => "/diary/new" }
     # but now we need to look at the terms
-    assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/"
+    assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new"
     follow_redirect!
     assert_response :success
 
     # don't agree to the terms, but hit decline
-    
-    # should be carried through to a normal login
+    post "/user/save", :params => { :decline => true, :referer => "/diary/new" }
+    assert_redirected_to "/diary/new"
+    follow_redirect!
+
+    # should be carried through to a normal login with a message
+    assert_response :success
+    assert_not flash[:notice].nil?
   end
 
-end
+  def test_terms_cant_be_circumvented
+    user = create(:user, :terms_seen => false, :terms_agreed => nil)
 
-    
+    # try to log in
+    get "/login"
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+    post "/login", :params => { :username => user.email, :password => "test", :referer => "/diary/new" }
+    # but now we need to look at the terms
+    assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new"
+
+    # check that if we go somewhere else now, it redirects
+    # back to the terms page.
+    get "/traces/mine"
+    assert_redirected_to :controller => :users, :action => :terms, :referer => "/traces/mine"
+    get "/traces/mine", :params => { :referer => "/diary/new" }
+    assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new"
+  end
+end