Move user details route to api namespace

diff --git a/config/routes.rb b/config/routes.rb
index b8689256d99d53dcb1d42b25db91e0a50da46b62..182a18060d2e1ed0a5c33acbb29e69ef694caa67 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -67,13 +67,13 @@ OpenStreetMap::Application.routes.draw do
 
     get "trackpoints" => "tracepoints#index"
 
 
     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/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
 
     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 874d9177105b6cba3b20bc7b8aef312914e47671..008116bc611bf02062a67fb8413db292cfa6ad8a 100644 (file)
--- 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
       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
       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
 
       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
 
       # 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
 
       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
       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
       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
 
       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
       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
 
       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
       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
       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
 
       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
       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
 
       assert_response :success
       assert_equal "application/json", response.media_type