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.

Fold the marketplace order examples into the orders spec

Damian Legawiec9f5ef1c2f0eb
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb
index 9ab602af25..2872776716 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb
@@ -106,6 +106,83 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller do
end
end
+ # What an operator needs from the list once a checkout can divide across
+ # sellers: which seller a row belongs to, which purchase it was part of,
+ # and the ability to narrow to either. The dashboard's columns send
+ # prefixed ids, so that is what these filter on.
+ context 'on a marketplace' do
+ let(:seller) { create(:seller, :approved, store: store, name: 'Sparks Audio') }
+ let(:other_seller) { create(:seller, :approved, store: store, name: 'Quill Books') }
+ let(:group) { create(:order_group, store: store) }
+
+ let!(:seller_order) do
+ create(:order, store: store, order_group: group, seller: seller, status: 'placed', completed_at: Time.current)
+ end
+ let!(:first_party_order) do
+ create(:order, store: store, order_group: group, status: 'placed', completed_at: Time.current)
+ end
+ let!(:ungrouped_order) do
+ create(:order, store: store, seller: other_seller, status: 'placed', completed_at: Time.current)
+ end
+
+ def row_for(record)
+ json_response['data'].find { |row| row['number'] == record.number }
+ end
+
+ def numbers
+ json_response['data'].map { |row| row['number'] }
+ end
+
+ it 'names the seller on each row' do
+ get :index, as: :json
+
+ expect(row_for(seller_order)['seller_id']).to eq(seller.prefixed_id)
+ end
+
+ it 'carries the whole profile when asked to expand it' do
+ get :index, params: { expand: 'seller' }, as: :json
+
+ expect(row_for(seller_order)['seller']['name']).to eq('Sparks Audio')
+ end
+
+ it 'leaves the operator’s own order without a seller' do
+ get :index, as: :json
+
+ expect(row_for(first_party_order)['seller_id']).to be_nil
+ expect(row_for(first_party_order)['seller']).to be_nil
+ end
+
+ it 'names the purchase a row was part of' do
+ get :index, as: :json
+
+ expect(row_for(seller_order)['order_group_id']).to eq(group.prefixed_id)
+ end
+
+ it 'leaves an ungrouped order without a purchase' do
+ get :index, as: :json
+
+ expect(row_for(ungrouped_order)['order_group_id']).to be_nil
+ end
+
+ it 'narrows to one seller' do
+ get :index, params: { q: { seller_id_eq: seller.prefixed_id } }, as: :json
+
+ expect(numbers).to contain_exactly(seller_order.number)
+ end
+
+ it 'narrows to several sellers at once, as the picker sends them' do
+ get :index, params: { q: { seller_id_in: [seller.prefixed_id, other_seller.prefixed_id] } }, as: :json
+
+ expect(numbers).to contain_exactly(seller_order.number, ungrouped_order.number)
+ end
+
+ it 'narrows to the orders of one purchase' do
+ get :index, params: { q: { order_group_id_eq: group.prefixed_id } }, as: :json
+
+ expect(numbers).to contain_exactly(seller_order.number, first_party_order.number)
+ end
+ end
+
context 'without authentication' do
let(:headers) { {} }
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/orders_marketplace_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/orders_marketplace_spec.rb
deleted file mode 100644
index baa7a44afc..0000000000
--- a/spree/api/spec/controllers/spree/api/v3/admin/orders_marketplace_spec.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-require 'spec_helper'
-
-# What an operator needs from the orders list once a checkout can divide:
-# which seller a row belongs to, which purchase it was part of, and the
-# ability to narrow to either.
-RSpec.describe Spree::Api::V3::Admin::OrdersController, 'marketplace columns and filters', type: :controller do
- render_views
-
- include_context 'API v3 Admin authenticated'
-
- let(:seller) { create(:seller, :approved, store: store, name: 'Sparks Audio') }
- let(:other_seller) { create(:seller, :approved, store: store, name: 'Quill Books') }
- let(:group) { create(:order_group, store: store) }
-
- let!(:seller_order) do
- create(:order, store: store, order_group: group, seller: seller, status: 'placed', completed_at: Time.current)
- end
- let!(:first_party_order) do
- create(:order, store: store, order_group: group, status: 'placed', completed_at: Time.current)
- end
- let!(:unrelated_order) do
- create(:order, store: store, seller: other_seller, status: 'placed', completed_at: Time.current)
- end
-
- before { request.headers.merge!(headers) }
-
- def rows
- json_response['data']
- end
-
- def row_for(order)
- rows.find { |row| row['number'] == order.number }
- end
-
- describe 'GET #index' do
- it 'names the seller on each row' do
- get :index, as: :json
-
- expect(row_for(seller_order)['seller_id']).to eq(seller.prefixed_id)
- end
-
- it 'carries the whole profile when asked to expand it' do
- get :index, params: { expand: 'seller' }, as: :json
-
- expect(row_for(seller_order)['seller']['name']).to eq('Sparks Audio')
- end
-
- it 'leaves the operator’s own order without a seller' do
- get :index, as: :json
-
- expect(row_for(first_party_order)['seller_id']).to be_nil
- expect(row_for(first_party_order)['seller']).to be_nil
- end
-
- it 'names the purchase a row was part of' do
- get :index, as: :json
-
- expect(row_for(seller_order)['order_group_id']).to eq(group.prefixed_id)
- end
-
- it 'leaves an ungrouped order without a purchase' do
- get :index, as: :json
-
- expect(row_for(unrelated_order)['order_group_id']).to be_nil
- end
- end
-
- # The dashboard's filters send prefixed ids, which is what its autocomplete
- # and its links carry — so that is what these assert on.
- describe 'filtering' do
- it 'narrows to one seller' do
- get :index, params: { q: { seller_id_eq: seller.prefixed_id } }, as: :json
-
- expect(rows.map { |row| row['number'] }).to contain_exactly(seller_order.number)
- end
-
- it 'narrows to several sellers at once, as the picker sends them' do
- get :index, params: { q: { seller_id_in: [seller.prefixed_id, other_seller.prefixed_id] } }, as: :json
-
- expect(rows.map { |row| row['number'] }).to contain_exactly(seller_order.number, unrelated_order.number)
- end
-
- it 'narrows to the orders of one purchase' do
- get :index, params: { q: { order_group_id_eq: group.prefixed_id } }, as: :json
-
- expect(rows.map { |row| row['number'] }).to contain_exactly(seller_order.number, first_party_order.number)
- end
- end
-end