Pluralise user_preferences_controller
This is the rails convention for controllers and can make route generation easier. http://guides.rubyonrails.org/action_controller_overview.html#controller-naming-convention
This commit is contained in:
parent
30424e89d2
commit
9408ed6946
4 changed files with 13 additions and 13 deletions
|
@ -35,7 +35,7 @@ Lint/AssignmentInCondition:
|
|||
- 'app/controllers/notes_controller.rb'
|
||||
- 'app/controllers/trace_controller.rb'
|
||||
- 'app/controllers/user_controller.rb'
|
||||
- 'app/controllers/user_preference_controller.rb'
|
||||
- 'app/controllers/user_preferences_controller.rb'
|
||||
- 'app/helpers/application_helper.rb'
|
||||
- 'app/helpers/browse_helper.rb'
|
||||
- 'app/models/client_application.rb'
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# Update and read user preferences, which are arbitrayr key/val pairs
|
||||
class UserPreferenceController < ApplicationController
|
||||
class UserPreferencesController < ApplicationController
|
||||
skip_before_action :verify_authenticity_token
|
||||
before_action :authorize
|
||||
before_action :require_allow_read_prefs, :only => [:read_one, :read]
|
|
@ -68,11 +68,11 @@ OpenStreetMap::Application.routes.draw do
|
|||
get "user/details" => "user#api_details"
|
||||
get "user/gpx_files" => "user#api_gpx_files"
|
||||
|
||||
get "user/preferences" => "user_preference#read"
|
||||
get "user/preferences/:preference_key" => "user_preference#read_one"
|
||||
put "user/preferences" => "user_preference#update"
|
||||
put "user/preferences/:preference_key" => "user_preference#update_one"
|
||||
delete "user/preferences/:preference_key" => "user_preference#delete_one"
|
||||
get "user/preferences" => "user_preferences#read"
|
||||
get "user/preferences/:preference_key" => "user_preferences#read_one"
|
||||
put "user/preferences" => "user_preferences#update"
|
||||
put "user/preferences/:preference_key" => "user_preferences#update_one"
|
||||
delete "user/preferences/:preference_key" => "user_preferences#delete_one"
|
||||
|
||||
post "gpx/create" => "trace#api_create"
|
||||
get "gpx/:id" => "trace#api_read", :id => /\d+/
|
||||
|
|
|
@ -1,28 +1,28 @@
|
|||
require "test_helper"
|
||||
|
||||
class UserPreferenceControllerTest < ActionController::TestCase
|
||||
class UserPreferencesControllerTest < ActionController::TestCase
|
||||
##
|
||||
# test all routes which lead to this controller
|
||||
def test_routes
|
||||
assert_routing(
|
||||
{ :path => "/api/0.6/user/preferences", :method => :get },
|
||||
{ :controller => "user_preference", :action => "read" }
|
||||
{ :controller => "user_preferences", :action => "read" }
|
||||
)
|
||||
assert_routing(
|
||||
{ :path => "/api/0.6/user/preferences", :method => :put },
|
||||
{ :controller => "user_preference", :action => "update" }
|
||||
{ :controller => "user_preferences", :action => "update" }
|
||||
)
|
||||
assert_routing(
|
||||
{ :path => "/api/0.6/user/preferences/key", :method => :get },
|
||||
{ :controller => "user_preference", :action => "read_one", :preference_key => "key" }
|
||||
{ :controller => "user_preferences", :action => "read_one", :preference_key => "key" }
|
||||
)
|
||||
assert_routing(
|
||||
{ :path => "/api/0.6/user/preferences/key", :method => :put },
|
||||
{ :controller => "user_preference", :action => "update_one", :preference_key => "key" }
|
||||
{ :controller => "user_preferences", :action => "update_one", :preference_key => "key" }
|
||||
)
|
||||
assert_routing(
|
||||
{ :path => "/api/0.6/user/preferences/key", :method => :delete },
|
||||
{ :controller => "user_preference", :action => "delete_one", :preference_key => "key" }
|
||||
{ :controller => "user_preferences", :action => "delete_one", :preference_key => "key" }
|
||||
)
|
||||
end
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue