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.

Fix tests

Matthew Kennedy86a6a17124a8
diff --git a/backend/app/views/spree/admin/shared/_table_filter.html.erb b/backend/app/views/spree/admin/shared/_table_filter.html.erb
index ef245e5ab1..6ec870029a 100644
--- a/backend/app/views/spree/admin/shared/_table_filter.html.erb
+++ b/backend/app/views/spree/admin/shared/_table_filter.html.erb
@@ -1,5 +1,5 @@
<% if content_for?(:table_filter) %>
- <div class="filter-wrap pb-2">
+ <div class="filter-wrap pb-1">
<div class="col-12 px-0">
<div class="input-group index-filter-button flex-nowrap">
<span class="input-group-btn">
diff --git a/backend/spec/features/admin/homepage_spec.rb b/backend/spec/features/admin/homepage_spec.rb
index dc0fb8be39..13d1fe8709 100644
--- a/backend/spec/features/admin/homepage_spec.rb
+++ b/backend/spec/features/admin/homepage_spec.rb
@@ -13,10 +13,6 @@ describe 'Homepage', type: :feature do
within('h1') { expect(page).to have_content('Orders') }
end
- it 'has a link to overview' do
- within('header') { page.find(:xpath, "//a[@href='/admin']") }
- end
-
it 'has a link to orders' do
expect(page).to have_link('Orders', href: '/admin/orders')
end
diff --git a/backend/spec/features/admin/menus/edit_menu_spec.rb b/backend/spec/features/admin/menus/edit_menu_spec.rb
index 6f7dda83a6..257b51f733 100644
--- a/backend/spec/features/admin/menus/edit_menu_spec.rb
+++ b/backend/spec/features/admin/menus/edit_menu_spec.rb
@@ -3,8 +3,7 @@ require 'spec_helper'
describe 'Menu Edit', type: :feature do
stub_authorization!
- let!(:store_1) { create(:store) }
- let!(:main_menu) { create(:menu, name: 'Main Menu', store: store_1) }
+ let!(:main_menu) { create(:menu, name: 'Main Menu') }
let!(:menu_item) { create(:menu_item, menu: main_menu, parent: main_menu.root) }
let(:file_path) { Rails.root + '../../spec/support/ror_ringer.jpeg' }
diff --git a/backend/spec/features/admin/menus/index_menu_spec.rb b/backend/spec/features/admin/menus/index_menu_spec.rb
index ea8ff87ae3..6f992ff072 100644
--- a/backend/spec/features/admin/menus/index_menu_spec.rb
+++ b/backend/spec/features/admin/menus/index_menu_spec.rb
@@ -14,20 +14,10 @@ describe 'Menus Index', type: :feature do
end
context 'when menus are present' do
- let!(:store_1) { create(:store) }
- let!(:store_2) { create(:store) }
- let!(:store_3) { create(:store) }
- let!(:store_4) { create(:store) }
+ let!(:main_menu) { create(:menu, name: 'Main Menu') }
+ let!(:main_menu_fr) { create(:menu, name: 'Main Menu FR', locale: 'fr') }
- let!(:main_menu) { create(:menu, name: 'Main Menu', store: store_1) }
- let!(:main_menu_fr) { create(:menu, name: 'Main Menu FR', store: store_1, locale: 'fr') }
-
- let!(:main_menu_a) { create(:menu, name: 'MA', store: store_2) }
- let!(:main_menu_b) { create(:menu, name: 'MB', store: store_3) }
-
- let!(:footer_menu) { create(:menu, name: 'Footer Menu', location: 'footer', store: store_3) }
- let!(:footer_menu_a) { create(:menu, name: 'FA', location: 'footer', store: store_1) }
- let!(:footer_menu_b) { create(:menu, name: 'FB', location: 'footer', store: store_2) }
+ let!(:footer_menu) { create(:menu, name: 'Footer Menu', location: 'footer') }
before do
visit spree.admin_menus_path
@@ -43,14 +33,6 @@ describe 'Menus Index', type: :feature do
within_table('menusTable') do
expect(page).to have_text 'Main Menu'
expect(page).to have_text 'Footer Menu'
- expect(page).to have_text 'MA'
- expect(page).to have_text 'MB'
- expect(page).to have_text 'FA'
- expect(page).to have_text 'FB'
- expect(page).to have_text store_1.unique_name
- expect(page).to have_text store_2.unique_name
- expect(page).to have_text store_3.unique_name
- expect(page).not_to have_text store_4.unique_name
end
end
@@ -87,22 +69,7 @@ describe 'Menus Index', type: :feature do
click_on 'Search'
expect(page).to have_text 'Footer Menu'
- expect(page).to have_text 'FA'
- expect(page).to have_text 'FB'
- expect(page).not_to have_text 'Main Menu'
- expect(page).not_to have_text 'MA'
- expect(page).not_to have_text 'MB'
- end
-
- it 'is able to filter by store' do
- click_on 'Filter'
- select2 store_2.unique_name, from: 'Store'
- click_on 'Search'
-
- expect(page).to have_text 'MA'
- expect(page).to have_text 'FB'
expect(page).not_to have_text 'Main Menu'
- expect(page).not_to have_text 'MB'
end
end
end
diff --git a/backend/spec/features/admin/menus/new_menu_spec.rb b/backend/spec/features/admin/menus/new_menu_spec.rb
index 724dcd8c8c..2afb35044c 100644
--- a/backend/spec/features/admin/menus/new_menu_spec.rb
+++ b/backend/spec/features/admin/menus/new_menu_spec.rb
@@ -35,8 +35,7 @@ describe 'New Menu', type: :feature do
end
context 'when a user tries to create a menu with a duplicate location within scope of stores and language', js: true do
- let!(:store_1) { create(:store) }
- let!(:main_menu) { create(:menu, name: 'Main Menu', store: store_1) }
+ let!(:main_menu) { create(:menu, name: 'Main Menu') }
before do
visit spree.new_admin_menu_path
@@ -46,16 +45,12 @@ describe 'New Menu', type: :feature do
fill_in 'Name', with: 'Main Menu'
select2 'Header', from: 'Location'
- select2 store_1.unique_name, from: 'Stores'
click_on 'Create'
expect(page).to have_text ('Location has already been taken')
end
end
context 'user can create a new menu', js: true do
- let!(:store_1) { create(:store) }
- let!(:store_2) { create(:store) }
-
before do
visit spree.new_admin_menu_path
end
@@ -64,7 +59,6 @@ describe 'New Menu', type: :feature do
fill_in 'Name', with: 'Main Menu'
select2 'Footer', from: 'Location'
- select2 store_2.unique_name, from: 'Stores'
click_on 'Create'
assert_admin_flash_alert_success('Menu "Main Menu" has been successfully created!')
diff --git a/backend/spec/features/admin/orders/listing_spec.rb b/backend/spec/features/admin/orders/listing_spec.rb
index cd6cd1167d..7aa95ed17c 100644
--- a/backend/spec/features/admin/orders/listing_spec.rb
+++ b/backend/spec/features/admin/orders/listing_spec.rb
@@ -245,7 +245,6 @@ describe 'Orders Listing', type: :feature do
fill_in 'q_line_items_variant_sku_eq', with: 'BAG-00001'
select2 'Promo', from: 'Promotion'
fill_in 'q_bill_address_firstname_start', with: 'John'
- select2 'Spree Test Store', from: 'Store', match: :first
fill_in 'q_bill_address_lastname_start', with: 'Smith'
select2 'spree', from: 'Channel'
@@ -269,7 +268,6 @@ describe 'Orders Listing', type: :feature do
expect(page).to have_content('Promotion: Promo')
expect(page).to have_content('Email: [email protected]')
expect(page).to have_content('SKU: BAG-00001')
- expect(page).to have_content('Store: Spree Test Store')
expect(page).to have_content('Channel: spree')
end
end
diff --git a/backend/spec/features/admin/orders/risk_analysis_spec.rb b/backend/spec/features/admin/orders/risk_analysis_spec.rb
index b1a072fdb1..6eb148cb42 100644
--- a/backend/spec/features/admin/orders/risk_analysis_spec.rb
+++ b/backend/spec/features/admin/orders/risk_analysis_spec.rb
@@ -17,6 +17,12 @@ describe 'Order Risk Analysis', type: :feature do
context 'the order is considered risky' do
before do
+ order_store = Spree::Store.find(order.store_id)
+
+ order_store.update!(default: true)
+ order_store.save!
+ order_store.reload
+
allow_any_instance_of(Spree::Admin::BaseController).to receive_messages try_spree_current_user: create(:user)
order.payments.first.update_column(:avs_response, 'X')
diff --git a/backend/spec/features/admin/products/edit/taxons_spec.rb b/backend/spec/features/admin/products/edit/taxons_spec.rb
index fd191b4e58..ecc5d654a6 100644
--- a/backend/spec/features/admin/products/edit/taxons_spec.rb
+++ b/backend/spec/features/admin/products/edit/taxons_spec.rb
@@ -22,7 +22,7 @@ describe 'Product Taxons', type: :feature, js: true do
click_button 'Update'
expect(page).to have_css('.select2-selection__choice', text: taxon_1.name).
- and have_css('.select2-selection__choice', text: taxon_2.name)
+ and have_css('.select2-selection__choice', text: taxon_2.name)
end
end
end
diff --git a/backend/spec/features/admin/products/products_spec.rb b/backend/spec/features/admin/products/products_spec.rb
index 245d611874..c9facafc69 100644
--- a/backend/spec/features/admin/products/products_spec.rb
+++ b/backend/spec/features/admin/products/products_spec.rb
@@ -75,13 +75,13 @@ describe 'Products', type: :feature do
expect(page).to have_content('zomg shirt')
expect(page).not_to have_content('apache baseball cap')
- check 'Show Deleted'
+ find('label', text: 'Show Deleted').click
click_on 'Search'
expect(page).to have_content('zomg shirt')
expect(page).to have_content('apache baseball cap')
- uncheck 'Show Deleted'
+ find('label', text: 'Show Deleted').click
click_on 'Search'
expect(page).to have_content('zomg shirt')
@@ -311,7 +311,7 @@ describe 'Products', type: :feature do
visit spree.admin_products_path
click_on 'Filter'
- check 'Show Deleted'
+ find('label', text: 'Show Deleted').click
click_on 'Search'
expect(page).to have_content('apache baseball cap')
@@ -424,7 +424,7 @@ describe 'Products', type: :feature do
click_on 'Filter'
# This will show our deleted product
- check 'Show Deleted'
+ find('label', text: 'Show Deleted').click
click_on 'Search'
click_link(product.name, match: :first)
expect(page).to have_field(id: 'product_price') do |field|
diff --git a/core/lib/spree/testing_support/factories/menu_factory.rb b/core/lib/spree/testing_support/factories/menu_factory.rb
index f0c2aa9467..698962094d 100644
--- a/core/lib/spree/testing_support/factories/menu_factory.rb
+++ b/core/lib/spree/testing_support/factories/menu_factory.rb
@@ -3,5 +3,18 @@ FactoryBot.define do
name { generate(:random_string) }
locale { 'en' }
location {'Header'}
+
+ transient do
+ attach_to_default_store { true }
+ end
+
+ before(:create) do |menu, evaluator|
+ if evaluator.attach_to_default_store
+ default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
+ store = default_store || create(:store)
+
+ menu.store = store
+ end
+ end
end
end
diff --git a/core/lib/spree/testing_support/factories/order_factory.rb b/core/lib/spree/testing_support/factories/order_factory.rb
index b565368d9e..8fc0b91bed 100644
--- a/core/lib/spree/testing_support/factories/order_factory.rb
+++ b/core/lib/spree/testing_support/factories/order_factory.rb
@@ -9,6 +9,16 @@ FactoryBot.define do
transient do
line_items_price { BigDecimal(10) }
+ attach_to_default_store { true }
+ end
+
+ before(:create) do |order, evaluator|
+ if evaluator.attach_to_default_store
+ default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
+ store = default_store || create(:store)
+
+ order.store = store
+ end
end
factory :order_with_totals do