diff --git a/app/controllers/users/account_controller.rb b/app/controllers/users/account_controller.rb index 7780fac79..ae81f02dd 100644 --- a/app/controllers/users/account_controller.rb +++ b/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 \ No newline at end of file + end +end diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb index 8088d36dc..985099900 100644 --- a/app/controllers/users/registrations_controller.rb +++ b/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 - \ No newline at end of file +end diff --git a/app/helpers/account_helper.rb b/app/helpers/account_helper.rb index ae6f5fe75..fb123bc19 100644 --- a/app/helpers/account_helper.rb +++ b/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 - \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 317638c08..6c4fd7946 100644 --- a/config/routes.rb +++ b/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") diff --git a/spec/features/user_spec.rb b/spec/features/user_spec.rb index 0be7d0cbc..0f9c82050 100644 --- a/spec/features/user_spec.rb +++ b/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")