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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fix broken tests, improve menus index.
Matthew Kennedybcd12a432dbc
diff --git a/backend/app/views/spree/admin/menus/index.html.erb b/backend/app/views/spree/admin/menus/index.html.erbindex ab1f5159fc..48984b6fd1 100644--- a/backend/app/views/spree/admin/menus/index.html.erb+++ b/backend/app/views/spree/admin/menus/index.html.erb@@ -11,17 +11,18 @@<table class="table" id="menusTable"><thead><th scope="col"><%= Spree.t(:name) %></th>- <th scope="col"><%= Spree.t('admin.navigation.used_in') %></th>+ <th scope="col"><%= Spree.t('admin.navigation.unique_code') %></th>+ <th scope="col"><%= Spree.t('store') %></th><th scope="col"></th></thead><tbody><% @menus.each do |menu| %><tr><td>- <%= menu.name %> <br>- <small class="form-text text-muted">- <%= menu.unique_code %>- </small>+ <%= menu.name %>+ </td>+ <td>+ <%= menu.unique_code %></td><td><span class="badge badge-secondary"><%= menu.store.unique_name %></span>diff --git a/backend/spec/controllers/spree/admin/menu_items_controller_spec.rb b/backend/spec/controllers/spree/admin/menu_items_controller_spec.rbindex c0466db136..72f1d94b53 100644--- a/backend/spec/controllers/spree/admin/menu_items_controller_spec.rb+++ b/backend/spec/controllers/spree/admin/menu_items_controller_spec.rb@@ -3,7 +3,8 @@ require 'spec_helper'describe Spree::Admin::MenusController, type: :controller dostub_authorization!- let!(:menu) { create(:menu, unique_code: 'xyz') }+ let!(:store) { create(:store) }+ let!(:menu) { create(:menu, unique_code: 'xyz', store_id: store.id) }let(:image_file) { Rack::Test::UploadedFile.new(Spree::Backend::Engine.root.join('spec', 'fixtures', 'thinking-cat.jpg')) }let(:menu_item) { create(:menu_item, menu_id: menu.id, parent_id: menu.root.id, image_asset: image_file) }diff --git a/core/spec/helpers/base_helper_spec.rb b/core/spec/helpers/base_helper_spec.rbindex 7a4d81e580..95ac02e3cb 100644--- a/core/spec/helpers/base_helper_spec.rb+++ b/core/spec/helpers/base_helper_spec.rb@@ -10,7 +10,7 @@ describe Spree::BaseHelper, type: :helper doendcontext 'localized_item_link' do- let(:menu) { create(:menu, unique_code: 'main-123') }+ let(:menu) { create(:menu, unique_code: 'main-123', store_id: current_store.id) }let(:product) { create(:product) }let(:taxon) { create(:taxon) }let(:item_url) { create(:menu_item, name: 'URL To Random Site', item_type: 'Link', menu_id: menu.id, parent_id: menu.root.id, linked_resource_type: 'URL', destination: 'https://some-other-website.com') }diff --git a/core/spec/models/spree/menu_item_spec.rb b/core/spec/models/spree/menu_item_spec.rbindex 7b4d8b2ad1..8567da61d5 100644--- a/core/spec/models/spree/menu_item_spec.rb+++ b/core/spec/models/spree/menu_item_spec.rb@@ -1,7 +1,8 @@require 'spec_helper'describe Spree::MenuItem, type: :model do- let!(:menu) { create(:menu, name: 'Main Menu') }+ let!(:store) { create(:store) }+ let!(:menu) { create(:menu, name: 'Main Menu', store_id: store.id) }describe 'validates name' doit 'returns presence error when no name is given' do