Use factory_bot to build new model objects

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index f4c19f88cb9278ad050e9c972ad0a2939efefc8f..ade101821541f4b58ef63ab086e87b75ea5cacb7 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -178,7 +178,7 @@ OpenStreetMap::Application.routes.draw do
   # omniauth
   get "/auth/failure" => "users#auth_failure"
   match "/auth/:provider/callback" => "users#auth_success", :via => [:get, :post], :as => :auth_success
   # omniauth
   get "/auth/failure" => "users#auth_failure"
   match "/auth/:provider/callback" => "users#auth_success", :via => [:get, :post], :as => :auth_success

-  post "/auth/:provider" => "users#auth", :as => :auth
+  match "/auth/:provider" => "users#auth", :via => [:post, :patch], :as => :auth

 
   # permalink
   get "/go/:code" => "site#permalink", :code => /[a-zA-Z0-9_@~]+[=-]*/, :as => :permalink
 
   # permalink
   get "/go/:code" => "site#permalink", :code => /[a-zA-Z0-9_@~]+[=-]*/, :as => :permalink


@@ -237,9 +237,10 @@ OpenStreetMap::Application.routes.draw do
 
   # user pages
   resources :users, :path => "user", :param => :display_name, :only => [:show, :destroy]
 
   # user pages
   resources :users, :path => "user", :param => :display_name, :only => [:show, :destroy]

-  match "/user/:display_name/account" => "users#account", :via => [:get, :post], :as => "user_account"
+  get "/user/:display_name/account", :to => redirect(:path => "/account/edit")

   post "/user/:display_name/set_status" => "users#set_status", :as => :set_status_user
 
   post "/user/:display_name/set_status" => "users#set_status", :as => :set_status_user
 

+  resource :account, :only => [:edit, :update]

   resource :dashboard, :only => [:show]
   resource :preferences, :only => [:show, :edit, :update]
   resource :profile, :only => [:edit, :update]
   resource :dashboard, :only => [:show]
   resource :preferences, :only => [:show, :edit, :update]
   resource :profile, :only => [:edit, :update]