From e6b23c133ee69d937cc44ec48cd2947b985b4ad1 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Fri, 27 Dec 2024 05:34:19 +0300 Subject: [PATCH] Move user details route to api namespace --- config/routes.rb | 2 +- test/controllers/api/users_controller_test.rb | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index b8689256d..182a18060 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -67,13 +67,13 @@ OpenStreetMap::Application.routes.draw do get "trackpoints" => "tracepoints#index" - get "user/details" => "users#details" get "user/gpx_files" => "users#gpx_files" end namespace :api, :path => "api/0.6" do resources :users, :only => :index resources :users, :path => "user", :id => /\d+/, :only => :show + get "user/details" => "users#details" resources :user_preferences, :except => [:new, :create, :edit], :param => :preference_key, :path => "user/preferences" do collection do diff --git a/test/controllers/api/users_controller_test.rb b/test/controllers/api/users_controller_test.rb index 874d91771..008116bc6 100644 --- a/test/controllers/api/users_controller_test.rb +++ b/test/controllers/api/users_controller_test.rb @@ -156,12 +156,12 @@ module Api create(:message, :sender => user) # check that nothing is returned when not logged in - get user_details_path + get api_user_details_path assert_response :unauthorized # check that we get a response when logged in auth_header = bearer_authorization_header user - get user_details_path, :headers => auth_header + get api_user_details_path, :headers => auth_header assert_response :success assert_equal "application/xml", response.media_type @@ -170,7 +170,7 @@ module Api # check that data is returned properly in json auth_header = bearer_authorization_header user - get user_details_path(:format => "json"), :headers => auth_header + get api_user_details_path(:format => "json"), :headers => auth_header assert_response :success assert_equal "application/json", response.media_type @@ -191,11 +191,11 @@ module Api email_auth = bearer_authorization_header(user, :scopes => %w[read_prefs read_email]) # check that we can't fetch details as XML without read_prefs - get user_details_path, :headers => bad_auth + get api_user_details_path, :headers => bad_auth assert_response :forbidden # check that we can fetch details as XML without read_email - get user_details_path, :headers => good_auth + get api_user_details_path, :headers => good_auth assert_response :success assert_equal "application/xml", response.media_type @@ -203,7 +203,7 @@ module Api check_xml_details(user, true, false) # check that we can fetch details as XML with read_email - get user_details_path, :headers => email_auth + get api_user_details_path, :headers => email_auth assert_response :success assert_equal "application/xml", response.media_type @@ -211,11 +211,11 @@ module Api check_xml_details(user, true, true) # check that we can't fetch details as JSON without read_prefs - get user_details_path(:format => "json"), :headers => bad_auth + get api_user_details_path(:format => "json"), :headers => bad_auth assert_response :forbidden # check that we can fetch details as JSON without read_email - get user_details_path(:format => "json"), :headers => good_auth + get api_user_details_path(:format => "json"), :headers => good_auth assert_response :success assert_equal "application/json", response.media_type @@ -227,7 +227,7 @@ module Api check_json_details(js, user, true, false) # check that we can fetch details as JSON with read_email - get user_details_path(:format => "json"), :headers => email_auth + get api_user_details_path(:format => "json"), :headers => email_auth assert_response :success assert_equal "application/json", response.media_type -- 2.39.5