Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Add language name for failing test and rename the select options helpers to use naming convention: _dropdown_values

Matthew Kennedy6ca1e8cf045d
diff --git a/backend/app/helpers/spree/admin/menu_helper.rb b/backend/app/helpers/spree/admin/menu_helper.rb
index 648c987b61..d3dc42d4fc 100644
--- a/backend/app/helpers/spree/admin/menu_helper.rb
+++ b/backend/app/helpers/spree/admin/menu_helper.rb
@@ -20,7 +20,7 @@ module Spree
content_tag(:div, info_row + menu_container, class: 'menu-item menu-container-item dragable', data: { item_id: item.id })
end
- def resorce_types_formatted_for_select
+ def resorce_types_dropdown_values
formatted_resouces = []
Spree::MenuItem::LINKED_RESOURCE_TYPE.each do |resource_type|
@@ -36,13 +36,13 @@ module Spree
formatted_resouces
end
- def menu_location_formatted_for_select
+ def menu_locations_dropdown_values
menu_items_for_select = []
Spree::Menu::MENU_LOCATIONS.each do |location|
- parameterize_location = location.parameterize(separator: '_')
+ parameterized_location = location.parameterize(separator: '_')
- menu_items_for_select << [location, parameterize_location]
+ menu_items_for_select << [location, parameterized_location]
end
menu_items_for_select
diff --git a/backend/app/helpers/spree/admin/stores_helper.rb b/backend/app/helpers/spree/admin/stores_helper.rb
index 6ee8cfe9eb..63365d2d09 100644
--- a/backend/app/helpers/spree/admin/stores_helper.rb
+++ b/backend/app/helpers/spree/admin/stores_helper.rb
@@ -5,7 +5,7 @@ module Spree
store&.checkout_zone || Spree::Zone.default_checkout_zone
end
- def stores_formatted_for_select
+ def stores_dropdown_values
formatted_stores = []
@stores.map { |store| formatted_stores << [store.unique_name, store.id] }
diff --git a/backend/app/views/spree/admin/menu_items/_form.html.erb b/backend/app/views/spree/admin/menu_items/_form.html.erb
index 2d6a55480d..8a46bb90d9 100644
--- a/backend/app/views/spree/admin/menu_items/_form.html.erb
+++ b/backend/app/views/spree/admin/menu_items/_form.html.erb
@@ -98,7 +98,7 @@
<div class="col-6">
<%= f.field_container :linked_resource_type, class: ['form-group'] do %>
<%= f.label :linked_resource_type, Spree.t('admin.navigation.link_to') %>
- <%= f.select(:linked_resource_type, resorce_types_formatted_for_select, {include_blank: false}) %>
+ <%= f.select(:linked_resource_type, resorce_types_dropdown_values, {include_blank: false}) %>
<%= f.error_message_on :linked_resource_type %>
<% end %>
</div>
diff --git a/backend/app/views/spree/admin/menus/_form.html.erb b/backend/app/views/spree/admin/menus/_form.html.erb
index a67e2d32e9..8d1b40272e 100644
--- a/backend/app/views/spree/admin/menus/_form.html.erb
+++ b/backend/app/views/spree/admin/menus/_form.html.erb
@@ -8,7 +8,7 @@
<%= f.field_container :location, class: ['form-group'] do %>
<%= f.label :location, Spree.t('location') %>
- <%= f.select(:location, menu_location_formatted_for_select, {include_blank: false}, class: 'select2') %>
+ <%= f.select(:location, menu_locations_dropdown_values, {include_blank: false}, class: 'select2') %>
<%= f.error_message_on :location %>
<% end %>
</div>
diff --git a/backend/app/views/spree/admin/menus/index.html.erb b/backend/app/views/spree/admin/menus/index.html.erb
index f5adda1daf..4dc14bb89e 100644
--- a/backend/app/views/spree/admin/menus/index.html.erb
+++ b/backend/app/views/spree/admin/menus/index.html.erb
@@ -20,7 +20,7 @@
<div class="col-12 col-lg-6">
<div class="form-group">
<%= label_tag :q_location_eq, Spree.t(:location) %>
- <%= f.select :location_eq, menu_location_formatted_for_select, { include_blank: true }, class: 'select2-clear js-filterable' %>
+ <%= f.select :location_eq, menu_locations_dropdown_values, { include_blank: true }, class: 'select2-clear js-filterable' %>
</div>
</div>
</div>
@@ -35,7 +35,7 @@
<div class="col-12 col-lg-6">
<div class="form-group">
<%= label_tag :q_store_id_in, Spree.t(:store) %>
- <%= f.select :store_id_in, stores_formatted_for_select, { include_blank: true }, class: 'select2-clear js-filterable' %>
+ <%= f.select :store_id_in, stores_dropdown_values, { include_blank: true }, class: 'select2-clear js-filterable' %>
</div>
</div>
</div>
diff --git a/backend/spec/features/admin/menus/index_menu_spec.rb b/backend/spec/features/admin/menus/index_menu_spec.rb
index 033d0be86b..7955a01fda 100644
--- a/backend/spec/features/admin/menus/index_menu_spec.rb
+++ b/backend/spec/features/admin/menus/index_menu_spec.rb
@@ -31,6 +31,12 @@ describe 'Menus Index', type: :feature do
before do
visit spree.admin_menus_path
+ I18n.backend.store_translations(:fr,
+ spree: {
+ i18n: {
+ this_file_language: 'Français (FR)'
+ }
+ })
end
it 'lists each menu with stores' do
@@ -68,7 +74,7 @@ describe 'Menus Index', type: :feature do
it 'is able to filter by language' do
click_on 'Filter'
- select2 'fr', from: 'Language'
+ select2 'Français (FR)', from: 'Language'
click_on 'Search'
expect(page).to have_text 'Main Menu FR'