<%= govuk_summary_list do |summary_list| %>
<% @organisation.display_attributes.each do |attr| %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 44f401515..e9bd62065 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -11,12 +11,12 @@
<%= render SearchComponent.new(current_user:, label: "Search by name or email address") %>
<%= govuk_table do |table| %>
- <%= table.caption(size: "s", classes: %w[govuk-!-text-align-left govuk-!-margin-top-4 govuk-!-margin-bottom-4]) do |caption| %>
+ <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %>
<% if @searched %>
- Matches <%= @pagy.count %> of <%= User.count %> total users
+ Matches
<%= @pagy.count %> of
<%= User.count %> total users.
<% else %>
-
<%= @pagy.count %> total users
+
<%= @pagy.count %> total users.
<% end %>
<% if current_user.support? %>
@@ -25,15 +25,23 @@
<% end %>
<%= table.head do |head| %>
<%= head.row do |row| %>
- <% row.cell(header: true, text: "Name and email adress") %>
- <% row.cell(header: true, text: "Organisation and role") %>
- <% row.cell(header: true, text: "Last logged in") %>
+ <% row.cell(header: true, text: "Name and email adress", html_attributes: {
+ scope: "col",
+ }) %>
+ <% row.cell(header: true, text: "Organisation and role", html_attributes: {
+ scope: "col",
+ }) %>
+ <% row.cell(header: true, text: "Last logged in", html_attributes: {
+ scope: "col",
+ }) %>
<% end %>
<% end %>
<% @users.each do |user| %>
<%= table.body do |body| %>
<%= body.row do |row| %>
- <% row.cell do %>
+ <% row.cell(header: true, html_attributes: {
+ scope: "row",
+ }) do %>
<%= simple_format(user_cell(user), {}, wrapper_tag: "span") %>
<% if user.is_data_protection_officer? || user.is_key_contact? %>
diff --git a/spec/components/primary_navigation_component_spec.rb b/spec/components/primary_navigation_component_spec.rb
index e37f8320b..0de1c58d1 100644
--- a/spec/components/primary_navigation_component_spec.rb
+++ b/spec/components/primary_navigation_component_spec.rb
@@ -1,6 +1,6 @@
require "rails_helper"
-RSpec.describe NavigationComponent, type: :component do
+RSpec.describe PrimaryNavigationComponent, type: :component do
let(:items) do
[
NavigationItemsHelper::NavigationItem.new("Organisations", "/organisations", true),
@@ -9,8 +9,8 @@ RSpec.describe NavigationComponent, type: :component do
]
end
- context "when the item is 'current' in nav tabs" do
- it "then that tab appears as selected" do
+ context "when the item is 'current' in nav items" do
+ it "then that item appears as selected" do
result = render_inline(described_class.new(items:))
expect(result.css('.app-primary-navigation__link[aria-current="page"]').text).to include("Organisations")
@@ -18,17 +18,17 @@ RSpec.describe NavigationComponent, type: :component do
end
context "when the current page is sub-page" do
- it "highlights the correct tab" do
+ it "highlights the correct item" do
navigation_panel = described_class.new(items:)
- expect(navigation_panel).to be_highlighted_tab(items[0], "/something-else")
- expect(navigation_panel).not_to be_highlighted_tab(items[1], "/something-else")
- expect(navigation_panel).not_to be_highlighted_tab(items[2], "/something-else")
+ expect(navigation_panel).to be_highlighted_item(items[0], "/something-else")
+ expect(navigation_panel).not_to be_highlighted_item(items[1], "/something-else")
+ expect(navigation_panel).not_to be_highlighted_item(items[2], "/something-else")
end
end
- context "when rendering tabs" do
- it "all of the nav tabs specified in the items hash are passed to it" do
+ context "when rendering items" do
+ it "all of the nav items specified in the items hash are passed to it" do
result = render_inline(described_class.new(items:))
expect(result.text).to include("Organisations")
diff --git a/spec/components/sub_navigation_component_spec.rb b/spec/components/sub_navigation_component_spec.rb
new file mode 100644
index 000000000..fcfa2d75d
--- /dev/null
+++ b/spec/components/sub_navigation_component_spec.rb
@@ -0,0 +1,39 @@
+require "rails_helper"
+
+RSpec.describe SubNavigationComponent, type: :component do
+ let(:items) do
+ [
+ NavigationItemsHelper::NavigationItem.new("Organisations", "/organisations", true),
+ NavigationItemsHelper::NavigationItem.new("Users", "/users", false),
+ NavigationItemsHelper::NavigationItem.new("Logs ", "/logs", false),
+ ]
+ end
+
+ context "when the item is 'current' in nav items" do
+ it "then that tab appears as selected" do
+ result = render_inline(described_class.new(items:))
+
+ expect(result.css('.app-sub-navigation__link[aria-current="page"]').text).to include("Organisations")
+ end
+ end
+
+ context "when the current page is sub-page" do
+ it "highlights the correct tab" do
+ navigation_panel = described_class.new(items:)
+
+ expect(navigation_panel).to be_highlighted_item(items[0], "/something-else")
+ expect(navigation_panel).not_to be_highlighted_item(items[1], "/something-else")
+ expect(navigation_panel).not_to be_highlighted_item(items[2], "/something-else")
+ end
+ end
+
+ context "when rendering items" do
+ it "all of the nav items specified in the items hash are passed to it" do
+ result = render_inline(described_class.new(items:))
+
+ expect(result.text).to include("Organisations")
+ expect(result.text).to include("Users")
+ expect(result.text).to include("Logs")
+ end
+ end
+end
diff --git a/spec/helpers/tab_nav_helper_spec.rb b/spec/helpers/tab_nav_helper_spec.rb
index f8931de8e..4930d33b5 100644
--- a/spec/helpers/tab_nav_helper_spec.rb
+++ b/spec/helpers/tab_nav_helper_spec.rb
@@ -6,14 +6,14 @@ RSpec.describe TabNavHelper do
describe "#user_cell" do
it "returns user link and email separated by a newline character" do
- expected_html = "
Danny Rojas\n#{user.email}"
+ expected_html = "
Danny Rojas\n
#{user.email}"
expect(user_cell(user)).to match(expected_html)
end
end
describe "#org_cell" do
it "returns the users org name and role separated by a newline character" do
- expected_html = "DLUHC\n
Data provider"
+ expected_html = "DLUHC\n
Data provider"
expect(org_cell(user)).to match(expected_html)
end
end
diff --git a/spec/requests/organisations_controller_spec.rb b/spec/requests/organisations_controller_spec.rb
index 342c6f36c..94f928a6b 100644
--- a/spec/requests/organisations_controller_spec.rb
+++ b/spec/requests/organisations_controller_spec.rb
@@ -460,7 +460,7 @@ RSpec.describe OrganisationsController, type: :request do
end
it "shows the total organisations count" do
- expect(CGI.unescape_html(response.body)).to match("
#{total_organisations_count} total organisations")
+ expect(CGI.unescape_html(response.body)).to match("
#{total_organisations_count} total organisations.")
end
it "has pagination links" do
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index beb81a993..10821961c 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -381,7 +381,7 @@ RSpec.describe UsersController, type: :request do
end
it "updates the table caption" do
- expect(page).to have_content("Matches 1 of 5 total users")
+ expect(page).to have_content("Matches 1 of 5 total users.")
end
end
@@ -417,7 +417,7 @@ RSpec.describe UsersController, type: :request do
end
it "updates the table caption" do
- expect(page).to have_content("Matches 2 of 5 total users")
+ expect(page).to have_content("Matches 2 of 5 total users.")
end
end
end
@@ -842,7 +842,7 @@ RSpec.describe UsersController, type: :request do
end
it "updates the table caption" do
- expect(page).to have_content("Matches 1 of 4 total users")
+ expect(page).to have_content("Matches 1 of 4 total users.")
end
end
@@ -881,7 +881,7 @@ RSpec.describe UsersController, type: :request do
end
it "updates the table caption" do
- expect(page).to have_content("Matches 2 of 4 total users")
+ expect(page).to have_content("Matches 2 of 4 total users.")
end
end
end