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 broken test and write new test for order behavior.

Matthew Kennedy250027b21af5
diff --git a/backend/app/views/spree/admin/menus/index.html.erb b/backend/app/views/spree/admin/menus/index.html.erb
index 272738191b..44884d0b91 100644
--- a/backend/app/views/spree/admin/menus/index.html.erb
+++ b/backend/app/views/spree/admin/menus/index.html.erb
@@ -46,7 +46,6 @@
<thead>
<th scope="col"><%= Spree.t(:name) %></th>
<th scope="col"><%= Spree.t('location') %></th>
- <th scope="col"><%= Spree.t('store') %></th>
<th scope="col"><%= Spree.t('language') %></th>
<th class="text-center" scope="col"><%= Spree.t('default') %>
<span data-show-info
@@ -67,9 +66,6 @@
<td>
<%= menu.location.titleize %>
</td>
- <td>
- <%= menu.store.unique_name %>
- </td>
<td>
<%= locale_full_name(menu.locale) %>
</td>
diff --git a/backend/spec/features/admin/orders/listing_spec.rb b/backend/spec/features/admin/orders/listing_spec.rb
index 7aa95ed17c..2da5a5b886 100644
--- a/backend/spec/features/admin/orders/listing_spec.rb
+++ b/backend/spec/features/admin/orders/listing_spec.rb
@@ -3,6 +3,9 @@ require 'spec_helper'
describe 'Orders Listing', type: :feature do
stub_authorization!
+ let(:other_store_a) { create(:store) }
+ let(:other_store_b) { create(:store) }
+
let(:order1) do
create :order_with_line_items,
created_at: 1.day.from_now,
@@ -18,11 +21,29 @@ describe 'Orders Listing', type: :feature do
number: 'R200'
end
+ let(:order3) do
+ create :order,
+ store: other_store_a,
+ created_at: 1.day.ago,
+ completed_at: 1.day.ago,
+ number: 'R300'
+ end
+
+ let(:order4) do
+ create :order,
+ store: other_store_b,
+ created_at: 1.day.ago,
+ completed_at: 1.day.ago,
+ number: 'R400'
+ end
+
before do
allow_any_instance_of(Spree::OrderInventory).to receive(:add_to_shipment)
# create the order instances after stubbing the `add_to_shipment` method
order1
order2
+ order3
+ order4
visit spree.admin_orders_path
end
@@ -40,6 +61,11 @@ describe 'Orders Listing', type: :feature do
end
end
+ it 'does not show the order that belongs to the other_store' do
+ expect(page).not_to have_content('R300')
+ expect(page).not_to have_content('R400')
+ end
+
it 'is able to sort the orders listing' do
# default is completed_at desc
within_row(1) { expect(page).to have_content('R100') }
@@ -96,6 +122,15 @@ describe 'Orders Listing', type: :feature do
expect(page).not_to have_content('R200')
end
+ it 'is able to show orders from all stores' do
+ check 'q_all_stores'
+ click_on 'Filter Results'
+
+ expect(page).to have_checked_field(id: 'q_all_stores')
+ expect(page).to have_content('R300')
+ expect(page).to have_content('R400')
+ end
+
it 'is able to filter on variant_sku' do
click_on 'Filter'
fill_in 'q_line_items_variant_sku_eq', with: order1.line_items.first.variant.sku
@@ -202,7 +237,7 @@ describe 'Orders Listing', type: :feature do
end
it 'adds per_page parameter to url' do
- expect(page).to have_current_path(/per_page\=50/)
+ expect(page).to have_current_path(/per_page=50/)
end
it 'can be used with search filtering' do
@@ -211,12 +246,12 @@ describe 'Orders Listing', type: :feature do
click_on 'Filter Results'
expect(page).not_to have_content('R100')
within_row(1) { expect(page).to have_content('R200') }
- expect(page).to have_current_path(/per_page\=50/)
+ expect(page).to have_current_path(/per_page=50/)
expect(page).to have_select('per_page', selected: '50')
within('div.index-pagination-row', match: :first) do
select '75', from: 'per_page'
end
- expect(page).to have_current_path(/per_page\=75/)
+ expect(page).to have_current_path(/per_page=75/)
expect(page).to have_select('per_page', selected: '75')
expect(page).to have_selector(:css, 'select.per-page-selected-75')
expect(page).not_to have_content('R100')
@@ -250,8 +285,8 @@ describe 'Orders Listing', type: :feature do
# Can not test these in the filter dropdown
# With current implementation of flatpickr test support.
- #fill_in_date_picker('q_created_at_gt', with: '2018-01-01')
- #fill_in_date_picker('q_created_at_lt', with: '2018-01-01')
+ # fill_in_date_picker('q_created_at_gt', with: '2018-01-01')
+ # fill_in_date_picker('q_created_at_lt', with: '2018-01-01')
end
click_on 'Filter Results'
diff --git a/core/lib/spree/testing_support/factories/order_factory.rb b/core/lib/spree/testing_support/factories/order_factory.rb
index 9ddbb3246c..ef6055c1b7 100644
--- a/core/lib/spree/testing_support/factories/order_factory.rb
+++ b/core/lib/spree/testing_support/factories/order_factory.rb
@@ -2,7 +2,6 @@ FactoryBot.define do
factory :order, class: Spree::Order do
user
bill_address
- store
completed_at { nil }
email { user&.email }
currency { 'USD' }
@@ -12,8 +11,8 @@ FactoryBot.define do
attach_to_default_store { true }
end
- before(:create) do |order, evaluator|
- if evaluator.attach_to_default_store
+ before(:create) do |order|
+ unless order.store.present?
default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
store = default_store || create(:store)