Browse Source

Your account page - rubocop

pull/110/head
Matthew Phelan 4 years ago
parent
commit
c3e99f0df9
  1. 6
      app/controllers/users/account_controller.rb
  2. 10
      app/controllers/users/registrations_controller.rb
  3. 1
      app/helpers/account_helper.rb
  4. 12
      config/routes.rb
  5. 1
      spec/features/user_spec.rb

6
app/controllers/users/account_controller.rb

@ -1,7 +1,7 @@
class Users::AccountController < ApplicationController class Users::AccountController < ApplicationController
def check_logged_in def check_logged_in
if current_user.nil? if current_user.nil?
redirect_to(new_user_session_path()) redirect_to(new_user_session_path)
end end
end end
@ -14,8 +14,8 @@ class Users::AccountController < ApplicationController
end end
def update def update
if current_user.update('name': params[:user][:name], 'email': params[:user][:email],) if current_user.update('name': params[:user][:name], 'email': params[:user][:email])
redirect_to(users_account_path()) redirect_to(users_account_path)
end end
end end
end end

10
app/controllers/users/registrations_controller.rb

@ -1,7 +1,7 @@
class Users::RegistrationsController < Devise::RegistrationsController class Users::RegistrationsController < Devise::RegistrationsController
protected protected
def after_update_path_for(resource)
users_account_path()
end
end
def after_update_path_for(_resource)
users_account_path
end
end

1
app/helpers/account_helper.rb

@ -11,4 +11,3 @@ module AccountHelper
@devise_mapping ||= Devise.mappings[:user] @devise_mapping ||= Devise.mappings[:user]
end end
end end

12
config/routes.rb

@ -1,19 +1,19 @@
Rails.application.routes.draw do Rails.application.routes.draw do
devise_for :admin_users, ActiveAdmin::Devise.config devise_for :admin_users, ActiveAdmin::Devise.config
devise_for :users, controllers: { passwords: "users/passwords" }, :skip => [:registrations] devise_for :users, controllers: { passwords: "users/passwords" }, skip: [:registrations]
devise_scope :user do devise_scope :user do
get "confirmations/reset", to: "users/passwords#reset_confirmation" get "confirmations/reset", to: "users/passwords#reset_confirmation"
get 'users/edit' => 'devise/registrations#edit', :as => 'edit_user_registration' get "users/edit" => "devise/registrations#edit", :as => "edit_user_registration"
patch 'users' => 'users/registrations#update', :as => 'user_registration' patch "users" => "users/registrations#update", :as => "user_registration"
patch 'details' => 'users/account#update', :as => 'account_update' patch "details" => "users/account#update", :as => "account_update"
end end
# For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
ActiveAdmin.routes(self) ActiveAdmin.routes(self)
root to: "test#index" root to: "test#index"
get "about", to: "about#index" get "about", to: "about#index"
get '/users/account', to: 'users/account#index' get "/users/account", to: "users/account#index"
get '/users/account/personal_details', to: 'users/account#personal_details' get "/users/account/personal_details", to: "users/account#personal_details"
form_handler = FormHandler.instance form_handler = FormHandler.instance
form = form_handler.get_form("2021_2022") form = form_handler.get_form("2021_2022")

1
spec/features/user_spec.rb

@ -59,7 +59,6 @@ RSpec.describe "User Features" do
end end
context "Your Account " do context "Your Account " do
before(:each) do before(:each) do
visit("/case_logs") visit("/case_logs")
fill_in("user_email", with: "test@example.com") fill_in("user_email", with: "test@example.com")

Loading…
Cancel
Save