- <%= f.submit "Update" %>
+<%= form_for(resource, as: resource_name, url: user_registration_path(), html: { method: :patch }) do |f| %>
+
+
+
Change your password
+
+
+ <%= f.label :current_password, class: "govuk-label" %>
+ <%= f.password_field :current_password, autocomplete: "current-password", class: "govuk-input" %>
+
+
+
+
+ <%= f.submit "Update", class: "govuk-button" %>
+
<% end %>
-
-
Cancel my account
-
-
Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>
-
-<%= link_to "Back", :back %>
diff --git a/app/views/users/account/index.html.erb b/app/views/users/account/index.html.erb
new file mode 100644
index 000000000..7cc3c5d6f
--- /dev/null
+++ b/app/views/users/account/index.html.erb
@@ -0,0 +1,73 @@
+
+
+
+ Your account
+
+
+ Personal details
+
+
+
+
+
+
-
+ Password
+
+ -
+ ••••••••
+
+ -
+ <%= link_to "Change", edit_user_registration_path, id: "change-password" %>
+
+
+
+
-
+ Organisation
+
+
-
+ <%= current_user.organisation %>
+
+
-
+
+
+
+
-
+ Role
+
+
-
+ <%= current_user.role %>
+
+
-
+
+
+
+
+
diff --git a/app/views/users/account/personal_details.html.erb b/app/views/users/account/personal_details.html.erb
new file mode 100644
index 000000000..f6bc779be
--- /dev/null
+++ b/app/views/users/account/personal_details.html.erb
@@ -0,0 +1,23 @@
+<% content_for :before_content do %>
+ <%= link_to 'Back', :back, class: "govuk-back-link" %>
+<% end %>
+
+<%= form_for(resource, as: resource_name, url: account_update_path(), html: { method: :patch }) do |f| %>
+
+
+
Change your personal details
+
+
+ <%= f.label :name, class: "govuk-label" %>
+ <%= f.text_field :name, autocomplete: "name", class: "govuk-input" %>
+
+
+
+ <%= f.label :email, class: "govuk-label" %>
+ <%= f.email_field :email, autocomplete: "email", class: "govuk-input" %>
+
+
+ <%= f.submit "Save changes", class: "govuk-button" %>
+
+
+<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 72030fe1e..6c4fd7946 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,14 +1,19 @@
Rails.application.routes.draw do
devise_for :admin_users, ActiveAdmin::Devise.config
- devise_for :users, controllers: { passwords: "users/passwords" }
+ 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
# 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"
form_handler = FormHandler.instance
form = form_handler.get_form("2021_2022")
diff --git a/db/migrate/20211125114400_add_name_email_role_org_to_users.rb b/db/migrate/20211125114400_add_name_email_role_org_to_users.rb
new file mode 100644
index 000000000..90a88c484
--- /dev/null
+++ b/db/migrate/20211125114400_add_name_email_role_org_to_users.rb
@@ -0,0 +1,7 @@
+class AddNameEmailRoleOrgToUsers < ActiveRecord::Migration[6.1]
+ def change
+ add_column :users, :name, :string
+ add_column :users, :role, :string
+ add_column :users, :organisation, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9a8314372..1f7ec27d6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2021_11_24_174732) do
+ActiveRecord::Schema.define(version: 2021_11_25_114400) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -177,6 +177,9 @@ ActiveRecord::Schema.define(version: 2021_11_24_174732) do
t.datetime "remember_created_at"
t.datetime "created_at", precision: 6, null: false
t.datetime "updated_at", precision: 6, null: false
+ t.string "name"
+ t.string "role"
+ t.string "organisation"
t.index ["email"], name: "index_users_on_email", unique: true
t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
end
diff --git a/spec/features/user_spec.rb b/spec/features/user_spec.rb
index 9ea79708c..68d5866c6 100644
--- a/spec/features/user_spec.rb
+++ b/spec/features/user_spec.rb
@@ -57,4 +57,55 @@ RSpec.describe "User Features" do
expect(page).to have_css '.govuk-notification-banner.govuk-notification-banner--success'
end
end
+
+ context "If a not logged in user tries to access pages that need permissions" do
+ it "redirects to log in page" do
+ visit("/users/account")
+ expect(page).to have_content("Sign in to your account to submit CORE data")
+ end
+ end
+
+ context "Your Account " do
+ before(:each) do
+ visit("/case_logs")
+ fill_in("user_email", with: user.email)
+ 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")
+ end
+
+ it "personal details page is present and accessible" do
+ visit("/users/account/personal_details")
+ expect(page).to have_content("Change your personal details")
+ end
+
+ it "edit password page present and accessible" do
+ visit("users/edit")
+ expect(page).to have_content("Change your password")
+ end
+
+ it "can navigate to change your password page from main account page" do
+ visit("/users/account")
+ click_link("change-password")
+ expect(page).to have_content("Change your password")
+ fill_in("user_current_password", with: "pAssword1")
+ fill_in("user_password", with: "Password123!")
+ click_button("Update")
+ expect(page).to have_current_path("/users/account")
+ end
+
+ it "allow user to change name" do
+ visit("/users/account")
+ click_link("change-name")
+ expect(page).to have_content("Change your personal details")
+ fill_in("user_name", with: "Test New")
+ click_button("Save changes")
+ expect(page).to have_current_path("/users/account")
+ expect(page).to have_content("Test New")
+ end
+ end
end