From e2ba18f82830e8523cf081e7f40a1babd12ef6b4 Mon Sep 17 00:00:00 2001 From: David Cook Date: Thu, 8 Jun 2023 10:47:28 +1000 Subject: [PATCH] Set sentence case tab names in Ruby instead of CSS I chose .capitalize instead of .humanize, because the latter has extra features which may not be desired. --- app/helpers/spree/admin/navigation_helper.rb | 2 +- app/webpacker/css/admin_v3/components/navigation.scss | 8 -------- spec/system/admin/bulk_order_management_spec.rb | 4 ++-- spec/system/admin/order_cycles/simple_spec.rb | 2 +- spec/system/admin/schedules_spec.rb | 2 +- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/app/helpers/spree/admin/navigation_helper.rb b/app/helpers/spree/admin/navigation_helper.rb index b182b3fbae..330cf721ae 100644 --- a/app/helpers/spree/admin/navigation_helper.rb +++ b/app/helpers/spree/admin/navigation_helper.rb @@ -26,7 +26,7 @@ module Spree destination_url = options[:url] || spree.public_send("#{options[:route]}_path") titleized_label = Spree.t(options[:label], default: options[:label], - scope: [:admin, :tab]).titleize + scope: [:admin, :tab]).capitalize css_classes = [] diff --git a/app/webpacker/css/admin_v3/components/navigation.scss b/app/webpacker/css/admin_v3/components/navigation.scss index e56a12b8c1..3291225c01 100644 --- a/app/webpacker/css/admin_v3/components/navigation.scss +++ b/app/webpacker/css/admin_v3/components/navigation.scss @@ -77,10 +77,6 @@ nav.menu { display: block; padding: 25px 5px; color: $color-9 !important; - text-transform: lowercase; - &::first-letter { - text-transform: uppercase; - } position: relative; text-align: center; font-weight: 600; @@ -136,10 +132,6 @@ nav.menu { padding: 12px 20px; color: $color-9; text-align: center; - text-transform: lowercase; - &::first-letter { - text-transform: uppercase; - } position: relative; font-size: 14px; } diff --git a/spec/system/admin/bulk_order_management_spec.rb b/spec/system/admin/bulk_order_management_spec.rb index a82d1540b7..269e06ccb0 100644 --- a/spec/system/admin/bulk_order_management_spec.rb +++ b/spec/system/admin/bulk_order_management_spec.rb @@ -1195,8 +1195,8 @@ describe ' it "displays a Bulk Management Tab under the Orders item" do visit '/admin/orders' - expect(page).to have_link "Bulk Order Management" - click_link "Bulk Order Management" + expect(page).to have_link "Bulk order management" + click_link "Bulk order management" expect(page).to have_selector "h1.page-title", text: "Bulk Order Management" end diff --git a/spec/system/admin/order_cycles/simple_spec.rb b/spec/system/admin/order_cycles/simple_spec.rb index c2d71b9561..c05501d633 100644 --- a/spec/system/admin/order_cycles/simple_spec.rb +++ b/spec/system/admin/order_cycles/simple_spec.rb @@ -203,7 +203,7 @@ describe ' name: 'Order Cycle 2' ) visit spree.admin_dashboard_path - click_link "Order Cycles" + click_link "Order cycles" # I should see only the order cycle I am coordinating expect(page).to have_selector "tr.order-cycle-#{oc_user_coordinating.id}" diff --git a/spec/system/admin/schedules_spec.rb b/spec/system/admin/schedules_spec.rb index 07dfaf413b..8913d9af18 100644 --- a/spec/system/admin/schedules_spec.rb +++ b/spec/system/admin/schedules_spec.rb @@ -30,7 +30,7 @@ describe 'Schedules' do describe "Adding a new Schedule" do it "immediately shows the schedule in the order cycle list once created" do visit spree.admin_dashboard_path - click_link 'Order Cycles' + click_link 'Order cycles' expect(page).to have_selector ".order-cycle-#{oc1.id}" find('a', text: 'NEW SCHEDULE').click