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.

Speed up test suite, improve dummy app creation (#12319)

Damian Legawiec26c248deb08b
diff --git a/.circleci/config.yml b/.circleci/config.yml
index e189ea590f..f328483717 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,6 +27,9 @@ defaults: &defaults
BUNDLE_PATH: ~/spree/vendor/bundle
RAILS_VERSION: << parameters.rails_version >>
DB: postgres # default value, this will speed up bundle install for all postgres builds
+ DB_HOST: localhost
+ DB_USERNAME: postgres
+
working_directory: ~/spree
docker:
- image: &ruby_image cimg/ruby:3.3.0-browsers
@@ -70,37 +73,74 @@ jobs:
- store_test_results:
path: /tmp/test-results
- tests_postgres:
+ tests_core:
<<: *run_test
- parallelism: 12
- parameters:
- <<: *default_parameters
+ docker:
+ - image: *ruby_image
+ - image: cimg/postgres:16.2
+ environment:
+ POSTGRES_USER: postgres
+ parallelism: 6
environment:
<<: *environment
- DB_HOST: localhost
- DB_USERNAME: postgres
+ PROJECTS: core
+
+ tests_api:
+ <<: *run_test
+ parallelism: 4
docker:
- image: *ruby_image
- image: cimg/postgres:16.2
environment:
POSTGRES_USER: postgres
+ environment:
+ <<: *environment
+ PROJECTS: api
- tests_mysql:
+ tests_admin:
<<: *run_test
- parallelism: 12
- parameters:
- <<: *default_parameters
+ docker:
+ - image: *ruby_image
+ - image: cimg/postgres:16.2
+ environment:
+ POSTGRES_USER: postgres
environment:
<<: *environment
- DB: mysql
- DB_HOST: 127.0.0.1
- DB_USERNAME: root
- COVERAGE: true
- COVERAGE_DIR: /tmp/workspace/simplecov
+ PROJECTS: admin
+
+ tests_storefront:
+ <<: *run_test
docker:
- image: *ruby_image
- - image: cimg/mysql:8.0
- command: [--default-authentication-plugin=mysql_native_password]
+ - image: cimg/postgres:16.2
+ environment:
+ POSTGRES_USER: postgres
+ environment:
+ <<: *environment
+ PROJECTS: storefront
+
+ tests_other:
+ <<: *run_test
+ docker:
+ - image: *ruby_image
+ - image: cimg/postgres:16.2
+ environment:
+ POSTGRES_USER: postgres
+ environment:
+ <<: *environment
+ PROJECTS: emails,sample
+
+ # tests_mysql:
+ # <<: *run_test
+ # parallelism: 12
+ # parameters:
+ # <<: *default_parameters
+ # environment:
+ # <<: *environment_mysql
+ # docker:
+ # - image: *ruby_image
+ # - image: cimg/mysql:8.0
+ # command: [--default-authentication-plugin=mysql_native_password]
workflows:
main:
@@ -108,43 +148,36 @@ workflows:
- run_test:
name: build
run_file_path: ./bin/bundle_ruby.sh
- - tests_postgres:
- name: tests_rails_postgres
+ - tests_core:
+ name: tests_rails_postgres_core
store_artefacts: true
run_file_path: ./bin/tests_database_ci.sh
requires:
- build
- - tests_postgres:
- name: tests_rails_7_1_postgres
- rails_version: '~> 7.1.0'
+ - tests_api:
+ name: tests_rails_postgres_api
store_artefacts: true
run_file_path: ./bin/tests_database_ci.sh
requires:
- build
- - tests_rails_postgres
- - tests_postgres:
- name: tests_rails_7_0_postgres
- rails_version: '~> 7.0.0'
+ - tests_admin:
+ name: tests_rails_postgres_admin
store_artefacts: true
run_file_path: ./bin/tests_database_ci.sh
requires:
- build
- - tests_rails_postgres
- - tests_postgres:
- name: tests_rails_6_1_postgres
- rails_version: '~> 6.1.0'
+ - tests_storefront:
+ name: tests_rails_postgres_storefront
store_artefacts: true
run_file_path: ./bin/tests_database_ci.sh
requires:
- build
- - tests_rails_postgres
- - tests_mysql:
- name: tests_rails_mysql
+ - tests_other:
+ name: tests_rails_postgres_other
store_artefacts: true
run_file_path: ./bin/tests_database_ci.sh
requires:
- build
- - tests_rails_postgres
- run_test:
name: brakeman
restore_cache_key_1: spree-brakeman-{{ .Branch }}
@@ -153,4 +186,8 @@ workflows:
run_file_path: ./bin/brakeman.sh
requires:
- build
- - tests_rails_postgres
+ - tests_rails_postgres_core
+ - tests_rails_postgres_api
+ - tests_rails_postgres_admin
+ - tests_rails_postgres_storefront
+ - tests_rails_postgres_other
diff --git a/admin/spec/helpers/spree/admin/currencies_helper_spec.rb b/admin/spec/helpers/spree/admin/currencies_helper_spec.rb
index 26887cc3e8..3a127790ef 100644
--- a/admin/spec/helpers/spree/admin/currencies_helper_spec.rb
+++ b/admin/spec/helpers/spree/admin/currencies_helper_spec.rb
@@ -1,9 +1,10 @@
require 'spec_helper'
RSpec.describe Spree::Admin::CurrenciesHelper, type: :helper do
- let(:store) { create(:store, supported_currencies: 'USD,EUR,GBP') }
+ let(:store) { Spree::Store.default }
before do
+ allow(store).to receive(:supported_currencies).and_return('USD,EUR,GBP')
allow(helper).to receive(:current_store).and_return(store)
allow(helper).to receive(:current_currency).and_return('USD')
end
diff --git a/admin/spec/spec_helper.rb b/admin/spec/spec_helper.rb
index 2ba61f2644..a9925b363c 100644
--- a/admin/spec/spec_helper.rb
+++ b/admin/spec/spec_helper.rb
@@ -61,7 +61,7 @@ RSpec.configure do |config|
# If you're not using ActiveRecord, or you'd prefer not to run each of your
# examples within a transaction, comment the following line or assign false
# instead of true.
- config.use_transactional_fixtures = false
+ config.use_transactional_fixtures = true
config.before(:suite) do
Capybara.match = :smart
@@ -80,6 +80,7 @@ RSpec.configure do |config|
end
config.before(:each) do
+ Spree::Webhooks.disabled = true
begin
Rails.cache.clear
reset_spree_preferences
@@ -87,12 +88,6 @@ RSpec.configure do |config|
end
end
- config.around(:each) do |example|
- DatabaseCleaner.cleaning do
- example.run
- end
- end
-
config.include FactoryBot::Syntax::Methods
config.include Spree::Admin::TestingSupport::CapybaraUtils
diff --git a/api/spec/controllers/spree/api/v2/platform/resource_controller_spec.rb b/api/spec/controllers/spree/api/v2/platform/resource_controller_spec.rb
index 86471b3f2a..c816ada2b0 100644
--- a/api/spec/controllers/spree/api/v2/platform/resource_controller_spec.rb
+++ b/api/spec/controllers/spree/api/v2/platform/resource_controller_spec.rb
@@ -41,10 +41,12 @@ describe Spree::Api::V2::Platform::ResourceController, type: :controller do
allow(dummy_controller).to receive(:spree_current_user).and_return(nil)
end
- it { expect(collection.first).to be_instance_of(Spree::Product) }
- it { expect(collection.count).to eq(store.products.count) }
- it { expect(collection.map(&:id)).to include(product.id) }
- it { expect(collection.map(&:id)).not_to include(product_from_another_store.id) }
+ it 'returns collection of records from the current store' do
+ expect(collection.first).to be_instance_of(Spree::Product)
+ expect(collection.count).to eq(store.products.count)
+ expect(collection.map(&:id)).to include(product.id)
+ expect(collection.map(&:id)).not_to include(product_from_another_store.id)
+ end
end
describe '#permitted_resource_params' do
diff --git a/api/spec/controllers/spree/api/v2/resource_controller_spec.rb b/api/spec/controllers/spree/api/v2/resource_controller_spec.rb
index 48c1270300..9613f5a38a 100644
--- a/api/spec/controllers/spree/api/v2/resource_controller_spec.rb
+++ b/api/spec/controllers/spree/api/v2/resource_controller_spec.rb
@@ -65,9 +65,11 @@ describe Spree::Api::V2::ResourceController, type: :controller do
allow(dummy_controller).to receive(:spree_current_user).and_return(nil)
end
- it { expect(collection.first).to be_instance_of(Spree::Product) }
- it { expect(collection.count).to eq(store.products.count) }
- it { expect(collection.map(&:id)).to include(product.id) }
- it { expect(collection.map(&:id)).not_to include(product_from_another_store.id) }
+ it 'returns collection of records from the current store' do
+ expect(collection.first).to be_instance_of(Spree::Product)
+ expect(collection.count).to eq(store.products.count)
+ expect(collection.map(&:id)).to include(product.id)
+ expect(collection.map(&:id)).not_to include(product_from_another_store.id)
+ end
end
end
diff --git a/api/spec/integration/api/v2/platform/taxonomies_spec.rb b/api/spec/integration/api/v2/platform/taxonomies_spec.rb
index 6c59ebc740..a40556aa33 100644
--- a/api/spec/integration/api/v2/platform/taxonomies_spec.rb
+++ b/api/spec/integration/api/v2/platform/taxonomies_spec.rb
@@ -9,7 +9,7 @@ describe 'Taxonomies API', swagger: true do
filter_examples: [{ name: 'filter[name_eq]', example: 'Categories' }]
}
- let(:id) { create(:taxonomy, store: store).id }
+ let(:id) { store.taxonomies.first.id }
let(:records_list) { create_list(:taxonomy, 2) }
let(:valid_create_param_value) do
{
diff --git a/api/spec/requests/spree/api/v2/errors_spec.rb b/api/spec/requests/spree/api/v2/errors_spec.rb
index 7a4555b48e..f8bee3b198 100644
--- a/api/spec/requests/spree/api/v2/errors_spec.rb
+++ b/api/spec/requests/spree/api/v2/errors_spec.rb
@@ -4,9 +4,8 @@ describe 'API v2 Errors spec', type: :request do
context 'record not found' do
before { get '/api/v2/storefront/products/product-that-doesn-t-exist' }
- it_behaves_like 'returns 404 HTTP status'
-
it 'returns proper error message' do
+ expect(response.status).to eq(404)
expect(json_response['error']).to eq('The resource you were looking for could not be found.')
end
end
@@ -23,9 +22,8 @@ describe 'API v2 Errors spec', type: :request do
patch '/api/v2/storefront/cart/empty', headers: headers_bearer
end
- it_behaves_like 'returns 403 HTTP status'
-
it 'returns proper error message' do
+ expect(response.status).to eq(403)
expect(json_response['error']).to eq('You are not authorized to access this page.')
end
diff --git a/api/spec/requests/spree/api/v2/platform/cms_sections_spec.rb b/api/spec/requests/spree/api/v2/platform/cms_sections_spec.rb
index 1f9f11ca91..fb43ea0821 100644
--- a/api/spec/requests/spree/api/v2/platform/cms_sections_spec.rb
+++ b/api/spec/requests/spree/api/v2/platform/cms_sections_spec.rb
@@ -28,8 +28,6 @@ describe 'Platform API v2 CmsSections', type: :request do
patch "/api/v2/platform/cms_sections/#{resource_a.id}", headers: bearer_token, params: params
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'moves resource_a from position 1 to position 5 and updates the positions of its siblings accordingly' do
reload_sections
@@ -56,8 +54,6 @@ describe 'Platform API v2 CmsSections', type: :request do
patch "/api/v2/platform/cms_sections/#{resource_d.id}", headers: bearer_token, params: params
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'moves resource_d from position 4 to position 1, and updates the name' do
reload_sections
expect(resource_d.position).to eq(1)
diff --git a/api/spec/requests/spree/api/v2/platform/line_items_spec.rb b/api/spec/requests/spree/api/v2/platform/line_items_spec.rb
index 6436ee690d..dd8fee0f4c 100644
--- a/api/spec/requests/spree/api/v2/platform/line_items_spec.rb
+++ b/api/spec/requests/spree/api/v2/platform/line_items_spec.rb
@@ -11,30 +11,12 @@ describe 'API V2 Platform Line Items Spec' do
context 'with no params' do
before { get '/api/v2/platform/line_items', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns all line_items' do
expect(json_response['data'].count).to eq store.line_items.count
expect(json_response['data'].first).to have_type('line_item')
end
end
- context 'current store' do
- let(:store_2) { create(:store) }
- let(:order_2) { create(:order, store: store_2) }
- let!(:line_item_from_another_store) { create(:line_item, order: order_2) }
-
- before { get '/api/v2/platform/line_items', headers: bearer_token }
-
- it 'returns line items from this store only' do
- expect(json_response['data'].count).to eq store.line_items.count
- line_item_ids = json_response['data'].pluck(:id)
-
- expect(line_item_ids).not_to include(line_item_from_another_store.id)
- expect(line_item_ids).to match_array(store.line_items.ids.map(&:to_s))
- end
- end
-
context 'filtering' do
context 'by order_id' do
let(:order) { create(:order, store: store) }
@@ -76,8 +58,6 @@ describe 'API V2 Platform Line Items Spec' do
context 'ascending order' do
before { get '/api/v2/platform/line_items?sort=price', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns line items sorted by price' do
expect(json_response['data'].count).to eq store.line_items.count
expect(json_response['data'].pluck(:id)).to eq store.line_items.order(price: :asc).map(&:id).map(&:to_s)
@@ -87,8 +67,6 @@ describe 'API V2 Platform Line Items Spec' do
context 'descending order' do
before { get '/api/v2/platform/line_items?sort=-price', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns line items sorted by price with descending order' do
expect(json_response['data'].count).to eq store.line_items.count
expect(json_response['data'].pluck(:id)).to eq store.line_items.order(price: :desc).map(&:id).map(&:to_s)
@@ -100,8 +78,6 @@ describe 'API V2 Platform Line Items Spec' do
context 'ascending order' do
before { get '/api/v2/platform/line_items?sort=updated_at', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns line items sorted by updated_at' do
expect(json_response['data'].count).to eq store.line_items.count
expect(json_response['data'].pluck(:id)).to eq store.line_items.order(:updated_at).map(&:id).map(&:to_s)
@@ -111,8 +87,6 @@ describe 'API V2 Platform Line Items Spec' do
context 'descending order' do
before { get '/api/v2/platform/line_items?sort=-updated_at', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns line items sorted by updated_at with descending order' do
expect(json_response['data'].count).to eq store.line_items.count
expect(json_response['data'].pluck(:id)).to eq store.line_items.order(updated_at: :desc).map(&:id).map(&:to_s)
@@ -124,8 +98,6 @@ describe 'API V2 Platform Line Items Spec' do
context 'ascending order' do
before { get '/api/v2/platform/line_items?sort=created_at', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns line items sorted by created_at' do
expect(json_response['data'].count).to eq store.line_items.count
expect(json_response['data'].pluck(:id)).to eq store.line_items.order(:created_at).map(&:id).map(&:to_s)
@@ -135,8 +107,6 @@ describe 'API V2 Platform Line Items Spec' do
context 'descending order' do
before { get '/api/v2/platform/line_items?sort=-created_at', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns line items sorted by created_at with descending order' do
expect(json_response['data'].count).to eq store.line_items.count
expect(json_response['data'].pluck(:id)).to eq store.line_items.order(created_at: :desc).map(&:id).map(&:to_s)
@@ -150,18 +120,10 @@ describe 'API V2 Platform Line Items Spec' do
context 'when per_page is between 1 and default value' do
before { get '/api/v2/platform/line_items?page=1&per_page=2', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns the default number of line items' do
expect(json_response['data'].count).to eq 2
- end
-
- it 'returns proper meta data' do
expect(json_response['meta']['count']).to eq 2
expect(json_response['meta']['total_count']).to eq store.line_items.count
- end
-
- it 'returns proper links data' do
expect(json_response['links']['self']).to include('/api/v2/platform/line_items?page=1&per_page=2')
expect(json_response['links']['next']).to include('/api/v2/platform/line_items?page=2&per_page=2')
expect(json_response['links']['prev']).to include('/api/v2/platform/line_items?page=1&per_page=2')
@@ -172,18 +134,10 @@ describe 'API V2 Platform Line Items Spec' do
context 'without specified pagination params' do
before { get '/api/v2/platform/line_items', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns specified amount line items' do
expect(json_response['data'].count).to eq store.line_items.count
- end
-
- it 'returns proper meta data' do
expect(json_response['meta']['count']).to eq json_response['data'].count
expect(json_response['meta']['total_count']).to eq store.line_items.count
- end
-
- it 'returns proper links data' do
expect(json_response['links']['self']).to include('/api/v2/platform/line_items')
expect(json_response['links']['next']).to include('/api/v2/platform/line_items?page=1')
expect(json_response['links']['prev']).to include('/api/v2/platform/line_items?page=1')
diff --git a/api/spec/requests/spree/api/v2/platform/products_spec.rb b/api/spec/requests/spree/api/v2/platform/products_spec.rb
index 2808ae5063..784de6b99b 100644
--- a/api/spec/requests/spree/api/v2/platform/products_spec.rb
+++ b/api/spec/requests/spree/api/v2/platform/products_spec.rb
@@ -31,8 +31,6 @@ describe 'API V2 Platform Products Spec' do
context 'with no params' do
before { get '/api/v2/platform/products', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns all products' do
expect(json_response['data'].count).to eq store.products.count
expect(json_response['data'].first).to have_type('product')
@@ -79,8 +77,6 @@ describe 'API V2 Platform Products Spec' do
context 'ascending order' do
before { get '/api/v2/platform/products?sort=price', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by price' do
expect(json_response['data'].count).to eq store.products.count
expect(json_response['data'].pluck(:id)).to eq store.products.joins(master: :prices).select("#{store.products.table_name}.*, #{Spree::Price.table_name}.amount").distinct.order("#{Spree::Price.table_name}.amount").map(&:id).map(&:to_s)
@@ -90,8 +86,6 @@ describe 'API V2 Platform Products Spec' do
context 'descending order' do
before { get '/api/v2/platform/products?sort=-price', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by price with descending order' do
expect(json_response['data'].count).to eq store.products.count
expect(json_response['data'].pluck(:id)).to eq store.products.joins(master: :prices).select("#{store.products.table_name}.*, #{Spree::Price.table_name}.amount").distinct.order("#{Spree::Price.table_name}.amount DESC").map(&:id).map(&:to_s)
@@ -103,8 +97,6 @@ describe 'API V2 Platform Products Spec' do
context 'A-Z' do
before { get '/api/v2/platform/products?sort=name', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by name' do
expect(json_response['data'].count).to eq store.products.count
expect(json_response['data'].pluck(:id)).to eq store.products.order(:name).map(&:id).map(&:to_s)
@@ -114,8 +106,6 @@ describe 'API V2 Platform Products Spec' do
context 'Z-A' do
before { get '/api/v2/platform/products?sort=-name', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by name with descending order' do
expect(json_response['data'].count).to eq store.products.count
expect(json_response['data'].pluck(:id)).to eq store.products.order(name: :desc).map(&:id).map(&:to_s)
@@ -127,8 +117,6 @@ describe 'API V2 Platform Products Spec' do
context 'ascending order' do
before { get '/api/v2/platform/products?sort=updated_at', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by updated_at' do
expect(json_response['data'].count).to eq store.products.count
expect(json_response['data'].pluck(:id)).to eq store.products.order(:updated_at).map(&:id).map(&:to_s)
@@ -138,8 +126,6 @@ describe 'API V2 Platform Products Spec' do
context 'descending order' do
before { get '/api/v2/platform/products?sort=-updated_at', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by updated_at with descending order' do
expect(json_response['data'].count).to eq store.products.count
expect(json_response['data'].pluck(:id)).to eq store.products.order(updated_at: :desc).map(&:id).map(&:to_s)
@@ -151,8 +137,6 @@ describe 'API V2 Platform Products Spec' do
context 'ascending order' do
before { get '/api/v2/platform/products?sort=created_at', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by created_at' do
expect(json_response['data'].count).to eq store.products.count
expect(json_response['data'].pluck(:id)).to eq store.products.order(:created_at).map(&:id).map(&:to_s)
@@ -162,8 +146,6 @@ describe 'API V2 Platform Products Spec' do
context 'descending order' do
before { get '/api/v2/platform/products?sort=-created_at', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by created_at with descending order' do
expect(json_response['data'].count).to eq store.products.count
expect(json_response['data'].pluck(:id)).to eq store.products.order(created_at: :desc).map(&:id).map(&:to_s)
@@ -177,8 +159,6 @@ describe 'API V2 Platform Products Spec' do
context 'ascending order' do
before { get '/api/v2/platform/products?sort=available_on', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by available_on' do
expect(json_response['data'].count).to eq store.products.count
expect(json_response['data'].pluck(:id)).to eq store.products.order(:available_on).map(&:id).map(&:to_s)
@@ -188,8 +168,6 @@ describe 'API V2 Platform Products Spec' do
context 'descending order' do
before { get '/api/v2/platform/products?sort=-available_on', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by available_on with descending order' do
expect(json_response['data'].count).to eq store.products.count
expect(json_response['data'].pluck(:id)).to eq store.products.order(available_on: :desc).map(&:id).map(&:to_s)
@@ -203,8 +181,6 @@ describe 'API V2 Platform Products Spec' do
context 'ascending order' do
before { get '/api/v2/platform/products?sort=make_active_at', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by make_active_at' do
expect(json_response['data'].count).to eq store.products.count
expect(json_response['data'].pluck(:id)).to eq store.products.order(:make_active_at).map(&:id).map(&:to_s)
@@ -214,8 +190,6 @@ describe 'API V2 Platform Products Spec' do
context 'descending order' do
before { get '/api/v2/platform/products?sort=-make_active_at', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by make_active_at with descending order' do
expect(json_response['data'].count).to eq store.products.count
expect(json_response['data'].pluck(:id)).to eq store.products.order(make_active_at: :desc).map(&:id).map(&:to_s)
@@ -229,8 +203,6 @@ describe 'API V2 Platform Products Spec' do
context 'when per_page is between 1 and default value' do
before { get '/api/v2/platform/products?page=1&per_page=2', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns the default number of products' do
expect(json_response['data'].count).to eq 2
end
@@ -275,8 +247,6 @@ describe 'API V2 Platform Products Spec' do
context 'without specified pagination params' do
before { get '/api/v2/platform/products', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns specified amount products' do
expect(json_response['data'].count).to eq store.products.count
end
@@ -335,7 +305,6 @@ describe 'API V2 Platform Products Spec' do
context 'when no image transformation params are passed' do
let(:image_transformation_params) { '' }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns product image data'
it 'returns product image' do
@@ -346,7 +315,6 @@ describe 'API V2 Platform Products Spec' do
context 'when product image json returned' do
let(:image_transformation_params) { '&image_transformation[size]=100x50&image_transformation[quality]=50' }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns product image data'
it 'returns product image' do
diff --git a/api/spec/requests/spree/api/v2/platform/promotions_spec.rb b/api/spec/requests/spree/api/v2/platform/promotions_spec.rb
index df52f56484..227d849f65 100644
--- a/api/spec/requests/spree/api/v2/platform/promotions_spec.rb
+++ b/api/spec/requests/spree/api/v2/platform/promotions_spec.rb
@@ -6,8 +6,8 @@ describe 'Promotion API v2 spec', type: :request do
let(:bearer_token) { { 'Authorization' => valid_authorization } }
let!(:store) { Spree::Store.default }
- let!(:second_store) { create(:store) }
- let!(:third_store) { create(:store) }
+ let(:second_store) { create(:store) }
+ let(:third_store) { create(:store) }
let(:promotion_rule) { create(:promotion_rule) }
let(:existing_promotion) { create(:promotion_with_item_adjustment, promotion_rules: [promotion_rule]) }
diff --git a/api/spec/requests/spree/api/v2/platform/resources_spec.rb b/api/spec/requests/spree/api/v2/platform/resources_spec.rb
index 933ed100f3..0cc5a411dc 100644
--- a/api/spec/requests/spree/api/v2/platform/resources_spec.rb
+++ b/api/spec/requests/spree/api/v2/platform/resources_spec.rb
@@ -5,8 +5,8 @@ describe 'Platform API v2 Resources spec', type: :request do
include_context 'Platform API v2'
let!(:store) { Spree::Store.default }
- let!(:store_two) { create(:store) }
- let!(:store_three) { create(:store) }
+ let(:store_two) { create(:store) }
+ let(:store_three) { create(:store) }
let(:bearer_token) { { 'Authorization' => valid_authorization } }
let(:resource_params) { {} }
@@ -16,7 +16,6 @@ describe 'Platform API v2 Resources spec', type: :request do
let(:user) { create(:user) }
let(:resource) { create(:address, state: state, country: country, user: user) }
let(:id) { resource.id }
- let(:valid_http_status) { 200 }
shared_examples 'returns auth token errors' do
context 'with missing authorization token' do
@@ -61,8 +60,6 @@ describe 'Platform API v2 Resources spec', type: :request do
shared_examples 'valid request' do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns valid JSON' do
expect(json_response['data'][0]).to have_type(resource.class.json_api_type)
expect(json_response['data'].count).to eq(resources_count)
@@ -80,8 +77,6 @@ describe 'Platform API v2 Resources spec', type: :request do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns proper resources' do
expect(json_response['data'][0]).to have_type(resource.class.json_api_type)
expect(json_response['data'].count).to eq(2)
@@ -98,8 +93,6 @@ describe 'Platform API v2 Resources spec', type: :request do
execute
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns proper resources' do
expect(json_response['data'][0]).to have_type(resource.class.json_api_type)
expect(json_response['data'].count).to eq(1)
@@ -114,8 +107,6 @@ describe 'Platform API v2 Resources spec', type: :request do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns proper resource count' do
expect(json_response['data'].count).to eq 2
end
@@ -166,8 +157,6 @@ describe 'Platform API v2 Resources spec', type: :request do
context 'without specified pagination params' do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns specified amount resources' do
expect(json_response['data'].count).to eq resources.count
end
@@ -216,8 +205,6 @@ describe 'Platform API v2 Resources spec', type: :request do
shared_examples 'valid request' do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns valid JSON' do
expect(json_response['data']).to have_attribute(:firstname).with_value(resource.firstname)
expect(json_response['data']).to have_attribute(:lastname).with_value(resource.lastname)
@@ -416,8 +403,6 @@ describe 'Platform API v2 Resources spec', type: :request do
expect(json_response['data']).to have_relationship(:state).with_data({ 'id' => another_state.id.to_s, 'type' => 'state' })
end
-
- it_behaves_like 'returns 200 HTTP status'
end
context 'application with full access token' do
@@ -496,8 +481,6 @@ describe 'Platform API v2 Resources spec', type: :request do
before { execute_payment_method }
- it_behaves_like 'returns 200 HTTP status'
-
it 'will not let you remove the current store from the resource' do
payment_method.reload
expect(payment_method.stores).to match_array([store])
@@ -521,8 +504,6 @@ describe 'Platform API v2 Resources spec', type: :request do
before { execute_payment_method }
- it_behaves_like 'returns 200 HTTP status'
-
it 'will add the stores passed in' do
payment_method.reload
expect(payment_method.stores).to match_array([store, store_two, store_three])
diff --git a/api/spec/requests/spree/api/v2/platform/taxons_spec.rb b/api/spec/requests/spree/api/v2/platform/taxons_spec.rb
index a9d7eb902e..c4f2815a51 100644
--- a/api/spec/requests/spree/api/v2/platform/taxons_spec.rb
+++ b/api/spec/requests/spree/api/v2/platform/taxons_spec.rb
@@ -60,7 +60,6 @@ describe 'Platform API v2 Taxons API' do
context 'when no image transformation params are passed' do
let(:taxon_image_transformation_params) { '' }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns taxon image data'
it 'returns taxon image' do
@@ -71,7 +70,6 @@ describe 'Platform API v2 Taxons API' do
context 'when taxon image json returned' do
let(:taxon_image_transformation_params) { '&taxon_image_transformation[size]=100x50&taxon_image_transformation[quality]=50' }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns taxon image data'
it 'returns taxon image' do
diff --git a/api/spec/requests/spree/api/v2/platform/variants_spec.rb b/api/spec/requests/spree/api/v2/platform/variants_spec.rb
index cbf6f86521..6f9b2fb86a 100644
--- a/api/spec/requests/spree/api/v2/platform/variants_spec.rb
+++ b/api/spec/requests/spree/api/v2/platform/variants_spec.rb
@@ -12,8 +12,6 @@ describe 'API V2 Platform Variants Spec' do
context 'with no params' do
before { get '/api/v2/platform/variants', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns all variants' do
expect(json_response['data'].count).to eq store.variants.count
expect(json_response['data'].first).to have_type('variant')
@@ -66,8 +64,6 @@ describe 'API V2 Platform Variants Spec' do
context 'ascending order' do
before { get '/api/v2/platform/variants?sort=updated_at', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns variants sorted by updated_at' do
expect(json_response['data'].count).to eq store.variants.count
expect(json_response['data'].pluck(:id)).to eq store.variants.order(:updated_at).map(&:id).map(&:to_s)
@@ -77,8 +73,6 @@ describe 'API V2 Platform Variants Spec' do
context 'descending order' do
before { get '/api/v2/platform/variants?sort=-updated_at', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns variants sorted by updated_at with descending order' do
expect(json_response['data'].count).to eq store.variants.count
expect(json_response['data'].pluck(:id)).to eq store.variants.order(updated_at: :desc).map(&:id).map(&:to_s)
@@ -90,8 +84,6 @@ describe 'API V2 Platform Variants Spec' do
context 'ascending order' do
before { get '/api/v2/platform/variants?sort=created_at', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns variants sorted by created_at' do
expect(json_response['data'].count).to eq store.variants.count
expect(json_response['data'].pluck(:id)).to eq store.variants.order(:created_at).map(&:id).map(&:to_s)
@@ -101,8 +93,6 @@ describe 'API V2 Platform Variants Spec' do
context 'descending order' do
before { get '/api/v2/platform/variants?sort=-created_at', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns variants sorted by created_at with descending order' do
expect(json_response['data'].count).to eq store.variants.count
expect(json_response['data'].pluck(:id)).to eq store.variants.order(created_at: :desc).map(&:id).map(&:to_s)
@@ -116,18 +106,10 @@ describe 'API V2 Platform Variants Spec' do
context 'when per_page is between 1 and default value' do
before { get '/api/v2/platform/variants?page=1&per_page=2', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
- it 'returns the default number of variants' do
+ it 'returns proper pagination data' do
expect(json_response['data'].count).to eq 2
- end
-
- it 'returns proper meta data' do
expect(json_response['meta']['count']).to eq 2
expect(json_response['meta']['total_count']).to eq store.variants.count
- end
-
- it 'returns proper links data' do
expect(json_response['links']['self']).to include('/api/v2/platform/variants?page=1&per_page=2')
expect(json_response['links']['next']).to include('/api/v2/platform/variants?page=2&per_page=2')
expect(json_response['links']['prev']).to include('/api/v2/platform/variants?page=1&per_page=2')
@@ -138,18 +120,10 @@ describe 'API V2 Platform Variants Spec' do
context 'without specified pagination params' do
before { get '/api/v2/platform/variants', headers: bearer_token }
- it_behaves_like 'returns 200 HTTP status'
-
- it 'returns specified amount variants' do
+ it 'returns proper pagination data' do
expect(json_response['data'].count).to eq store.variants.count
- end
-
- it 'returns proper meta data' do
expect(json_response['meta']['count']).to eq json_response['data'].count
expect(json_response['meta']['total_count']).to eq store.variants.count
- end
-
- it 'returns proper links data' do
expect(json_response['links']['self']).to include('/api/v2/platform/variants')
expect(json_response['links']['next']).to include('/api/v2/platform/variants?page=1')
expect(json_response['links']['prev']).to include('/api/v2/platform/variants?page=1')
diff --git a/api/spec/requests/spree/api/v2/platform/webhooks/events_spec.rb b/api/spec/requests/spree/api/v2/platform/webhooks/events_spec.rb
index 959b4ebd36..55e2d78255 100644
--- a/api/spec/requests/spree/api/v2/platform/webhooks/events_spec.rb
+++ b/api/spec/requests/spree/api/v2/platform/webhooks/events_spec.rb
@@ -9,7 +9,7 @@ describe 'Platform API v2 Webhooks Events spec', type: :request do
describe '#index' do
context 'filtering' do
- let(:data_ids) { json_response['data'].pluck(:id) }
+ let(:data_ids) { json_response['data'].pluck(:id) }
context 'with no params' do
before do
@@ -17,8 +17,6 @@ describe 'Platform API v2 Webhooks Events spec', type: :request do
get "/api/v2/platform/webhooks/events", headers: bearer_token
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns all events' do
expect(json_response['data'].count).to eq(2)
expect(json_response['data'].first).to have_type(type)
diff --git a/api/spec/requests/spree/api/v2/platform/webhooks/subscribers_spec.rb b/api/spec/requests/spree/api/v2/platform/webhooks/subscribers_spec.rb
index a3664c7b68..c2f2973b94 100644
--- a/api/spec/requests/spree/api/v2/platform/webhooks/subscribers_spec.rb
+++ b/api/spec/requests/spree/api/v2/platform/webhooks/subscribers_spec.rb
@@ -18,8 +18,6 @@ describe 'Platform API v2 Webhooks Subscribers spec', type: :request do
get "/api/v2/platform/webhooks/subscribers", headers: bearer_token
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns all subscribers' do
expect(json_response['data'].count).to eq(2)
expect(json_response['data'].first).to have_type(type)
diff --git a/api/spec/requests/spree/api/v2/storefront/account/orders_spec.rb b/api/spec/requests/spree/api/v2/storefront/account/orders_spec.rb
index 876b2b3324..a1ca0295a0 100644
--- a/api/spec/requests/spree/api/v2/storefront/account/orders_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/account/orders_spec.rb
@@ -66,8 +66,6 @@ describe 'Storefront API v2 Orders spec', type: :request do
context 'with specified pagination params' do
before { get '/api/v2/storefront/account/orders?page=1&per_page=2', headers: headers_bearer }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns specified amount orders' do
expect(json_response['data'].count).to eq 2
end
@@ -112,8 +110,6 @@ describe 'Storefront API v2 Orders spec', type: :request do
context 'without specified pagination params' do
before { get '/api/v2/storefront/account/orders', headers: headers_bearer }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns specified amount orders' do
expect(json_response['data'].count).to eq Spree::Order.count
end
@@ -140,8 +136,6 @@ describe 'Storefront API v2 Orders spec', type: :request do
context 'ascending order' do
before { get '/api/v2/storefront/account/orders?sort=completed_at', headers: headers_bearer }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns orders sorted by completed_at' do
expect(json_response['data'].count).to eq store.orders.count
expect(json_response['data'].pluck(:id)).to eq store.orders.select('*').order(completed_at: :asc).pluck(:id).map(&:to_s)
@@ -151,8 +145,6 @@ describe 'Storefront API v2 Orders spec', type: :request do
context 'descending order' do
before { get '/api/v2/storefront/account/orders?sort=-completed_at', headers: headers_bearer }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns orders sorted by completed_at' do
expect(json_response['data'].count).to eq store.orders.count
expect(json_response['data'].pluck(:id)).to eq store.orders.select('*').order(completed_at: :desc).pluck(:id).map(&:to_s)
@@ -166,8 +158,6 @@ describe 'Storefront API v2 Orders spec', type: :request do
before { get '/api/v2/storefront/account/orders', headers: headers_bearer }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns orders sorted by completed_at' do
expect(json_response['data'].count).to eq 1
expect(json_response['data'].pluck(:id)).not_to include(order_2.id.to_s)
diff --git a/api/spec/requests/spree/api/v2/storefront/account_spec.rb b/api/spec/requests/spree/api/v2/storefront/account_spec.rb
index 3e207e550e..98488b2f70 100644
--- a/api/spec/requests/spree/api/v2/storefront/account_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/account_spec.rb
@@ -40,8 +40,6 @@ describe 'Storefront API v2 Account spec', type: :request do
get '/api/v2/storefront/account', headers: headers
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'return JSON API payload of User and associations (default billing and shipping address)' do
expect(json_response['data']).to have_id(user.id.to_s)
expect(json_response['data']).to have_type('user')
@@ -111,8 +109,6 @@ describe 'Storefront API v2 Account spec', type: :request do
before { post "/api/v2/storefront/account", params: params }
context 'valid request' do
- it_behaves_like 'returns 200 HTTP status'
-
it 'creates and returns user' do
created_user = Spree.user_class.last
expect(json_response['data']['id']).to eq created_user.id.to_s
@@ -186,8 +182,6 @@ describe 'Storefront API v2 Account spec', type: :request do
before { patch "/api/v2/storefront/account", params: params, headers: headers }
- it_behaves_like 'returns 200 HTTP status'
-
it 'updates and returns user' do
expect(json_response['data']).to have_id(user.id.to_s)
expect(json_response['data']).to have_attribute(:email).with_value(new_attributes[:email])
@@ -210,8 +204,6 @@ describe 'Storefront API v2 Account spec', type: :request do
before { patch "/api/v2/storefront/account", params: params, headers: headers }
- it_behaves_like 'returns 200 HTTP status'
-
it 'updates only email' do
expect(json_response['data']).to have_id(user.id.to_s)
expect(json_response['data']).to have_attribute(:email).with_value(new_attributes[:email])
diff --git a/api/spec/requests/spree/api/v2/storefront/cart_spec.rb b/api/spec/requests/spree/api/v2/storefront/cart_spec.rb
index 84c8875cf6..c3813eda0e 100644
--- a/api/spec/requests/spree/api/v2/storefront/cart_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/cart_spec.rb
@@ -11,9 +11,8 @@ describe 'API V2 Storefront Cart Spec', type: :request do
include_context 'API v2 tokens'
shared_examples 'coupon code error' do
- it_behaves_like 'returns 422 HTTP status'
-
it 'returns an error' do
+ expect(response.status).to eq(422)
expect(json_response[:error]).to eq("The coupon code you entered doesn't exist. Please try again.")
end
end
@@ -183,7 +182,6 @@ describe 'API V2 Storefront Cart Spec', type: :request do
shared_examples 'adds item' do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
it 'with success' do
@@ -215,9 +213,8 @@ describe 'API V2 Storefront Cart Spec', type: :request do
execute
end
- it_behaves_like 'returns 422 HTTP status'
-
it 'returns an error' do
+ expect(response.status).to eq(422)
expect(json_response[:error]).to eq("Quantity selected of \"#{variant.name} (#{variant.options_text})\" is not available.")
end
end
@@ -228,9 +225,8 @@ describe 'API V2 Storefront Cart Spec', type: :request do
execute
end
- it_behaves_like 'returns 404 HTTP status'
-
it 'returns an error' do
+ expect(response.status).to eq(404)
expect(json_response[:error]).to eq('The resource you were looking for could not be found.')
end
end
@@ -241,9 +237,8 @@ describe 'API V2 Storefront Cart Spec', type: :request do
execute
end
- it_behaves_like 'returns 404 HTTP status'
-
it 'returns an error' do
+ expect(response.status).to eq(404)
expect(json_response[:error]).to eq('The resource you were looking for could not be found.')
end
end
@@ -254,9 +249,8 @@ describe 'API V2 Storefront Cart Spec', type: :request do
execute
end
- it_behaves_like 'returns 422 HTTP status'
-
it 'return an error' do
+ expect(response.status).to eq(422)
expect(json_response[:error]).to eq(I18n.t(:invalid_params, scope: 'spree.api.v2.metadata'))
end
end
@@ -322,7 +316,6 @@ describe 'API V2 Storefront Cart Spec', type: :request do
context 'containing line item' do
let!(:line_item) { create(:line_item, order: order) }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
it 'removes line item from the cart' do
@@ -358,7 +351,6 @@ describe 'API V2 Storefront Cart Spec', type: :request do
shared_examples 'emptying the order' do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
it 'empties the order' do
@@ -429,9 +421,8 @@ describe 'API V2 Storefront Cart Spec', type: :request do
let(:execute) { patch '/api/v2/storefront/cart/set_quantity', params: params, headers: headers }
shared_examples 'wrong quantity parameter' do
- it_behaves_like 'returns 422 HTTP status'
-
it 'returns an error' do
+ expect(response.status).to eq(422)
expect(json_response[:error]).to eq('Quantity has to be greater than 0')
end
end
@@ -452,9 +443,8 @@ describe 'API V2 Storefront Cart Spec', type: :request do
execute
end
- it_behaves_like 'returns 422 HTTP status'
-
it 'returns an error' do
+ expect(response.status).to eq(422)
expect(json_response[:error]).to eq("Quantity selected of \"#{line_item.name}\" is not available.")
end
end
@@ -462,7 +452,6 @@ describe 'API V2 Storefront Cart Spec', type: :request do
context 'changes the quantity of line item' do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
it 'successfully changes the quantity' do
@@ -512,7 +501,6 @@ describe 'API V2 Storefront Cart Spec', type: :request do
get '/api/v2/storefront/cart', headers: headers, params: params
end
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
end
@@ -661,7 +649,6 @@ describe 'API V2 Storefront Cart Spec', type: :request do
let(:adjustment_value_in_money) { Spree::Money.new(adjustment_value, currency: order.currency) }
context 'applies coupon code correctly' do
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
it 'changes the adjustment total' do
@@ -735,7 +722,6 @@ describe 'API V2 Storefront Cart Spec', type: :request do
context 'removes coupon code correctly' do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
it 'changes the adjustment total to 0.0' do
@@ -816,7 +802,6 @@ describe 'API V2 Storefront Cart Spec', type: :request do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
it 'changes the adjustment total to 0.0' do
@@ -930,8 +915,6 @@ describe 'API V2 Storefront Cart Spec', type: :request do
execute
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns valid shipments JSON' do
[{ shipping_method: shipping_method, shipping_rate: shipping_rate }, { shipping_method: shipping_method_2, shipping_rate: shipping_rate_2 }].each do |shipping|
expect(json_response['data']).to include(have_type('shipping_rate').and(have_attribute(:name).with_value(shipping[:shipping_method].name)))
diff --git a/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb b/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb
index e6fe99d256..6568717a6e 100644
--- a/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb
@@ -58,9 +58,8 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
execute
end
- it_behaves_like 'returns 422 HTTP status'
-
it 'cannot transition to address without a line item' do
+ expect(response.status).to eq(422)
expect(json_response['error']).to include(I18n.t('spree.there_are_no_items_for_this_order'))
end
end
@@ -68,7 +67,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
context 'with line_items and email' do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
it 'can transition an order to the next state' do
@@ -83,9 +81,8 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
execute
end
- it_behaves_like 'returns 422 HTTP status'
-
it 'returns an error' do
+ expect(response.status).to eq(422)
expect(json_response['error']).to include(I18n.t('spree.no_payment_found'))
end
@@ -121,7 +118,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
execute
end
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
it 'advances an order till complete or confirm step' do
@@ -138,7 +134,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
execute
end
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
it 'advances up to the payment state' do
@@ -151,9 +146,8 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
before { execute }
- it_behaves_like 'returns 422 HTTP status'
-
it 'advances up to the payment state' do
+ expect(response.status).to eq(422)
expect(order.reload.state).to eq('payment')
end
@@ -165,13 +159,12 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
context 'when on payment state' do
let(:order_state) { 'payment' }
- it_behaves_like 'returns 422 HTTP status'
-
it 'advances up to the payment state' do
expect(order.reload.state).to eq('payment')
end
it 'responds with an error' do
+ expect(response.status).to eq(422)
expect(json_response['error']).to eq(Spree.t(:no_payment_found))
end
end
@@ -232,7 +225,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
execute
end
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
it 'completes an order' do
@@ -245,16 +237,10 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
context 'without payment data' do
before { execute }
- it_behaves_like 'returns 422 HTTP status'
-
it 'returns an error' do
+ expect(response.status).to eq(422)
expect(json_response['error']).to include(I18n.t('spree.no_payment_found'))
end
-
- it 'doesnt completes an order' do
- expect(order.reload.state).not_to eq('complete')
- expect(order.completed_at).to be_nil
- end
end
it_behaves_like 'no current order'
@@ -310,7 +296,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
it 'updates addresses' do
@@ -350,7 +335,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
execute
end
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
it 'updates shipment' do
@@ -378,7 +362,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
it 'updates payment method' do
@@ -392,7 +375,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
it 'updates payment method with source' do
@@ -425,7 +407,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
it 'updates the special instructions' do
@@ -448,7 +429,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
it 'updates email' do
@@ -474,9 +454,8 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
execute
end
- it_behaves_like 'returns 422 HTTP status'
-
it 'returns an error' do
+ expect(response.status).to eq(422)
expect(json_response['error']).to eq('Email is invalid')
end
@@ -536,7 +515,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
end
context 'with no amount param' do
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'valid payload', 500.0
end
@@ -544,7 +522,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
let(:requested_amount) { 300.0 }
let(:params) { { order_token: order.token, amount: requested_amount } }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'valid payload', 300.0
end
@@ -597,8 +574,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
execute
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns no valid StoreCredit payment' do
expect(json_response['included'].empty?).to eq true
end
@@ -612,8 +587,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
shared_examples 'returns a list of available payment methods' do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns valid payment methods JSON' do
expect(json_response['data']).not_to be_empty
expect(json_response['data'][0]).to have_id(payment_method.id.to_s)
@@ -661,9 +634,8 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
shared_examples 'creates a payment' do
before { execute }
- it_behaves_like 'returns 201 HTTP status'
-
it 'returns new payment' do
+ expect(response.status).to eq(201)
expect(json_response['data']).to have_relationship(:payments).with_data([{ 'id' => payment.id.to_s, 'type' => 'payment' }])
expect(json_response['included'][0]).to have_id(payment.id.to_s)
expect(json_response['included'][0]).to have_type('payment')
@@ -671,10 +643,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
expect(json_response['included'][0]).to have_jsonapi_attributes(:amount, :response_code, :number, :cvv_response_code, :cvv_response_message, :payment_method_id, :payment_method_name, :state)
expect(json_response['included'][0]).to have_relationship(:payment_method).with_data({ 'id' => payment_method.id.to_s, 'type' => 'payment_method' })
end
-
- it 'creates new payment record' do
- expect { change(order.payments, :count).by(1) }
- end
end
shared_examples 'creates a payment source' do
@@ -761,8 +729,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
order.reload
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns valid shipments JSON' do
expect(json_response['data']).not_to be_empty
expect(json_response['data'].size).to eq(order.shipments.count)
@@ -849,8 +815,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
context 'valid shipping method' do
before { execute }
- it_behaves_like 'returns 200 HTTP status'
-
it 'sets selected shipping method for shipment' do
expect(json_response['included'][0]).to have_id(shipment.id.to_s)
expect(json_response['included'][0]).to have_type('shipment')
@@ -1056,7 +1020,6 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
post '/api/v2/storefront/checkout/validate_order_for_payment', headers: headers
end
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
end
diff --git a/api/spec/requests/spree/api/v2/storefront/cms_pages_spec.rb b/api/spec/requests/spree/api/v2/storefront/cms_pages_spec.rb
index 7da3a3d078..a7a06d6007 100644
--- a/api/spec/requests/spree/api/v2/storefront/cms_pages_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/cms_pages_spec.rb
@@ -35,7 +35,6 @@ describe 'Storefront API v2 CMS Pages spec', type: :request do
context 'with no params' do
before { get '/api/v2/storefront/cms_pages' }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns proper JSON structure'
it 'returns all pages for the current store and locale' do
@@ -48,7 +47,6 @@ describe 'Storefront API v2 CMS Pages spec', type: :request do
before { get '/api/v2/storefront/cms_pages?locale=fr' }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns proper JSON structure'
it 'returns all pages for the current store and specified locale' do
@@ -60,8 +58,6 @@ describe 'Storefront API v2 CMS Pages spec', type: :request do
shared_examples 'returns proper records' do
before { get "/api/v2/storefront/cms_pages?filter[type]=#{kind}" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns pages for the current store and specified kind' do
expect(json_response['data'].pluck(:id)).to contain_exactly(page.id.to_s)
end
@@ -91,8 +87,6 @@ describe 'Storefront API v2 CMS Pages spec', type: :request do
context 'non-existing type' do
before { get '/api/v2/storefront/cms_pages?filter[type]=non-existing' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns all records' do
expect(json_response['data'].pluck(:id)).to contain_exactly(home_en.id.to_s, standard_en.id.to_s)
end
@@ -102,8 +96,6 @@ describe 'Storefront API v2 CMS Pages spec', type: :request do
context 'filtering by title' do
before { get '/api/v2/storefront/cms_pages?filter[title]=about' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns page with title containing the query' do
expect(json_response['data'].pluck(:id)).to contain_exactly(standard_en.id.to_s)
end
@@ -116,7 +108,6 @@ describe 'Storefront API v2 CMS Pages spec', type: :request do
before { get '/api/v2/storefront/cms_pages?include=cms_sections.linked_resource' }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns proper JSON structure'
it 'returns sections and their associations' do
@@ -148,8 +139,6 @@ describe 'Storefront API v2 CMS Pages spec', type: :request do
before { get "/api/v2/storefront/cms_pages/#{page.id}?include=cms_sections.linked_resource" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns page attributes and relationships' do
expect(json_response['data']['id']).to eq(page.id.to_s)
expect(json_response['data']['attributes']['title']).to eq page.title
diff --git a/api/spec/requests/spree/api/v2/storefront/countries_spec.rb b/api/spec/requests/spree/api/v2/storefront/countries_spec.rb
index bc1a8d8d87..318dd75a7c 100644
--- a/api/spec/requests/spree/api/v2/storefront/countries_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/countries_spec.rb
@@ -29,8 +29,6 @@ describe 'Storefront API v2 Countries spec', type: :request do
before { get '/api/v2/storefront/countries' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns all countries' do
expect(json_response['data'].size).to eq(240)
expect(json_response['data'][0]).to have_type('country')
@@ -115,27 +113,9 @@ describe 'Storefront API v2 Countries spec', type: :request do
end
end
- context 'when different current store' do
- let!(:second_country) { create(:country) }
- let!(:second_store) { create(:store, name: 'Second Store', default_country: second_country) }
-
- before do
- allow_any_instance_of(Spree::Api::V2::Storefront::CountriesController).to receive(:current_store).and_return(second_store)
- get '/api/v2/storefront/countries/default'
- end
-
- it 'should return second_country' do
- expect(json_response['data']).to have_id(second_country.id.to_s)
- expect(json_response['data']).to have_attribute(:iso).with_value(second_country.iso)
- expect(json_response['data']).to have_attribute(:default).with_value(true)
- end
- end
-
context 'with specified options' do
before { get "/api/v2/storefront/countries/#{country.iso}?include=states" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns country with included states' do
expect(json_response['data']).to have_id(country.id.to_s)
expect(json_response['included']).to include(have_type('state').and(have_attribute(:abbr).with_value(states.first.abbr)))
diff --git a/api/spec/requests/spree/api/v2/storefront/menus_spec.rb b/api/spec/requests/spree/api/v2/storefront/menus_spec.rb
index 2b8ff4eca5..997b1c267a 100644
--- a/api/spec/requests/spree/api/v2/storefront/menus_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/menus_spec.rb
@@ -29,7 +29,6 @@ describe 'Storefront API v2 Menus spec', type: :request do
context 'with no params' do
before { get '/api/v2/storefront/menus' }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns proper JSON structure'
it 'returns all menus for the current store and locale' do
@@ -42,7 +41,6 @@ describe 'Storefront API v2 Menus spec', type: :request do
before { get '/api/v2/storefront/menus?locale=fr' }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns proper JSON structure'
it 'returns all menus for the current store and specified locale' do
@@ -66,7 +64,6 @@ describe 'Storefront API v2 Menus spec', type: :request do
before { get '/api/v2/storefront/menus?include=menu_items.linked_resource' }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns proper JSON structure'
it 'returns menu items and their associations' do
@@ -84,8 +81,6 @@ describe 'Storefront API v2 Menus spec', type: :request do
context 'filtering by location' do
before { get '/api/v2/storefront/menus?filter[location]=header' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns menus for the current store and specified location' do
expect(json_response['data'].pluck(:id)).to contain_exactly(header_en.id.to_s)
end
@@ -102,8 +97,6 @@ describe 'Storefront API v2 Menus spec', type: :request do
before { get "/api/v2/storefront/menus/#{menu.id}?include=menu_items.linked_resource" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns menu attributes and relationships' do
expect(json_response['data']['id']).to eq(menu.id.to_s)
expect(json_response['data']['attributes']['name']).to eq menu.name
diff --git a/api/spec/requests/spree/api/v2/storefront/order_status_spec.rb b/api/spec/requests/spree/api/v2/storefront/order_status_spec.rb
index 77398e91b9..baaac43eed 100644
--- a/api/spec/requests/spree/api/v2/storefront/order_status_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/order_status_spec.rb
@@ -35,7 +35,6 @@ describe 'Storefront API v2 OrderStatus spec', type: :request do
context 'as a guest user with valid token' do
before { get "/api/v2/storefront/order_status/#{order.number}", headers: headers_order_token }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns valid cart JSON'
end
end
diff --git a/api/spec/requests/spree/api/v2/storefront/products_spec.rb b/api/spec/requests/spree/api/v2/storefront/products_spec.rb
index 1dd5c1f7e7..2d8084ad06 100644
--- a/api/spec/requests/spree/api/v2/storefront/products_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/products_spec.rb
@@ -36,8 +36,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'with no params' do
before { get '/api/v2/storefront/products' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns all products' do
expect(json_response['data'].count).to eq store.products.available.count
expect(json_response['data'].first).to have_type('product')
@@ -105,8 +103,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'with specified ids' do
before { get "/api/v2/storefront/products?filter[ids]=#{products.first.id}" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products with specified ids' do
expect(json_response['data'].count).to eq 1
expect(json_response['data'].first).to have_id(products.first.id.to_s)
@@ -116,8 +112,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'with specified skus' do
before { get "/api/v2/storefront/products?filter[skus]=#{products.first.default_variant.sku}" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products with specified ids' do
expect(json_response['data'].count).to eq 1
expect(json_response['data'].first).to have_id(products.first.id.to_s)
@@ -127,8 +121,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'with specified price range' do
before { get "/api/v2/storefront/products?filter[price]=#{product_with_price.price.to_f},#{product_with_price.price.to_f + 0.04}" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products with specified price' do
expect(json_response['data'].first).to have_id(product_with_price.id.to_s)
expect(json_response['data'].first).to have_attribute(:price).with_value(product_with_price.price.to_f.to_s)
@@ -138,8 +130,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'with specified taxon_ids' do
before { get "/api/v2/storefront/products?filter[taxons]=#{product_with_taxon.taxons.first.id}" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products with specified taxons' do
expect(json_response['data'].first).to have_id(product_with_taxon.id.to_s)
end
@@ -148,8 +138,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'with specified name' do
before { get "/api/v2/storefront/products?filter[name]=#{product_with_name.name}" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products with specified name' do
expect(json_response['data'].first).to have_id(product_with_name.id.to_s)
expect(json_response['data'].first).to have_attribute(:name).with_value(product_with_name.name)
@@ -162,8 +150,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
get "/api/v2/storefront/products?filter[options][#{option_type.name}]=#{option_value.name}&include=option_types,variants.option_values"
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products with specified options' do
expect(json_response['data'].first).to have_id(product_with_option.id.to_s)
expect(json_response['included']).to include(have_type('option_type').and(have_attribute(:name).with_value(option_type.name)))
@@ -250,8 +236,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'when filtering by tag_1/tag_2 tags' do
let(:tags_list) { 'tag_1,tag_2' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products with specified tags' do
expect(json_response['data']).to include(have_id(product_1.id.to_s))
expect(json_response['data']).to include(have_id(product_2.id.to_s))
@@ -262,8 +246,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'when filtering by tag_2/tag_3 tags' do
let(:tags_list) { 'tag_2,tag_3' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products with specified tags' do
expect(json_response['data']).to include(have_id(product_1.id.to_s))
expect(json_response['data']).to include(have_id(product_2.id.to_s))
@@ -274,8 +256,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'when filtering by tag_3 tags' do
let(:tags_list) { 'tag_3' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products with specified tags' do
expect(json_response['data']).not_to include(have_id(product_1.id.to_s))
expect(json_response['data']).not_to include(have_id(product_2.id.to_s))
@@ -286,8 +266,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'when filtering by non-existent tags' do
let(:tags_list) { 'tag_4,tag5' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products with specified tags' do
expect(json_response['data']).not_to include(have_id(product_1.id.to_s))
expect(json_response['data']).not_to include(have_id(product_2.id.to_s))
@@ -322,8 +300,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
before { get "/api/v2/storefront/products?#{options_filter}&include=option_types,variants.option_values" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products with specified options' do
expect(json_response['data']).to include(have_id(product_1.id.to_s))
expect(json_response['data']).not_to include(have_id(product_2.id.to_s))
@@ -346,8 +322,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
before { get "/api/v2/storefront/products?#{options_filter}&include=option_types,variants.option_values" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns no products' do
expect(json_response['data']).to be_empty
end
@@ -359,8 +333,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
xcontext 'using proper filter params' do
before { get "/api/v2/storefront/products?filter[properties][#{property.filter_param}]=#{product_property.filter_param}&include=product_properties" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products with specified properties' do
expect(json_response['data'].first).to have_id(product_with_property.id.to_s)
expect(json_response['included']).to include(have_type('product_property').and(have_attribute(:name).with_value(property.name)))
@@ -374,8 +346,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
xcontext 'using property names and values' do
before { get "/api/v2/storefront/products?filter[properties][#{property.name}]=#{product_property.value}&include=product_properties" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products with specified properties' do
expect(json_response['data'].first).to have_id(product_with_property.id.to_s)
end
@@ -439,8 +409,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'with specified multiple filters' do
before { get "/api/v2/storefront/products?filter[name]=#{product_with_name.name}&filter[price]=#{product_with_name.price.to_f - 0.02},#{product_with_name.price.to_f + 0.02}" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products with specified name and price' do
expect(json_response['data'].count).to eq 1
expect(json_response['data'].first).to have_id(product_with_name.id.to_s)
@@ -450,8 +418,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'with included deleted' do
before { get '/api/v2/storefront/products?filter[show_deleted]=true' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products with deleted products' do
expect(json_response['data'].count).to eq 10
expect(json_response['data'].pluck(:id)).to include(deleted_product.id.to_s)
@@ -461,8 +427,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'with included discontinued' do
before { get '/api/v2/storefront/products?filter[show_discontinued]=true' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products with discontinued products' do
expect(json_response['data'].count).to eq 11
expect(json_response['data'].pluck(:id)).to include(discontinued_product.id.to_s)
@@ -474,8 +438,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
get '/api/v2/storefront/products?filter[show_deleted]=true&filter[show_discontinued]=true'
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns available, deleted and discontinued products' do
expect(json_response['data'].count).to eq 12
expect(json_response['data'].pluck(:id)).to include(deleted_product.id.to_s, discontinued_product.id.to_s)
@@ -487,8 +449,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
get '/api/v2/storefront/products?filter[in_stock]=true'
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products in stock' do
expect(json_response['data'].count).to eq 2
expect(json_response['data'].pluck(:id)).to include(in_stock_product.id.to_s, not_backorderable_product.id.to_s)
@@ -500,8 +460,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
get '/api/v2/storefront/products?filter[backorderable]=true'
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products in stock' do
expect(json_response['data'].count).to eq 8
expect(json_response['data'].pluck(:id)).not_to include(not_backorderable_product.id.to_s)
@@ -513,8 +471,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
get '/api/v2/storefront/products?filter[purchasable]=true'
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns only purchasable products' do
expect(json_response['data'].count).to eq 9
expect(json_response['data'].pluck(:id)).to include(in_stock_product.id.to_s, not_backorderable_product.id.to_s)
@@ -526,8 +482,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'ascending order' do
before { get '/api/v2/storefront/products?sort=price' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by price' do
expect(json_response['data'].count).to eq store.products.available.count
expect(json_response['data'].pluck(:id)).to eq store.products.available.joins(master: :prices).select("#{store.products.table_name}.*, #{Spree::Price.table_name}.amount").distinct.order("#{Spree::Price.table_name}.amount").map(&:id).map(&:to_s)
@@ -537,8 +491,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'descending order' do
before { get '/api/v2/storefront/products?sort=-price' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by price with descending order' do
expect(json_response['data'].count).to eq store.products.available.count
expect(json_response['data'].pluck(:id)).to eq store.products.available.joins(master: :prices).select("#{store.products.table_name}.*, #{Spree::Price.table_name}.amount").distinct.order("#{Spree::Price.table_name}.amount DESC").map(&:id).map(&:to_s)
@@ -555,8 +507,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
before { get request_path }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by name' do
expect(json_response['data'].count).to eq store.products.available.count
expect(json_response['data'].pluck(:id)).to eq store.products.i18n.available.order(:name).map(&:id).map(&:to_s)
@@ -565,8 +515,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'when using another locale' do
let(:request_path) { '/api/v2/storefront/products?sort=name&locale=pl' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by name' do
expect(json_response['data'].count).to eq store.products.available.count
expect(json_response['data'].pluck(:id)).to eq store.products.i18n.available.
@@ -581,8 +529,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
before { get request_path }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by name with descending order' do
expect(json_response['data'].count).to eq store.products.available.count
expect(json_response['data'].pluck(:id)).to eq store.products.available.order(name: :desc).map(&:id).map(&:to_s)
@@ -591,8 +537,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'when using another locale' do
let(:request_path) { '/api/v2/storefront/products?sort=-name&locale=pl' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by name' do
expect(json_response['data'].count).to eq store.products.available.count
expect(json_response['data'].pluck(:id)).to eq store.products.available.
@@ -607,8 +551,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'ascending order' do
before { get '/api/v2/storefront/products?sort=updated_at' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by updated_at' do
expect(json_response['data'].count).to eq store.products.available.count
expect(json_response['data'].pluck(:id)).to eq store.products.available.order(:updated_at).map(&:id).map(&:to_s)
@@ -618,8 +560,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'descending order' do
before { get '/api/v2/storefront/products?sort=-updated_at' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by updated_at with descending order' do
expect(json_response['data'].count).to eq store.products.available.count
expect(json_response['data'].pluck(:id)).to eq store.products.available.order(updated_at: :desc).map(&:id).map(&:to_s)
@@ -631,8 +571,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'ascending order' do
before { get '/api/v2/storefront/products?sort=created_at' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by created_at' do
expect(json_response['data'].count).to eq store.products.available.count
expect(json_response['data'].pluck(:id)).to eq store.products.available.order(:created_at).map(&:id).map(&:to_s)
@@ -642,8 +580,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'descending order' do
before { get '/api/v2/storefront/products?sort=-created_at' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by created_at with descending order' do
expect(json_response['data'].count).to eq store.products.available.count
expect(json_response['data'].pluck(:id)).to eq store.products.available.order(created_at: :desc).map(&:id).map(&:to_s)
@@ -657,8 +593,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'ascending order' do
before { get '/api/v2/storefront/products?sort=available_on' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by available_on' do
expect(json_response['data'].count).to eq store.products.available.count
expect(json_response['data'].pluck(:id)).to eq store.products.available.order(:available_on).map(&:id).map(&:to_s)
@@ -668,8 +602,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'descending order' do
before { get '/api/v2/storefront/products?sort=-available_on' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by available_on with descending order' do
expect(json_response['data'].count).to eq store.products.available.count
expect(json_response['data'].pluck(:id)).to eq store.products.available.order(available_on: :desc).map(&:id).map(&:to_s)
@@ -681,8 +613,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
shared_examples 'returning products in ascending sku order' do
before { get "/api/v2/storefront/products?sort=sku#{params}" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by master variant sku' do
expect(skus_array).to eq(skus_array.sort)
expect(json_response['data'].count).to eq(store.products.available.count)
@@ -693,8 +623,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
shared_examples 'returning products in descending sku order' do
before { get "/api/v2/storefront/products?sort=-sku#{params}" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns products sorted by master variant sku with descending order' do
expect(skus_array).to eq(skus_array.sort.reverse)
expect(json_response['data'].count).to eq(store.products.available.count)
@@ -740,14 +668,14 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'when sku sort order direction is ascending' do
before { get "/api/v2/storefront/products?sort=sku#{params}" }
- it_behaves_like 'returns 200 HTTP status'
+
it_behaves_like 'returns products in ascending updated_at order'
end
context 'when sku sort order direction is descending' do
before { get "/api/v2/storefront/products?sort=-sku#{params}" }
- it_behaves_like 'returns 200 HTTP status'
+
it_behaves_like 'returns products in ascending updated_at order'
end
end
@@ -759,8 +687,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
before { get '/api/v2/storefront/products?sort=-sku,price' }
- it_behaves_like 'returns 200 HTTP status'
-
it do
expect(skus_array).to eq(skus_array.sort.reverse)
expect(json_response['data'].count).to eq(store.products.available.count)
@@ -773,8 +699,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'when per_page is between 1 and default value' do
before { get '/api/v2/storefront/products?page=1&per_page=2' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns the default number of products' do
expect(json_response['data'].count).to eq 2
end
@@ -819,8 +743,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'without specified pagination params' do
before { get '/api/v2/storefront/products' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns specified amount products' do
expect(json_response['data'].count).to eq store.products.available.count
end
@@ -1074,7 +996,7 @@ describe 'API V2 Storefront Products Spec', type: :request do
'&sort=-updated_at,price,-name,created_at,-available_on,sku'
end
- it_behaves_like 'returns 200 HTTP status'
+
end
end
@@ -1082,7 +1004,7 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'with supported currency param' do
before { get "/api/v2/storefront/products/#{product.slug}?currency=USD" }
- it_behaves_like 'returns 200 HTTP status'
+
it 'return product with supported currency' do
expect(json_response['data']).not_to be_empty
@@ -1097,8 +1019,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
get "/api/v2/storefront/products/#{product.slug}?currency=EUR&include=default_variant"
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns empty prices' do
expect(json_response['data']).not_to be_empty
expect(json_response['data']['id']).to eq(product.id.to_s)
@@ -1136,8 +1056,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'with existing product' do
before { get "/api/v2/storefront/products/#{product.slug}" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns a valid JSON response' do
expect(json_response['data']).to have_id(product.id.to_s)
@@ -1238,8 +1156,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
get "/api/v2/storefront/products/#{old_slug}"
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'still finds the product' do
expect(json_response['data']['id']).to eq(product.id.to_s)
end
@@ -1262,7 +1178,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'when no image transformation params are passed' do
let(:image_transformation_params) { '' }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns product image data'
it 'returns product image' do
@@ -1273,7 +1188,6 @@ describe 'API V2 Storefront Products Spec', type: :request do
context 'when product image json returned' do
let(:image_transformation_params) { '&image_transformation[size]=100x50&image_transformation[quality]=50' }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns product image data'
it 'returns product image' do
diff --git a/api/spec/requests/spree/api/v2/storefront/taxons_spec.rb b/api/spec/requests/spree/api/v2/storefront/taxons_spec.rb
index c77aafa007..835b1991b1 100644
--- a/api/spec/requests/spree/api/v2/storefront/taxons_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/taxons_spec.rb
@@ -5,9 +5,6 @@ describe 'Taxons Spec', type: :request do
let!(:taxonomy) { store.taxonomies.first }
let!(:taxons) { create_list(:taxon, 2, taxonomy: taxonomy, parent: taxonomy.root) }
- let(:store2) { create(:store)}
- let!(:taxonomy2) { create(:taxonomy, store: store2) }
-
before do
store.update_column(:supported_locales, 'en,pl,es')
Spree::Api::Config[:api_v2_per_page_limit] = 2
@@ -28,18 +25,12 @@ describe 'Taxons Spec', type: :request do
context 'with no params' do
before { get '/api/v2/storefront/taxons' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns all taxons' do
expect(json_response['data'].size).to eq(store.taxons.count)
expect(json_response['data'][0]).to have_type('taxon')
expect(json_response['data'][0]).to have_relationships(:parent, :taxonomy, :children, :image)
expect(json_response['data'][0]).not_to have_relationships(:produts)
end
-
- it 'should return only default store taxons' do
- expect(json_response['data'].map{ |t| t['id'] }).to contain_exactly(*store.taxons.pluck(:id).map(&:to_s))
- end
end
context 'with locale set to pl' do
@@ -76,8 +67,6 @@ describe 'Taxons Spec', type: :request do
before { get '/api/v2/storefront/taxons?locale=pl' }
- it_behaves_like 'returns 200 HTTP status'
-
# FIXME: this test fails on CI but works locally
xit 'returns all taxons' do
expect(json_response['data'].size).to eq(3)
@@ -99,8 +88,6 @@ describe 'Taxons Spec', type: :request do
context 'by roots' do
before { get '/api/v2/storefront/taxons?filter[roots]=true' }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns taxons by roots' do
expect(json_response['data'].size).to eq(store.taxons.where(parent: nil).count)
expect(json_response['data'][0]).to have_type('taxon')
@@ -113,8 +100,6 @@ describe 'Taxons Spec', type: :request do
context 'by parent' do
before { get "/api/v2/storefront/taxons?filter[parent_id]=#{taxonomy.root.id}" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns children taxons by parent' do
expect(json_response['data'].size).to eq(2)
expect(json_response['data'][0]).to have_relationship(:parent).with_data('id' => taxonomy.root.id.to_s, 'type' => 'taxon')
@@ -142,8 +127,6 @@ describe 'Taxons Spec', type: :request do
get request_path
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns children taxons by parent' do
expect(json_response['data'].size).to eq(2)
expect(json_response['data'][0]).to have_relationship(:parent).with_data('id' => taxonomy.root.id.to_s, 'type' => 'taxon')
@@ -153,8 +136,6 @@ describe 'Taxons Spec', type: :request do
context 'with another locale' do
let(:request_path) { "/api/v2/storefront/taxons?filter[parent_permalink]=#{taxonomy.root.permalink_pl}&locale=pl" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns children taxons by parent' do
expect(json_response['data'].size).to eq(2)
@@ -170,8 +151,6 @@ describe 'Taxons Spec', type: :request do
context 'by taxonomy' do
before { get "/api/v2/storefront/taxons?filter[taxonomy_id]=#{taxonomy.id}" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns taxons by taxonomy' do
expect(json_response['data'].size).to eq(taxonomy.taxons.count)
expect(json_response['data'][0]).to have_relationship(:taxonomy).with_data('id' => taxonomy.id.to_s, 'type' => 'taxonomy')
@@ -183,8 +162,6 @@ describe 'Taxons Spec', type: :request do
context 'by ids' do
before { get "/api/v2/storefront/taxons?filter[ids]=#{taxons.map(&:id).join(',')}" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns taxons by ids' do
expect(json_response['data'].size).to eq(2)
expect(json_response['data'].pluck(:id).sort).to eq(taxons.map(&:id).map(&:to_s).sort)
@@ -194,8 +171,6 @@ describe 'Taxons Spec', type: :request do
context 'by name' do
before { get "/api/v2/storefront/taxons?filter[name]=#{taxons.last.name}" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns taxons by name' do
expect(json_response['data'].size).to eq(1)
expect(json_response['data'].last['attributes']['name']).to eq(taxons.last.name)
@@ -306,7 +281,6 @@ describe 'Taxons Spec', type: :request do
context 'when no image transformation params are passed' do
let(:taxon_image_transformation_params) { '' }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns taxon image data'
it 'returns taxon image' do
@@ -317,7 +291,6 @@ describe 'Taxons Spec', type: :request do
context 'when taxon image json returned' do
let(:taxon_image_transformation_params) { '&taxon_image_transformation[size]=100x50&taxon_image_transformation[quality]=50' }
- it_behaves_like 'returns 200 HTTP status'
it_behaves_like 'returns taxon image data'
it 'returns taxon image' do
diff --git a/api/spec/requests/spree/api/v2/storefront/variants_spec.rb b/api/spec/requests/spree/api/v2/storefront/variants_spec.rb
index d8b57c43c3..34ac1f5693 100644
--- a/api/spec/requests/spree/api/v2/storefront/variants_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/variants_spec.rb
@@ -25,8 +25,6 @@ RSpec.describe 'API V2 Storefront Variants Spec', type: :request do
context 'with no params' do
before { get "/api/v2/storefront/products/#{product.id}/variants" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns all product variants including master' do
expect(json_response['data'].count).to eq(5)
@@ -41,8 +39,6 @@ RSpec.describe 'API V2 Storefront Variants Spec', type: :request do
context 'with specified option name and value' do
before { get "/api/v2/storefront/products/#{product.id}/variants?filter[options][color]=white" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns product variants with the specified option' do
expect(json_response['data'].count).to eq(2)
@@ -54,8 +50,6 @@ RSpec.describe 'API V2 Storefront Variants Spec', type: :request do
context 'with multiple options' do
before { get "/api/v2/storefront/products/#{product.id}/variants?filter[options][color]=white&filter[options][size]=m" }
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns product variants with the specified options' do
expect(json_response['data'].count).to eq(1)
expect(json_response['data']).to include(have_type('variant').and(have_id(variant_4.id.to_s)))
diff --git a/api/spec/requests/spree/api/v2/storefront/wishlists_spec.rb b/api/spec/requests/spree/api/v2/storefront/wishlists_spec.rb
index f25750161c..6bc671524a 100644
--- a/api/spec/requests/spree/api/v2/storefront/wishlists_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/wishlists_spec.rb
@@ -352,8 +352,6 @@ RSpec.describe Spree::Api::V2::Storefront::WishlistsController, type: :request d
}
end
- it_behaves_like 'returns 200 HTTP status'
-
it 'returns wishlist in response' do
expect(json_response['data']['type']).to eql ('wishlist')
expect(json_response['data']['id']).to eql wishlist.id.to_s
@@ -463,13 +461,12 @@ RSpec.describe Spree::Api::V2::Storefront::WishlistsController, type: :request d
}
end
- it_behaves_like 'returns 422 HTTP status'
-
it 'does not create wished item' do
expect(user.wishlists.reload.first.wished_items.count).to eq 1
end
it 'returns error message' do
+ expect(response.status).to eq(422)
expect(json_response['error']).to eq 'Quantity must be greater than 0'
end
end
@@ -506,10 +503,6 @@ RSpec.describe Spree::Api::V2::Storefront::WishlistsController, type: :request d
it 'does not create wished item' do
expect(user.wishlists.reload.first.wished_items).to be_empty
end
-
- it 'does not create wished item' do
- expect(user.wishlists.reload.first.wished_items).to be_empty
- end
end
context 'when passed quantity is 0' do
@@ -521,13 +514,12 @@ RSpec.describe Spree::Api::V2::Storefront::WishlistsController, type: :request d
}
end
- it_behaves_like 'returns 422 HTTP status'
-
it 'does not create wished item' do
expect(user.wishlists.reload.first.wished_items).to be_empty
end
it 'returns error message' do
+ expect(response.status).to eq(422)
expect(json_response['error']).to eq 'Quantity must be greater than 0'
end
end
diff --git a/api/spec/serializers/spree/api/v2/platform/cms_page_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/cms_page_serializer_spec.rb
index bb06259ae7..a63a99108b 100644
--- a/api/spec/serializers/spree/api/v2/platform/cms_page_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/cms_page_serializer_spec.rb
@@ -5,8 +5,6 @@ describe Spree::Api::V2::Platform::CmsPageSerializer do
let(:cms_page) { create(:cms_feature_page, cms_sections: create_list(:cms_hero_image_section, 2)) }
- it { expect(subject).to be_kind_of(Hash) }
-
it do
expect(subject).to eq(
{
diff --git a/api/spec/serializers/spree/api/v2/platform/digital_link_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/digital_link_serializer_spec.rb
index 0fe1654a16..7dd799d42f 100644
--- a/api/spec/serializers/spree/api/v2/platform/digital_link_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/digital_link_serializer_spec.rb
@@ -5,8 +5,6 @@ describe Spree::Api::V2::Platform::DigitalLinkSerializer do
let(:digital_link) { create(:digital_link) }
- it { expect(subject).to be_kind_of(Hash) }
-
it do
expect(subject).to eq(
{
diff --git a/api/spec/serializers/spree/api/v2/platform/digital_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/digital_serializer_spec.rb
index 3b8e7a9467..29fe754504 100644
--- a/api/spec/serializers/spree/api/v2/platform/digital_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/digital_serializer_spec.rb
@@ -5,8 +5,6 @@ describe Spree::Api::V2::Platform::DigitalSerializer do
let(:digital) { create(:digital) }
- it { expect(subject).to be_kind_of(Hash) }
-
it do
expect(subject).to eq(
{
diff --git a/api/spec/serializers/spree/api/v2/platform/menu_item_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/menu_item_serializer_spec.rb
index 33a4f76466..1bd0b20853 100644
--- a/api/spec/serializers/spree/api/v2/platform/menu_item_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/menu_item_serializer_spec.rb
@@ -12,8 +12,6 @@ describe Spree::Api::V2::Platform::MenuItemSerializer do
]
end
- it { expect(subject).to be_kind_of(Hash) }
-
it do
expect(subject).to eq(
{
diff --git a/api/spec/serializers/spree/api/v2/platform/menu_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/menu_serializer_spec.rb
index 2b3752519d..d199b75e72 100644
--- a/api/spec/serializers/spree/api/v2/platform/menu_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/menu_serializer_spec.rb
@@ -5,8 +5,6 @@ describe Spree::Api::V2::Platform::MenuSerializer do
let(:menu) { create(:menu) }
- it { expect(subject).to be_kind_of(Hash) }
-
it do
expect(subject).to eq(
{
diff --git a/api/spec/serializers/spree/api/v2/platform/option_type_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/option_type_serializer_spec.rb
index dc347eef3b..83324f5ff3 100644
--- a/api/spec/serializers/spree/api/v2/platform/option_type_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/option_type_serializer_spec.rb
@@ -5,8 +5,6 @@ describe Spree::Api::V2::Platform::OptionTypeSerializer do
let(:option_type) { create(:option_type, option_values: create_list(:option_value, 2)) }
- it { expect(subject).to be_kind_of(Hash) }
-
it do
expect(subject).to eq(
{
diff --git a/api/spec/serializers/spree/api/v2/platform/option_value_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/option_value_serializer_spec.rb
index f243c0dc82..d49849eb82 100644
--- a/api/spec/serializers/spree/api/v2/platform/option_value_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/option_value_serializer_spec.rb
@@ -5,8 +5,6 @@ describe Spree::Api::V2::Platform::OptionValueSerializer do
let(:option_value) { create(:option_value) }
- it { expect(subject).to be_kind_of(Hash) }
-
it do
expect(subject).to eq(
{
diff --git a/api/spec/serializers/spree/api/v2/platform/product_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/product_serializer_spec.rb
index bc1137a000..c4e73aab94 100644
--- a/api/spec/serializers/spree/api/v2/platform/product_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/product_serializer_spec.rb
@@ -5,6 +5,8 @@ describe Spree::Api::V2::Platform::ProductSerializer do
subject { described_class.new(product, params: serializer_params).serializable_hash }
+ let(:store) { Spree::Store.default }
+ let(:taxonomy) { store.taxonomies.first }
let!(:images) { create_list(:image, 2) }
let(:product) do
create(:product_in_stock,
@@ -14,8 +16,9 @@ describe Spree::Api::V2::Platform::ProductSerializer do
variants_including_master: [create(:variant, images: images), create(:variant)],
option_types: create_list(:option_type, 2),
product_properties: create_list(:product_property, 2),
- taxons: create_list(:taxon, 2),
- tax_category: create(:tax_category))
+ taxons: create_list(:taxon, 2, taxonomy: taxonomy),
+ tax_category: create(:tax_category),
+ stores: [store])
end
let(:serializable_hash) do
{
@@ -141,8 +144,6 @@ describe Spree::Api::V2::Platform::ProductSerializer do
end
end
- it { expect(subject).to be_kind_of(Hash) }
-
it { expect(subject).to eq(serializable_hash) }
it_behaves_like 'an ActiveJob serializable hash'
diff --git a/api/spec/serializers/spree/api/v2/platform/promotion_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/promotion_serializer_spec.rb
index 98e83bd702..dc4b316059 100644
--- a/api/spec/serializers/spree/api/v2/platform/promotion_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/promotion_serializer_spec.rb
@@ -8,8 +8,6 @@ describe Spree::Api::V2::Platform::PromotionSerializer do
let(:promotion_rule) { create(:promotion_rule) }
let(:resource) { create(:promotion_with_item_adjustment, promotion_category: promotion_category, promotion_rules: [promotion_rule]) }
- it { expect(subject).to be_kind_of(Hash) }
-
it do
expect(subject).to eq(
{
diff --git a/api/spec/serializers/spree/api/v2/platform/refund_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/refund_serializer_spec.rb
index f68428903e..231f1c190e 100644
--- a/api/spec/serializers/spree/api/v2/platform/refund_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/refund_serializer_spec.rb
@@ -7,8 +7,6 @@ describe Spree::Api::V2::Platform::RefundSerializer do
let(:resource) { create(:refund, amount: 5.0, refunder: create(:user)) }
- it { expect(subject).to be_kind_of(Hash) }
-
it_behaves_like 'an ActiveJob serializable hash'
context 'with included relationships' do
diff --git a/api/spec/serializers/spree/api/v2/platform/shipping_method_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/shipping_method_serializer_spec.rb
index ee337d8a07..9878d82117 100644
--- a/api/spec/serializers/spree/api/v2/platform/shipping_method_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/shipping_method_serializer_spec.rb
@@ -10,8 +10,6 @@ describe Spree::Api::V2::Platform::ShippingMethodSerializer do
let(:resource) { create(:shipping_method, shipping_categories: [shipping_category], tax_category: tax_category) }
- it { expect(subject).to be_kind_of(Hash) }
-
it do
expect(subject).to eq(
{
diff --git a/api/spec/serializers/spree/api/v2/platform/store_credit_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/store_credit_serializer_spec.rb
index be0b7a7236..cfb6dcf99a 100644
--- a/api/spec/serializers/spree/api/v2/platform/store_credit_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/store_credit_serializer_spec.rb
@@ -7,8 +7,6 @@ describe Spree::Api::V2::Platform::StoreCreditSerializer do
let(:resource) { create(:store_credit) }
- it { expect(subject).to be_kind_of(Hash) }
-
it_behaves_like 'an ActiveJob serializable hash'
context 'with included relationships' do
diff --git a/api/spec/serializers/spree/api/v2/platform/store_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/store_serializer_spec.rb
index 381858a0f6..2be4657bd7 100644
--- a/api/spec/serializers/spree/api/v2/platform/store_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/store_serializer_spec.rb
@@ -12,8 +12,6 @@ describe Spree::Api::V2::Platform::StoreSerializer do
end
let(:url_helpers) { Rails.application.routes.url_helpers }
- it { expect(subject).to be_kind_of(Hash) }
-
it 'generates the correct serialization' do
expect(subject).to eq(
{
diff --git a/api/spec/serializers/spree/api/v2/platform/taxon_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/taxon_serializer_spec.rb
index 28ead6aa4a..2fa80cc459 100644
--- a/api/spec/serializers/spree/api/v2/platform/taxon_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/taxon_serializer_spec.rb
@@ -9,8 +9,6 @@ describe Spree::Api::V2::Platform::TaxonSerializer do
let(:taxon) { create(:taxon, :with_description, taxonomy: taxonomy, products: create_list(:product, 2, stores: [store])) }
let!(:children) { create_list(:taxon, 2, taxonomy: taxonomy, parent: taxon) }
- it { expect(subject).to be_kind_of(Hash) }
-
context 'without products' do
it do
expect(subject).to match(
diff --git a/api/spec/serializers/spree/api/v2/platform/variant_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/variant_serializer_spec.rb
index 7966fb171b..5a23ad6bf0 100644
--- a/api/spec/serializers/spree/api/v2/platform/variant_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/variant_serializer_spec.rb
@@ -8,8 +8,6 @@ describe Spree::Api::V2::Platform::VariantSerializer do
let!(:variant) { create(:variant, price: 10, compare_at_price: 15, images: create_list(:image, 2), tax_category: create(:tax_category)) }
let!(:digital) { create(:digital, variant: variant) }
- it { expect(subject).to be_kind_of(Hash) }
-
it do
expect(subject).to eq(
{
diff --git a/api/spec/serializers/spree/v2/storefront/wished_item_serializer_spec.rb b/api/spec/serializers/spree/v2/storefront/wished_item_serializer_spec.rb
index 0d96d58883..69998a7d13 100644
--- a/api/spec/serializers/spree/v2/storefront/wished_item_serializer_spec.rb
+++ b/api/spec/serializers/spree/v2/storefront/wished_item_serializer_spec.rb
@@ -6,8 +6,6 @@ describe Spree::V2::Storefront::WishedItemSerializer do
let!(:wishlist) { create(:wishlist) }
let!(:wished_item) { create(:wished_item, wishlist: wishlist, variant: create(:variant), quantity: 5) }
- it { expect(subject).to be_kind_of(Hash) }
-
it do
expect(subject).to eq(
{
diff --git a/api/spec/serializers/spree/v2/storefront/wishlist_serializer_spec.rb b/api/spec/serializers/spree/v2/storefront/wishlist_serializer_spec.rb
index e0a1cc8c61..1eb869f49c 100644
--- a/api/spec/serializers/spree/v2/storefront/wishlist_serializer_spec.rb
+++ b/api/spec/serializers/spree/v2/storefront/wishlist_serializer_spec.rb
@@ -6,8 +6,6 @@ describe Spree::V2::Storefront::WishlistSerializer do
let!(:wishlist) { create(:wishlist) }
let!(:wished_item) { create(:wished_item, wishlist: wishlist, variant: create(:variant), quantity: 1) }
- it { expect(subject).to be_kind_of(Hash) }
-
it do
expect(subject).to eq(
{
diff --git a/api/spec/spec_helper.rb b/api/spec/spec_helper.rb
index e0dfa39543..eedd94a747 100644
--- a/api/spec/spec_helper.rb
+++ b/api/spec/spec_helper.rb
@@ -76,6 +76,12 @@ RSpec.configure do |config|
config.include Spree::TestingSupport::Preferences
config.include Spree::TestingSupport::ImageHelpers
+ config.before(:suite) do
+ # Clean out the database state before the tests run
+ DatabaseCleaner.strategy = :transaction
+ DatabaseCleaner.clean_with(:truncation)
+ end
+
config.before do
Spree::Webhooks.disabled = true
@@ -87,6 +93,12 @@ RSpec.configure do |config|
I18n.locale = :en
end
+ config.around(:each) do |example|
+ DatabaseCleaner.cleaning do
+ example.run
+ end
+ end
+
config.order = :random
Kernel.srand config.seed
end
diff --git a/api/spec/support/database_cleaner.rb b/api/spec/support/database_cleaner.rb
deleted file mode 100644
index 2c2d42763e..0000000000
--- a/api/spec/support/database_cleaner.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-RSpec.configure do |config|
- config.before(:suite) do
- DatabaseCleaner.strategy = :transaction
- DatabaseCleaner.clean_with(:truncation)
- end
-
- config.before do
- DatabaseCleaner.start
- end
-
- config.append_after do
- DatabaseCleaner.clean
- end
-end
diff --git a/bin/build-ci.rb b/bin/build-ci.rb
index e385a018cd..7942db6318 100755
--- a/bin/build-ci.rb
+++ b/bin/build-ci.rb
@@ -21,7 +21,7 @@ class Project
@name = name
end
- ALL = %w[emails api core sample admin storefront].map(&method(:new)).freeze
+ ALL = %w[emails api core sample admin storefront].freeze
CORE_GEMS = %w[api core].freeze
# Install subproject
@@ -168,7 +168,7 @@ class Project
#
# @return [Array<Project>]
def self.current_projects
- ALL
+ ENV.fetch('PROJECTS', ALL.join(',')).split(',').map(&method(:new))
end
private_class_method :current_projects
diff --git a/bin/tests_database_ci.sh b/bin/tests_database_ci.sh
index 7901979e26..9295b8adea 100644
--- a/bin/tests_database_ci.sh
+++ b/bin/tests_database_ci.sh
@@ -2,13 +2,6 @@
set -euxo pipefail
-if [$DB -eq "mysql"]
-then
- sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
-fi
-
-ls -l /tmp
-
sudo apt-get update && sudo apt-get install libvips42
bundle install
./bin/build-ci.rb install
diff --git a/core/db/migrate/20250120094216_create_page_builder_models.rb b/core/db/migrate/20250120094216_create_page_builder_models.rb
index 280388d69a..8ab0c2b06f 100644
--- a/core/db/migrate/20250120094216_create_page_builder_models.rb
+++ b/core/db/migrate/20250120094216_create_page_builder_models.rb
@@ -16,9 +16,7 @@ class CreatePageBuilderModels < ActiveRecord::Migration[6.1]
t.index ['deleted_at'], name: 'index_spree_themes_on_deleted_at'
t.index ['store_id', 'default'], name: 'index_spree_themes_on_store_id_and_default', unique: true, where: "((deleted_at IS NULL) AND (\"default\" = true))"
end
- end
- if !table_exists?(:spree_pages)
create_table :spree_pages do |t|
t.references :pageable, polymorphic: true, null: false
t.string :type, null: false
@@ -38,9 +36,7 @@ class CreatePageBuilderModels < ActiveRecord::Migration[6.1]
t.index ['pageable_id', 'pageable_type', 'type'], name: 'index_spree_pages_on_pageable_id_and_pageable_type_and_type'
t.index ['pageable_id', 'pageable_type'], name: 'index_spree_pages_on_pageable_id_and_pageable_type'
end
- end
- if !table_exists?(:spree_page_sections)
create_table :spree_page_sections do |t|
t.references :pageable, polymorphic: true, null: false, index: true
t.string :type, null: false
@@ -54,9 +50,7 @@ class CreatePageBuilderModels < ActiveRecord::Migration[6.1]
t.index ['pageable_id', 'pageable_type', 'position'], name: 'index_spree_page_sections_on_pageable_w_position'
end
- end
- if !table_exists?(:spree_page_blocks)
create_table :spree_page_blocks do |t|
t.references :section, null: false, index: true
t.string :name, null: false
@@ -70,9 +64,7 @@ class CreatePageBuilderModels < ActiveRecord::Migration[6.1]
t.index ['section_id', 'position'], name: 'index_spree_page_blocks_on_section_w_position'
end
- end
- if !table_exists?(:spree_page_links)
create_table :spree_page_links do |t|
t.references :parent, polymorphic: true, index: true
t.references :linkable, polymorphic: true, index: true
@@ -82,8 +74,6 @@ class CreatePageBuilderModels < ActiveRecord::Migration[6.1]
t.integer :position, default: 1, null: false
t.timestamps
-
- t.index ['parent_id'], name: 'index_spree_page_links_on_parent_id'
end
end
end
diff --git a/core/lib/generators/spree/dummy/templates/rails/database.yml b/core/lib/generators/spree/dummy/templates/rails/database.yml
index d2d172e942..6b492c55fb 100644
--- a/core/lib/generators/spree/dummy/templates/rails/database.yml
+++ b/core/lib/generators/spree/dummy/templates/rails/database.yml
@@ -57,6 +57,7 @@ postgres: &postgres
host: <%= db_host %>
<% end %>
min_messages: warning
+ pool: <%= ENV["DB_POOL"] || 50 %>
development:
<<: *postgres
diff --git a/core/lib/generators/spree/install/install_generator.rb b/core/lib/generators/spree/install/install_generator.rb
index 534526a6d1..80621ed63c 100644
--- a/core/lib/generators/spree/install/install_generator.rb
+++ b/core/lib/generators/spree/install/install_generator.rb
@@ -70,7 +70,7 @@ module Spree
def install_storefront
if @install_storefront && Spree::Core::Engine.frontend_available?
- generate 'spree:frontend:install'
+ generate 'spree:storefront:install'
end
end
@@ -82,7 +82,7 @@ module Spree
def copy_storefront
if @copy_storefront && Spree::Core::Engine.frontend_available?
- generate 'spree:frontend:copy_storefront'
+ generate 'spree:storefront:copy_storefront'
end
end
diff --git a/core/lib/spree/testing_support/common_rake.rb b/core/lib/spree/testing_support/common_rake.rb
index 72177ca940..c2b6a18686 100644
--- a/core/lib/spree/testing_support/common_rake.rb
+++ b/core/lib/spree/testing_support/common_rake.rb
@@ -14,16 +14,21 @@ namespace :common do
ENV['RAILS_ENV'] = 'test'
Rails.env = 'test'
- Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}"]
+ skip_javascript = ['spree/api', 'spree/core', 'spree/sample', 'spree/emails'].include?(ENV['LIB_NAME'])
+
+ Spree::DummyGenerator.start [
+ "--lib_name=#{ENV['LIB_NAME']}",
+ "--skip_javascript=#{skip_javascript}"
+ ]
# install frontend libraries
- unless ['spree/api', 'spree/core', 'spree/sample', 'spree/emails'].include?(ENV['LIB_NAME'])
+ unless skip_javascript
system('bin/rails importmap:install')
system('bin/rails turbo:install')
system('bin/rails stimulus:install')
end
- system('bin/rake acts_as_taggable_on_engine:install:migrations')
+ system('bin/rake acts_as_taggable_on_engine:install:migrations > /dev/null 2>&1')
Spree::InstallGenerator.start [
"--lib_name=#{ENV['LIB_NAME']}",
@@ -41,7 +46,7 @@ namespace :common do
system('bin/rails db:environment:set RAILS_ENV=test > /dev/null 2>&1')
system('bundle exec rake db:drop db:create > /dev/null 2>&1')
Spree::DummyModelGenerator.start
- system('bundle exec rake db:migrate')
+ system('bundle exec rake db:migrate > /dev/null 2>&1')
begin
require "generators/#{ENV['LIB_NAME']}/install/install_generator"
@@ -51,9 +56,7 @@ namespace :common do
puts 'Skipping installation no generator to run...'
end
- unless ['spree/api', 'spree/core', 'spree/sample'].include?(ENV['LIB_NAME'])
- system('bundle exec rake assets:precompile > /dev/null 2>&1')
- end
+ system('bundle exec rake assets:precompile > /dev/null 2>&1') if !skip_javascript || ENV['LIB_NAME'] == 'spree/emails'
end
task :seed do |_t|
diff --git a/core/spec/models/spree/order/finalizing_spec.rb b/core/spec/models/spree/order/finalizing_spec.rb
index f5800ef14c..1b42b8007a 100644
--- a/core/spec/models/spree/order/finalizing_spec.rb
+++ b/core/spec/models/spree/order/finalizing_spec.rb
@@ -1,9 +1,9 @@
require 'spec_helper'
describe Spree::Order, type: :model do
- let(:order) { create(:order) }
+ let(:order) { create(:order, store: store) }
- before { create(:store) }
+ before { Spree::Store.default }
context '#finalize!' do
let(:order) { Spree::Order.create(email: '[email protected]') }
diff --git a/core/spec/models/spree/page_spec.rb b/core/spec/models/spree/page_spec.rb
index 15772e3e88..ef5b250a35 100644
--- a/core/spec/models/spree/page_spec.rb
+++ b/core/spec/models/spree/page_spec.rb
@@ -1,8 +1,8 @@
require 'spec_helper'
describe Spree::Page, type: :model do
- let(:store) { create(:store) }
- let(:theme) { create(:theme, store: store) }
+ let(:store) { Spree::Store.default }
+ let(:theme) { store.default_theme }
let(:page) { theme.pages.first }
context 'slugs' do
diff --git a/core/spec/models/spree/reimbursement_spec.rb b/core/spec/models/spree/reimbursement_spec.rb
index c07c2f8595..462e2f896f 100644
--- a/core/spec/models/spree/reimbursement_spec.rb
+++ b/core/spec/models/spree/reimbursement_spec.rb
@@ -1,12 +1,14 @@
require 'spec_helper'
describe Spree::Reimbursement, type: :model do
+ let(:store) { Spree::Store.default }
+
describe '#display_total' do
subject { reimbursement.display_total }
let(:total) { 100.50 }
let(:currency) { 'USD' }
- let(:order) { build(:order) }
+ let(:order) { build(:order, store: store, currency: currency) }
let(:reimbursement) { described_class.new(total: total, order: order) }
it 'returns the value as a Spree::Money instance' do
@@ -23,7 +25,6 @@ describe Spree::Reimbursement, type: :model do
let(:total) { 100.50 }
let(:currency) { 'USD' }
- let(:store) { create(:store) }
let(:order) { build(:order, store: store, currency: currency) }
let(:reimbursement) { described_class.new(total: total, order: order) }
@@ -174,7 +175,7 @@ describe Spree::Reimbursement, type: :model do
describe '.build_from_customer_return' do
subject { Spree::Reimbursement.build_from_customer_return(customer_return) }
- let(:customer_return) { create(:customer_return, line_items_count: 5) }
+ let(:customer_return) { create(:customer_return, line_items_count: 5, store: store) }
let!(:pending_return_item) { customer_return.return_items.first.tap { |ri| ri.update!(acceptance_status: 'pending') } }
let!(:accepted_return_item) { customer_return.return_items.second.tap(&:accept!) }
@@ -184,15 +185,9 @@ describe Spree::Reimbursement, type: :model do
let!(:previous_reimbursement) { create(:reimbursement, order: customer_return.order, return_items: [already_reimbursed_return_item]) }
- it 'connects to the accepted return items' do
+ it 'connects data' do
expect(subject.return_items.to_a).to eq [accepted_return_item]
- end
-
- it 'connects to the order' do
expect(subject.order).to eq customer_return.order
- end
-
- it 'connects to the customer_return' do
expect(subject.customer_return).to eq customer_return
end
end
diff --git a/core/spec/models/spree/return_item/eligibility_validator/rma_required_spec.rb b/core/spec/models/spree/return_item/eligibility_validator/rma_required_spec.rb
index 74b81f021f..10332f0e7d 100644
--- a/core/spec/models/spree/return_item/eligibility_validator/rma_required_spec.rb
+++ b/core/spec/models/spree/return_item/eligibility_validator/rma_required_spec.rb
@@ -16,12 +16,8 @@ describe Spree::ReturnItem::EligibilityValidator::RMARequired, type: :model do
context 'there is no rma on the return item' do
before { allow(return_item).to receive(:return_authorization).and_return(nil) }
- it 'returns false' do
+ it 'returns false abd error' do
expect(subject).to be false
- end
-
- it 'sets an error' do
- subject
expect(validator.errors[:rma_required]).to eq Spree.t('return_item_rma_ineligible')
end
end
diff --git a/core/spec/models/spree/theme_spec.rb b/core/spec/models/spree/theme_spec.rb
index ee867cdb97..9237067501 100644
--- a/core/spec/models/spree/theme_spec.rb
+++ b/core/spec/models/spree/theme_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe Spree::Theme, type: :model do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:theme) { create(:theme, store: store) }
context 'Callbacks' do
diff --git a/core/spec/spec_helper.rb b/core/spec/spec_helper.rb
index 81cafcf768..d7d70ef8dc 100644
--- a/core/spec/spec_helper.rb
+++ b/core/spec/spec_helper.rb
@@ -62,7 +62,7 @@ RSpec.configure do |config|
# If you're not using ActiveRecord, or you'd prefer not to run each of your
# examples within a transaction, comment the following line or assign false
# instead of true.
- config.use_transactional_fixtures = false
+ config.use_transactional_fixtures = true
config.before(:suite) do
# Clean out the database state before the tests run
@@ -88,11 +88,6 @@ RSpec.configure do |config|
config.include Spree::TestingSupport::Preferences
config.include Spree::TestingSupport::Kernel
- config.before(:suite) do
- # Clean out the database state before the tests run
- DatabaseCleaner.clean_with(:truncation)
- end
-
config.order = :random
Kernel.srand config.seed
end
diff --git a/sample/spec/spec_helper.rb b/sample/spec/spec_helper.rb
index 93001e01fd..3b1d0a7f40 100644
--- a/sample/spec/spec_helper.rb
+++ b/sample/spec/spec_helper.rb
@@ -42,10 +42,6 @@ RSpec.configure do |config|
DatabaseCleaner.clean_with(:truncation)
end
- config.before(:suite) do
- DatabaseCleaner.start
- end
-
config.append_after do
DatabaseCleaner.clean
end
diff --git a/storefront/spec/spec_helper.rb b/storefront/spec/spec_helper.rb
index 7cff22cbde..cac6e11401 100644
--- a/storefront/spec/spec_helper.rb
+++ b/storefront/spec/spec_helper.rb
@@ -61,7 +61,7 @@ RSpec.configure do |config|
# If you're not using ActiveRecord, or you'd prefer not to run each of your
# examples within a transaction, comment the following line or assign false
# instead of true.
- config.use_transactional_fixtures = false
+ config.use_transactional_fixtures = true
config.before(:suite) do
Capybara.match = :smart
@@ -80,6 +80,7 @@ RSpec.configure do |config|
end
config.before(:each) do
+ Spree::Webhooks.disabled = true
begin
Rails.cache.clear
reset_spree_preferences
@@ -87,12 +88,6 @@ RSpec.configure do |config|
end
end
- config.around(:each) do |example|
- DatabaseCleaner.cleaning do
- example.run
- end
- end
-
config.include FactoryBot::Syntax::Methods
config.include Spree::Storefront::TestingSupport::CapybaraUtils