X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c21aa5933a0892e27c465bd75329ddd9c08d2807..a45af012b4c0a3f3d92bbe3da4a96356c31e2b4b:/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 f30c5d98e..64a101024 100644 --- a/test/integration/user_terms_seen_test.rb +++ b/test/integration/user_terms_seen_test.rb @@ -11,14 +11,14 @@ class UserTermsSeenTest < ActionController::IntegrationTest if REQUIRE_TERMS_SEEN user = users(:terms_not_seen_user) - get "/api/#{API_VERSION}/user/details", nil, auth_header(user.display_name, "test") + 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 - get "/api/#{API_VERSION}/user/details", nil, auth_header(user.display_name, "test") + get "/api/#{API_VERSION}/user/preferences", nil, auth_header(user.display_name, "test") assert_response :success end end @@ -31,7 +31,7 @@ class UserTermsSeenTest < ActionController::IntegrationTest get_via_redirect "/login" assert_response :success assert_template 'user/login' - post "/login", {'user[email]' => user.email, 'user[password]' => 'test', :referer => "/"} + 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,7 +39,7 @@ 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! @@ -57,7 +57,7 @@ class UserTermsSeenTest < ActionController::IntegrationTest get_via_redirect "/login" assert_response :success assert_template 'user/login' - post "/login", {'user[email]' => user.email, 'user[password]' => 'test', :referer => "/"} + 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 => "/" @@ -70,7 +70,4 @@ class UserTermsSeenTest < ActionController::IntegrationTest assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/traces/mine" end end - end - -