From 7bc35b5ed7c7ea867c89e3693fe9a640954114b0 Mon Sep 17 00:00:00 2001 From: baarkerlounger Date: Thu, 2 Dec 2021 15:30:54 +0000 Subject: [PATCH] Add role to invite --- app/controllers/users_controller.rb | 2 +- app/views/users/new.html.erb | 4 ++++ spec/features/organisation_spec.rb | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 2133b88af..30afa501b 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -46,6 +46,6 @@ private end def user_params - params.require(:user).permit(:email, :name, :password) + params.require(:user).permit(:email, :name, :password, :role) end end diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index f4c5f2b15..6c56745d6 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -20,6 +20,10 @@ autocomplete: "name" %> + <%= roles = User::ROLES.map { |key, value| OpenStruct.new(id:key, name: key.humanize) } + f.govuk_collection_select :role, roles, :id, :name, label: { text: "Role" } + %> + <%= f.govuk_email_field :email, label: { text: "Email address" }, autocomplete: "email", diff --git a/spec/features/organisation_spec.rb b/spec/features/organisation_spec.rb index dd6d120e8..71bdf3587 100644 --- a/spec/features/organisation_spec.rb +++ b/spec/features/organisation_spec.rb @@ -38,8 +38,10 @@ RSpec.describe "User Features" do expect(page).to have_content("Invite user to submit CORE data") fill_in("user[name]", with: "New User") fill_in("user[email]", with: "new_user@example.com") + select("Data provider", from: "user[role]") expect { click_button("Continue") }.to change { ActionMailer::Base.deliveries.count }.by(1) expect(page).to have_current_path("/organisations/#{org_id}/users") + expect(User.last.role).to eq("data_provider") end end end