Browse Source

Your account page - rubocop

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

32
app/controllers/users/account_controller.rb

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

10
app/controllers/users/registrations_controller.rb

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

19
app/helpers/account_helper.rb

@ -1,14 +1,13 @@
module AccountHelper
def resource_name
:user
end
def resource_name
:user
end
def resource
@resource = current_user
end
def resource
@resource = current_user
end
def devise_mapping
@devise_mapping ||= Devise.mappings[:user]
end
def devise_mapping
@devise_mapping ||= Devise.mappings[:user]
end
end

14
config/routes.rb

@ -1,19 +1,19 @@
Rails.application.routes.draw do
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
get "confirmations/reset", to: "users/passwords#reset_confirmation"
get 'users/edit' => 'devise/registrations#edit', :as => 'edit_user_registration'
patch 'users' => 'users/registrations#update', :as => 'user_registration'
patch 'details' => 'users/account#update', :as => 'account_update'
end
get "users/edit" => "devise/registrations#edit", :as => "edit_user_registration"
patch "users" => "users/registrations#update", :as => "user_registration"
patch "details" => "users/account#update", :as => "account_update"
end
# For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
ActiveAdmin.routes(self)
root to: "test#index"
get "about", to: "about#index"
get '/users/account', to: 'users/account#index'
get '/users/account/personal_details', to: 'users/account#personal_details'
get "/users/account", to: "users/account#index"
get "/users/account/personal_details", to: "users/account#personal_details"
form_handler = FormHandler.instance
form = form_handler.get_form("2021_2022")

3
spec/features/user_spec.rb

@ -59,14 +59,13 @@ RSpec.describe "User Features" do
end
context "Your Account " do
before(:each) do
visit("/case_logs")
fill_in("user_email", with: "test@example.com")
fill_in("user_password", with: "pAssword1")
click_button("Sign in")
end
it "main page is present and accessible" do
visit("/users/account")
expect(page).to have_content("Your account")

Loading…
Cancel
Save