diff --git a/app/helpers/navigation_items_helper.rb b/app/helpers/navigation_items_helper.rb index e09e74f72..dbaf64296 100644 --- a/app/helpers/navigation_items_helper.rb +++ b/app/helpers/navigation_items_helper.rb @@ -36,7 +36,7 @@ module NavigationItemsHelper def scheme_items(path, current_scheme_id, title) [ - NavigationItem.new("Schemes", "/schemes/#{current_scheme_id}", !path.include?("locations")), + NavigationItem.new("Scheme", "/schemes/#{current_scheme_id}", !path.include?("locations")), NavigationItem.new(title, "/schemes/#{current_scheme_id}/locations", path.include?("locations")), ] end diff --git a/spec/helpers/navigation_items_helper_spec.rb b/spec/helpers/navigation_items_helper_spec.rb index 8fb6f39eb..90a96017b 100644 --- a/spec/helpers/navigation_items_helper_spec.rb +++ b/spec/helpers/navigation_items_helper_spec.rb @@ -187,8 +187,39 @@ RSpec.describe NavigationItemsHelper do ] end + let(:expected_scheme_items) do + [ + NavigationItemsHelper::NavigationItem.new("Scheme", "/schemes/1", true), + NavigationItemsHelper::NavigationItem.new("1 location", "/schemes/1/locations", false), + ] + end + it "returns navigation items with Schemes item set as current" do expect(primary_items("/schemes/1", current_user)).to eq(expected_navigation_items) + expect(scheme_items("/schemes/1", 1, "1 location")).to eq(expected_scheme_items) + end + end + + context "when the user is on the scheme locations page" do + let(:expected_navigation_items) do + [ + NavigationItemsHelper::NavigationItem.new("Organisations", "/organisations", false), + NavigationItemsHelper::NavigationItem.new("Users", "/users", false), + NavigationItemsHelper::NavigationItem.new("Logs", "/logs", false), + NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", true), + ] + end + + let(:expected_scheme_items) do + [ + NavigationItemsHelper::NavigationItem.new("Scheme", "/schemes/1", false), + NavigationItemsHelper::NavigationItem.new("1 location", "/schemes/1/locations", true), + ] + end + + it "returns navigation items with Schemes item set as current" do + expect(primary_items("/schemes/1/locations", current_user)).to eq(expected_navigation_items) + expect(scheme_items("/schemes/1/locations", 1, "1 location")).to eq(expected_scheme_items) end end