solidus_core 2.9.6 → 2.10.3
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of solidus_core might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/helpers/spree/base_helper.rb +4 -4
- data/app/helpers/spree/products_helper.rb +2 -1
- data/app/jobs/spree/promotion_code_batch_job.rb +2 -2
- data/app/models/concerns/spree/user_address_book.rb +2 -2
- data/app/models/concerns/spree/user_methods.rb +2 -2
- data/app/models/spree/address.rb +13 -17
- data/app/models/spree/adjustment.rb +20 -9
- data/app/models/spree/asset.rb +1 -1
- data/app/models/spree/base.rb +0 -2
- data/app/models/spree/calculator.rb +1 -1
- data/app/models/spree/calculator/price_sack.rb +1 -1
- data/app/models/spree/calculator/shipping/flexi_rate.rb +2 -2
- data/app/models/spree/calculator/tiered_flat_rate.rb +5 -5
- data/app/models/spree/calculator/tiered_percent.rb +6 -6
- data/app/models/spree/carton.rb +3 -3
- data/app/models/spree/classification.rb +2 -2
- data/app/models/spree/credit_card.rb +4 -4
- data/app/models/spree/customer_return.rb +1 -1
- data/app/models/spree/image/paperclip_attachment.rb +1 -1
- data/app/models/spree/inventory_unit.rb +5 -23
- data/app/models/spree/line_item.rb +4 -4
- data/app/models/spree/line_item_action.rb +2 -2
- data/app/models/spree/log_entry.rb +1 -1
- data/app/models/spree/option_value.rb +1 -1
- data/app/models/spree/option_values_variant.rb +2 -2
- data/app/models/spree/order.rb +11 -27
- data/app/models/spree/order/checkout.rb +1 -1
- data/app/models/spree/order/payments.rb +2 -2
- data/app/models/spree/order_cancellations.rb +1 -1
- data/app/models/spree/order_capturing.rb +2 -2
- data/app/models/spree/order_contents.rb +2 -2
- data/app/models/spree/order_mutex.rb +1 -1
- data/app/models/spree/order_promotion.rb +3 -3
- data/app/models/spree/order_shipping.rb +1 -1
- data/app/models/spree/order_taxation.rb +3 -3
- data/app/models/spree/payment.rb +8 -45
- data/app/models/spree/payment/processing.rb +3 -3
- data/app/models/spree/payment_capture_event.rb +1 -1
- data/app/models/spree/payment_method.rb +5 -2
- data/app/models/spree/payment_method/bogus_credit_card.rb +1 -1
- data/app/models/spree/payment_source.rb +1 -1
- data/app/models/spree/price.rb +2 -2
- data/app/models/spree/product.rb +5 -5
- data/app/models/spree/product/scopes.rb +218 -210
- data/app/models/spree/product_option_type.rb +2 -2
- data/app/models/spree/product_promotion_rule.rb +2 -2
- data/app/models/spree/product_property.rb +2 -2
- data/app/models/spree/promotion.rb +28 -13
- data/app/models/spree/promotion/actions/create_quantity_adjustments.rb +1 -1
- data/app/models/spree/promotion/actions/free_shipping.rb +1 -1
- data/app/models/spree/promotion/rules/option_value.rb +2 -2
- data/app/models/spree/promotion/rules/product.rb +3 -3
- data/app/models/spree/promotion_action.rb +2 -2
- data/app/models/spree/promotion_chooser.rb +2 -2
- data/app/models/spree/promotion_code.rb +11 -10
- data/app/models/spree/promotion_code/batch_builder.rb +3 -3
- data/app/models/spree/promotion_code_batch.rb +1 -1
- data/app/models/spree/promotion_rule.rb +2 -2
- data/app/models/spree/promotion_rule_role.rb +2 -2
- data/app/models/spree/promotion_rule_store.rb +2 -2
- data/app/models/spree/promotion_rule_taxon.rb +2 -2
- data/app/models/spree/promotion_rule_user.rb +2 -2
- data/app/models/spree/refund.rb +5 -5
- data/app/models/spree/reimbursement.rb +5 -13
- data/app/models/spree/reimbursement/credit.rb +2 -2
- data/app/models/spree/reimbursement/reimbursement_type_engine.rb +1 -1
- data/app/models/spree/reimbursement_tax_calculator.rb +1 -1
- data/app/models/spree/reimbursement_type/reimbursement_helpers.rb +2 -2
- data/app/models/spree/return_authorization.rb +4 -10
- data/app/models/spree/return_item.rb +13 -52
- data/app/models/spree/return_item/eligibility_validator/default.rb +1 -1
- data/app/models/spree/role_user.rb +2 -2
- data/app/models/spree/shipment.rb +7 -41
- data/app/models/spree/shipping_calculator.rb +0 -4
- data/app/models/spree/shipping_manifest.rb +3 -3
- data/app/models/spree/shipping_method.rb +2 -2
- data/app/models/spree/shipping_method_category.rb +2 -2
- data/app/models/spree/shipping_method_stock_location.rb +2 -2
- data/app/models/spree/shipping_method_zone.rb +2 -2
- data/app/models/spree/shipping_rate.rb +2 -2
- data/app/models/spree/shipping_rate_tax.rb +2 -2
- data/app/models/spree/state.rb +2 -2
- data/app/models/spree/state_change.rb +2 -2
- data/app/models/spree/stock/differentiator.rb +1 -1
- data/app/models/spree/stock/package.rb +1 -1
- data/app/models/spree/stock_item.rb +3 -3
- data/app/models/spree/stock_location.rb +2 -2
- data/app/models/spree/stock_movement.rb +2 -2
- data/app/models/spree/stock_quantities.rb +13 -12
- data/app/models/spree/store_credit.rb +8 -8
- data/app/models/spree/store_credit_event.rb +3 -3
- data/app/models/spree/store_payment_method.rb +2 -2
- data/app/models/spree/store_shipping_method.rb +2 -2
- data/app/models/spree/tax_calculator/default.rb +0 -4
- data/app/models/spree/tax_calculator/shipping_rate.rb +0 -3
- data/app/models/spree/tax_rate.rb +5 -1
- data/app/models/spree/tax_rate_tax_category.rb +2 -2
- data/app/models/spree/taxon/paperclip_attachment.rb +13 -0
- data/app/models/spree/unit_cancel.rb +5 -2
- data/app/models/spree/user_address.rb +2 -2
- data/app/models/spree/user_last_url_storer.rb +46 -0
- data/app/models/spree/user_last_url_storer/rules/authentication_rule.rb +36 -0
- data/app/models/spree/user_stock_location.rb +2 -2
- data/app/models/spree/variant.rb +10 -10
- data/app/models/spree/variant/scopes.rb +37 -29
- data/app/models/spree/variant_property_rule.rb +1 -1
- data/app/models/spree/variant_property_rule_condition.rb +2 -2
- data/app/models/spree/variant_property_rule_value.rb +2 -2
- data/app/models/spree/wallet/add_payment_sources_to_wallet.rb +1 -1
- data/app/models/spree/wallet_payment_source.rb +2 -2
- data/app/models/spree/zone.rb +1 -1
- data/app/models/spree/zone_member.rb +2 -2
- data/config/initializers/inflections.rb +5 -0
- data/config/initializers/money.rb +2 -0
- data/config/locales/en.yml +34 -3
- data/lib/generators/spree/dummy/dummy_generator.rb +2 -0
- data/lib/generators/spree/install/templates/config/initializers/spree.rb.tt +8 -0
- data/lib/spree/app_configuration.rb +18 -3
- data/lib/spree/core.rb +12 -0
- data/lib/spree/core/controller_helpers/auth.rb +1 -13
- data/lib/spree/core/engine.rb +2 -2
- data/lib/spree/core/importer/order.rb +28 -28
- data/lib/spree/core/importer/product.rb +2 -2
- data/lib/spree/core/product_filters.rb +15 -15
- data/lib/spree/core/role_configuration.rb +2 -2
- data/lib/spree/core/search/variant.rb +1 -1
- data/lib/spree/core/state_machines.rb +78 -0
- data/lib/spree/core/state_machines/inventory_unit.rb +42 -0
- data/lib/spree/core/state_machines/payment.rb +61 -0
- data/lib/spree/core/state_machines/reimbursement.rb +33 -0
- data/lib/spree/core/state_machines/return_authorization.rb +32 -0
- data/lib/spree/core/state_machines/return_item/acceptance_status.rb +51 -0
- data/lib/spree/core/state_machines/return_item/reception_status.rb +42 -0
- data/lib/spree/core/state_machines/shipment.rb +58 -0
- data/lib/spree/core/stock_configuration.rb +1 -0
- data/lib/spree/core/validators/email.rb +1 -8
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/money.rb +2 -2
- data/lib/spree/permission_sets/default_customer.rb +1 -1
- data/lib/spree/permission_sets/user_management.rb +3 -0
- data/lib/spree/permitted_attributes.rb +3 -3
- data/lib/spree/preferences/static_model_preferences.rb +2 -2
- data/lib/spree/testing_support/dummy_app.rb +4 -1
- data/lib/spree/testing_support/dummy_app/rake_tasks.rb +6 -2
- data/lib/spree/testing_support/factories/inventory_unit_factory.rb +8 -1
- data/lib/spree/testing_support/factories/promotion_factory.rb +7 -0
- data/lib/spree/testing_support/factories/stock_package_factory.rb +1 -1
- data/lib/spree/testing_support/factories/user_factory.rb +4 -1
- data/solidus_core.gemspec +6 -6
- data/spec/lib/search/base_spec.rb +5 -1
- data/spec/lib/search/variant_spec.rb +1 -1
- data/spec/lib/spree/core/stock_configuration_spec.rb +36 -0
- data/spec/lib/spree/core/validators/email_spec.rb +18 -18
- data/spec/lib/spree/event_spec.rb +15 -3
- data/spec/models/spree/ability_spec.rb +1 -1
- data/spec/models/spree/address_spec.rb +23 -0
- data/spec/models/spree/calculator/refunds/default_refund_amount_spec.rb +1 -1
- data/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb +1 -1
- data/spec/models/spree/calculator/shipping/flat_rate_spec.rb +1 -1
- data/spec/models/spree/calculator/shipping/flexi_rate_spec.rb +2 -2
- data/spec/models/spree/calculator/shipping/per_item_spec.rb +1 -1
- data/spec/models/spree/calculator/shipping/price_sack_spec.rb +24 -15
- data/spec/models/spree/carton_spec.rb +10 -2
- data/spec/models/spree/classification_spec.rb +21 -9
- data/spec/models/spree/concerns/user_address_book_spec.rb +4 -4
- data/spec/models/spree/concerns/user_methods_spec.rb +5 -4
- data/spec/models/spree/credit_card_spec.rb +2 -2
- data/spec/models/spree/customer_return_spec.rb +1 -1
- data/spec/models/spree/order/checkout_spec.rb +1 -1
- data/spec/models/spree/order/outstanding_balance_integration_spec.rb +5 -5
- data/spec/models/spree/order/payment_spec.rb +1 -1
- data/spec/models/spree/order_contents_spec.rb +1 -1
- data/spec/models/spree/order_inventory_spec.rb +3 -3
- data/spec/models/spree/order_merger_spec.rb +3 -3
- data/spec/models/spree/order_shipping_spec.rb +1 -1
- data/spec/models/spree/order_spec.rb +14 -21
- data/spec/models/spree/order_updater_spec.rb +4 -3
- data/spec/models/spree/payment_create_spec.rb +6 -16
- data/spec/models/spree/payment_spec.rb +12 -12
- data/spec/models/spree/permission_sets/user_management_spec.rb +2 -0
- data/spec/models/spree/preference_spec.rb +4 -4
- data/spec/models/spree/preferences/preferable_spec.rb +3 -3
- data/spec/models/spree/preferences/statically_configurable_spec.rb +2 -2
- data/spec/models/spree/promotion/rules/first_repeat_purchase_since_spec.rb +2 -2
- data/spec/models/spree/promotion/rules/nth_order_spec.rb +2 -2
- data/spec/models/spree/promotion_rule_spec.rb +6 -6
- data/spec/models/spree/promotion_spec.rb +71 -54
- data/spec/models/spree/reimbursement_type/original_payment_spec.rb +3 -3
- data/spec/models/spree/return_item/exchange_variant_eligibility/same_product_spec.rb +1 -1
- data/spec/models/spree/return_item_spec.rb +11 -11
- data/spec/models/spree/returns_calculator_spec.rb +2 -2
- data/spec/models/spree/shipment_spec.rb +6 -6
- data/spec/models/spree/shipping_calculator_spec.rb +1 -13
- data/spec/models/spree/shipping_method_spec.rb +32 -0
- data/spec/models/spree/stock/availability_validator_spec.rb +2 -2
- data/spec/models/spree/stock/differentiator_spec.rb +2 -2
- data/spec/models/spree/stock/estimator_spec.rb +3 -3
- data/spec/models/spree/stock/inventory_units_finalizer_spec.rb +4 -4
- data/spec/models/spree/stock/package_spec.rb +28 -28
- data/spec/models/spree/stock/quantifier_spec.rb +2 -2
- data/spec/models/spree/stock/simple_coordinator_spec.rb +11 -11
- data/spec/models/spree/stock/splitter/base_spec.rb +4 -4
- data/spec/models/spree/stock/splitter/shipping_category_spec.rb +7 -7
- data/spec/models/spree/stock_quantities_spec.rb +1 -1
- data/spec/models/spree/store_credit_spec.rb +8 -8
- data/spec/models/spree/tax_category_spec.rb +1 -1
- data/spec/models/spree/tax_rate_spec.rb +1 -0
- data/spec/models/spree/taxon_spec.rb +2 -2
- data/spec/models/spree/taxons/paperclip_attachment_spec.rb +29 -0
- data/spec/models/spree/unit_cancel_spec.rb +5 -0
- data/spec/models/spree/user_last_url_storer/rules/authentication_rule_spec.rb +31 -0
- data/spec/models/spree/user_last_url_storer_spec.rb +60 -0
- data/spec/models/spree/user_spec.rb +3 -3
- metadata +49 -43
- data/spec/migrate/20190106184413_remove_code_from_spree_promotions_spec.rb +0 -148
- data/spec/models/spree/order/updating_spec.rb +0 -18
@@ -0,0 +1,58 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Spree
|
4
|
+
module Core
|
5
|
+
class StateMachines
|
6
|
+
# Shipments' state machine
|
7
|
+
#
|
8
|
+
# for each event the following instance methods are dynamically implemented:
|
9
|
+
# #<event_name>
|
10
|
+
# #<event_name>!
|
11
|
+
# #can_<event_name>?
|
12
|
+
#
|
13
|
+
# for each state the following instance methods are implemented:
|
14
|
+
# #<state_name>?
|
15
|
+
#
|
16
|
+
module Shipment
|
17
|
+
extend ActiveSupport::Concern
|
18
|
+
|
19
|
+
included do
|
20
|
+
state_machine initial: :pending, use_transactions: false do
|
21
|
+
event :ready do
|
22
|
+
transition from: :pending, to: :shipped, if: :can_transition_from_pending_to_shipped?
|
23
|
+
transition from: :pending, to: :ready, if: :can_transition_from_pending_to_ready?
|
24
|
+
end
|
25
|
+
|
26
|
+
event :pend do
|
27
|
+
transition from: :ready, to: :pending
|
28
|
+
end
|
29
|
+
|
30
|
+
event :ship do
|
31
|
+
transition from: [:ready, :canceled], to: :shipped
|
32
|
+
end
|
33
|
+
after_transition to: :shipped, do: :after_ship
|
34
|
+
|
35
|
+
event :cancel do
|
36
|
+
transition to: :canceled, from: [:pending, :ready]
|
37
|
+
end
|
38
|
+
after_transition to: :canceled, do: :after_cancel
|
39
|
+
|
40
|
+
event :resume do
|
41
|
+
transition from: :canceled, to: :ready, if: :can_transition_from_canceled_to_ready?
|
42
|
+
transition from: :canceled, to: :pending
|
43
|
+
end
|
44
|
+
after_transition from: :canceled, to: [:pending, :ready, :shipped], do: :after_resume
|
45
|
+
|
46
|
+
after_transition do |shipment, transition|
|
47
|
+
shipment.state_changes.create!(
|
48
|
+
previous_state: transition.from,
|
49
|
+
next_state: transition.to,
|
50
|
+
name: 'shipment'
|
51
|
+
)
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
@@ -15,16 +15,9 @@ module Spree
|
|
15
15
|
EMAIL_REGEXP = /\A([^@\.]|[^@\.]([^@\s]*)[^@\.])@([^@\s]+\.)+[^@\s]+\z/
|
16
16
|
|
17
17
|
def validate_each(record, attribute, value)
|
18
|
-
unless value
|
18
|
+
unless EMAIL_REGEXP.match? value
|
19
19
|
record.errors.add(attribute, :invalid, { value: value }.merge!(options))
|
20
20
|
end
|
21
21
|
end
|
22
22
|
end
|
23
23
|
end
|
24
|
-
|
25
|
-
# @private
|
26
|
-
EmailValidator = ActiveSupport::Deprecation::DeprecatedConstantProxy.new(
|
27
|
-
'EmailValidator',
|
28
|
-
'Spree::EmailValidator',
|
29
|
-
message: "EmailValidator is deprecated! Use Spree::EmailValidator instead.\nChange `validates :email, email: true` to `validates :email, 'spree/email' => true`\n"
|
30
|
-
)
|
data/lib/spree/core/version.rb
CHANGED
data/lib/spree/money.rb
CHANGED
@@ -82,9 +82,9 @@ module Spree
|
|
82
82
|
# Maintain compatibility by checking html option renamed to html_wrap.
|
83
83
|
if options[:html] || options[:html] == false
|
84
84
|
Spree::Deprecation.warn <<-WARN.squish, caller
|
85
|
-
Spree::Money#to_html called with Spree::Money#to_html(html: #{options[:html]}),
|
85
|
+
Spree::Money#to_html called with Spree::Money#to_html(html: #{options[:html].inspect}),
|
86
86
|
which will not be supported in the future.
|
87
|
-
Instead use :html_wrap e.g. Spree::Money#to_html(html_wrap: #{options[:html]})
|
87
|
+
Instead use :html_wrap e.g. Spree::Money#to_html(html_wrap: #{options[:html].inspect})
|
88
88
|
WARN
|
89
89
|
end
|
90
90
|
if options[:html_wrap] || options[:html]
|
@@ -8,7 +8,7 @@ module Spree
|
|
8
8
|
can :display, OptionType
|
9
9
|
can :display, OptionValue
|
10
10
|
can :create, Order
|
11
|
-
can [:read, :update], Order do |order, token|
|
11
|
+
can [:read, :update], Order, Order.where(user: user) do |order, token|
|
12
12
|
order.user == user || (order.guest_token.present? && token == order.guest_token)
|
13
13
|
end
|
14
14
|
cannot :update, Order do |order|
|
@@ -11,6 +11,9 @@ module Spree
|
|
11
11
|
can :update_email, Spree.user_class do |user|
|
12
12
|
user.spree_roles.none?
|
13
13
|
end
|
14
|
+
can :update_password, Spree.user_class do |user|
|
15
|
+
user.spree_roles.none?
|
16
|
+
end
|
14
17
|
|
15
18
|
cannot [:delete, :destroy], Spree.user_class
|
16
19
|
can :manage, Spree::StoreCredit
|
@@ -116,10 +116,10 @@ module Spree
|
|
116
116
|
:meta_description, :meta_keywords, :meta_title, :child_index
|
117
117
|
]
|
118
118
|
|
119
|
-
#
|
119
|
+
# Intentionally leaving off email here to prevent privilege escalation
|
120
120
|
# by changing a user with higher priveleges' email to one a lower-priveleged
|
121
|
-
# admin owns.
|
122
|
-
# controller level
|
121
|
+
# admin owns. Creating a user with an email is handled separate at the
|
122
|
+
# controller level.
|
123
123
|
@@user_attributes = [:password, :password_confirmation]
|
124
124
|
|
125
125
|
@@variant_attributes = [
|
@@ -13,6 +13,7 @@ Rails.env = 'test'
|
|
13
13
|
require 'solidus_core'
|
14
14
|
|
15
15
|
RAILS_52_OR_ABOVE = Gem::Version.new(Rails.version) >= Gem::Version.new('5.2')
|
16
|
+
RAILS_6_OR_ABOVE = Gem::Version.new(Rails.version) >= Gem::Version.new('6.0')
|
16
17
|
|
17
18
|
# @private
|
18
19
|
class ApplicationController < ActionController::Base
|
@@ -64,7 +65,9 @@ module DummyApp
|
|
64
65
|
|
65
66
|
if RAILS_52_OR_ABOVE
|
66
67
|
config.action_controller.default_protect_from_forgery = true
|
67
|
-
|
68
|
+
unless RAILS_6_OR_ABOVE
|
69
|
+
config.active_record.sqlite3.represent_boolean_as_integer = true
|
70
|
+
end
|
68
71
|
end
|
69
72
|
|
70
73
|
# Avoid issues if an old spec/dummy still exists
|
@@ -38,8 +38,12 @@ namespace :db do
|
|
38
38
|
# railties:install:migrations and then db:migrate.
|
39
39
|
# Migrations should be run one directory at a time
|
40
40
|
ActiveRecord::Migrator.migrations_paths.each do |path|
|
41
|
-
if
|
42
|
-
|
41
|
+
if Rails.gem_version >= Gem::Version.new('6.0.0')
|
42
|
+
ActiveRecord::MigrationContext.new(
|
43
|
+
[path],
|
44
|
+
ActiveRecord::SchemaMigration
|
45
|
+
).migrate
|
46
|
+
elsif Rails.gem_version >= Gem::Version.new('5.2.0')
|
43
47
|
ActiveRecord::MigrationContext.new([path]).migrate
|
44
48
|
else
|
45
49
|
ActiveRecord::Migrator.migrate(path)
|
@@ -9,6 +9,7 @@ FactoryBot.define do
|
|
9
9
|
factory :inventory_unit, class: 'Spree::InventoryUnit' do
|
10
10
|
transient do
|
11
11
|
order { nil }
|
12
|
+
stock_location { nil }
|
12
13
|
end
|
13
14
|
|
14
15
|
variant
|
@@ -20,7 +21,13 @@ FactoryBot.define do
|
|
20
21
|
end
|
21
22
|
end
|
22
23
|
state { 'on_hand' }
|
23
|
-
shipment
|
24
|
+
shipment do
|
25
|
+
if stock_location
|
26
|
+
build(:shipment, state: 'pending', order: line_item.order, stock_location: stock_location)
|
27
|
+
else
|
28
|
+
build(:shipment, state: 'pending', order: line_item.order)
|
29
|
+
end
|
30
|
+
end
|
24
31
|
# return_authorization
|
25
32
|
end
|
26
33
|
end
|
@@ -27,8 +27,15 @@ FactoryBot.define do
|
|
27
27
|
Spree::Promotion::Actions::CreateItemAdjustments.create!(calculator: calculator, promotion: promotion)
|
28
28
|
end
|
29
29
|
end
|
30
|
+
|
30
31
|
factory :promotion_with_item_adjustment, traits: [:with_line_item_adjustment]
|
31
32
|
|
33
|
+
trait :with_free_shipping do
|
34
|
+
after(:create) do |promotion|
|
35
|
+
Spree::Promotion::Actions::FreeShipping.create!(promotion: promotion)
|
36
|
+
end
|
37
|
+
end
|
38
|
+
|
32
39
|
trait :with_order_adjustment do
|
33
40
|
transient do
|
34
41
|
weighted_order_adjustment_amount { 10 }
|
@@ -17,7 +17,7 @@ FactoryBot.define do
|
|
17
17
|
|
18
18
|
after(:build) do |package, evaluator|
|
19
19
|
evaluator.variants_contents.each do |variant, count|
|
20
|
-
package.add_multiple build_list(:inventory_unit, count, variant: variant)
|
20
|
+
package.add_multiple build_list(:inventory_unit, count, variant: variant, stock_location: evaluator.stock_location)
|
21
21
|
end
|
22
22
|
end
|
23
23
|
|
@@ -17,7 +17,10 @@ FactoryBot.define do
|
|
17
17
|
end
|
18
18
|
|
19
19
|
factory :admin_user do
|
20
|
-
|
20
|
+
after(:create) do |user, _|
|
21
|
+
admin_role = Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')
|
22
|
+
user.spree_roles << admin_role
|
23
|
+
end
|
21
24
|
end
|
22
25
|
|
23
26
|
factory :user_with_addresses do |_u|
|
data/solidus_core.gemspec
CHANGED
@@ -17,27 +17,27 @@ Gem::Specification.new do |s|
|
|
17
17
|
s.files = `git ls-files`.split("\n")
|
18
18
|
s.require_path = 'lib'
|
19
19
|
|
20
|
-
s.required_ruby_version
|
20
|
+
s.required_ruby_version = '>= 2.4.0'
|
21
21
|
s.required_rubygems_version = '>= 1.8.23'
|
22
22
|
|
23
23
|
%w[
|
24
24
|
actionmailer actionpack actionview activejob activemodel activerecord
|
25
25
|
activesupport railties
|
26
26
|
].each do |rails_dep|
|
27
|
-
s.add_dependency rails_dep, ['>= 5.1', '<
|
27
|
+
s.add_dependency rails_dep, ['>= 5.1', '< 6.1.x']
|
28
28
|
end
|
29
29
|
|
30
30
|
s.add_dependency 'activemerchant', '~> 1.66'
|
31
31
|
s.add_dependency 'acts_as_list', '~> 0.3'
|
32
|
-
s.add_dependency 'awesome_nested_set', '~> 3.
|
33
|
-
s.add_dependency 'cancancan', '
|
32
|
+
s.add_dependency 'awesome_nested_set', '~> 3.2'
|
33
|
+
s.add_dependency 'cancancan', ['>= 2.2', '< 4.0']
|
34
34
|
s.add_dependency 'carmen', '~> 1.1.0'
|
35
35
|
s.add_dependency 'discard', '~> 1.0'
|
36
36
|
s.add_dependency 'friendly_id', '~> 5.0'
|
37
37
|
s.add_dependency 'kaminari-activerecord', '~> 1.1'
|
38
38
|
s.add_dependency 'monetize', '~> 1.8'
|
39
|
-
s.add_dependency 'paperclip',
|
39
|
+
s.add_dependency 'paperclip', '>= 4.2'
|
40
40
|
s.add_dependency 'paranoia', '~> 2.4'
|
41
41
|
s.add_dependency 'ransack', '~> 2.0'
|
42
|
-
s.add_dependency 'state_machines-activerecord', '~> 0.
|
42
|
+
s.add_dependency 'state_machines-activerecord', '~> 0.6'
|
43
43
|
end
|
@@ -60,7 +60,11 @@ RSpec.describe Spree::Core::Search::Base do
|
|
60
60
|
search: { "price_range_any" => ["Under $10.00", "$10.00 - $15.00"] } }
|
61
61
|
searcher = Spree::Core::Search::Base.new(params)
|
62
62
|
expect(searcher.send(:get_base_scope).to_sql).to match /<= 10/
|
63
|
-
|
63
|
+
if Rails.gem_version >= Gem::Version.new('6.0.0')
|
64
|
+
expect(searcher.send(:get_base_scope).to_sql).to match /between 10\.0 and 15\.0/i
|
65
|
+
else
|
66
|
+
expect(searcher.send(:get_base_scope).to_sql).to match /between 10 and 15/i
|
67
|
+
end
|
64
68
|
expect(searcher.retrieve_products.count).to eq(2)
|
65
69
|
end
|
66
70
|
|
@@ -39,6 +39,24 @@ RSpec.describe Spree::Core::StockConfiguration do
|
|
39
39
|
end
|
40
40
|
end
|
41
41
|
|
42
|
+
describe '#location_filter_class' do
|
43
|
+
let(:stock_configuration) { described_class.new }
|
44
|
+
subject { stock_configuration.location_filter_class }
|
45
|
+
|
46
|
+
it "returns Spree::Stock::LocationFilter::Active" do
|
47
|
+
is_expected.to be ::Spree::Stock::LocationFilter::Active
|
48
|
+
end
|
49
|
+
|
50
|
+
context "with another constant name assiged" do
|
51
|
+
MyFilter = Class.new
|
52
|
+
before { stock_configuration.location_filter_class = MyFilter.to_s }
|
53
|
+
|
54
|
+
it "returns the constant" do
|
55
|
+
is_expected.to be MyFilter
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
59
|
+
|
42
60
|
describe '#location_sorter_class' do
|
43
61
|
let(:stock_configuration) { described_class.new }
|
44
62
|
subject { stock_configuration.location_sorter_class }
|
@@ -56,4 +74,22 @@ RSpec.describe Spree::Core::StockConfiguration do
|
|
56
74
|
end
|
57
75
|
end
|
58
76
|
end
|
77
|
+
|
78
|
+
describe '#allocator_class' do
|
79
|
+
let(:stock_configuration) { described_class.new }
|
80
|
+
subject { stock_configuration.allocator_class }
|
81
|
+
|
82
|
+
it "returns Spree::Stock::Allocator::OnHandFirst" do
|
83
|
+
is_expected.to be ::Spree::Stock::Allocator::OnHandFirst
|
84
|
+
end
|
85
|
+
|
86
|
+
context "with another constant name assiged" do
|
87
|
+
MyAllocator = Class.new
|
88
|
+
before { stock_configuration.allocator_class = MyAllocator.to_s }
|
89
|
+
|
90
|
+
it "returns the constant" do
|
91
|
+
is_expected.to be MyAllocator
|
92
|
+
end
|
93
|
+
end
|
94
|
+
end
|
59
95
|
end
|
@@ -12,27 +12,27 @@ RSpec.describe Spree::EmailValidator do
|
|
12
12
|
|
13
13
|
let(:valid_emails) {
|
14
14
|
[
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
15
|
+
'valid@email.com',
|
16
|
+
'valid@email.com.uk',
|
17
|
+
'e@email.com',
|
18
|
+
'valid+email@email.com',
|
19
|
+
'valid-email@email.com',
|
20
|
+
'valid_email@email.com',
|
21
|
+
'valid.email@email.com'
|
22
|
+
]
|
23
23
|
}
|
24
24
|
let(:invalid_emails) {
|
25
25
|
[
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
26
|
+
'invalid email@email.com',
|
27
|
+
'.invalid.email@email.com',
|
28
|
+
'invalid.email.@email.com',
|
29
|
+
'@email.com',
|
30
|
+
'.@email.com',
|
31
|
+
'invalidemailemail.com',
|
32
|
+
'@invalid.email@email.com',
|
33
|
+
'invalid@email@email.com',
|
34
|
+
'invalid.email@@email.com'
|
35
|
+
]
|
36
36
|
}
|
37
37
|
|
38
38
|
it 'validates valid email addresses' do
|
@@ -18,14 +18,26 @@ RSpec.describe Spree::Event do
|
|
18
18
|
before do
|
19
19
|
# ActiveSupport::Notifications does not provide an interface to clean all
|
20
20
|
# subscribers at once, so some low level brittle code is required
|
21
|
-
|
21
|
+
if Rails.gem_version >= Gem::Version.new('6.0.0')
|
22
|
+
@old_string_subscribers = notifier.instance_variable_get('@string_subscribers').dup
|
23
|
+
@old_other_subscribers = notifier.instance_variable_get('@other_subscribers').dup
|
24
|
+
notifier.instance_variable_get('@string_subscribers').clear
|
25
|
+
notifier.instance_variable_get('@other_subscribers').clear
|
26
|
+
else
|
27
|
+
@old_subscribers = notifier.instance_variable_get('@subscribers').dup
|
28
|
+
notifier.instance_variable_get('@subscribers').clear
|
29
|
+
end
|
22
30
|
@old_listeners = notifier.instance_variable_get('@listeners_for').dup
|
23
|
-
notifier.instance_variable_get('@subscribers').clear
|
24
31
|
notifier.instance_variable_get('@listeners_for').clear
|
25
32
|
end
|
26
33
|
|
27
34
|
after do
|
28
|
-
|
35
|
+
if Rails.gem_version >= Gem::Version.new('6.0.0')
|
36
|
+
notifier.instance_variable_set '@string_subscribers', @old_string_subscribers
|
37
|
+
notifier.instance_variable_set '@other_subscribers', @old_other_subscribers
|
38
|
+
else
|
39
|
+
notifier.instance_variable_set '@subscribers', @old_subscribers
|
40
|
+
end
|
29
41
|
notifier.instance_variable_set '@listeners_for', @old_listeners
|
30
42
|
end
|
31
43
|
|
@@ -59,7 +59,7 @@ RSpec.describe Spree::Ability, type: :model do
|
|
59
59
|
let(:resource) { Object.new }
|
60
60
|
|
61
61
|
context 'with admin user' do
|
62
|
-
let(:user) {
|
62
|
+
let(:user) { create :admin_user }
|
63
63
|
it_should_behave_like 'access granted'
|
64
64
|
it_should_behave_like 'index allowed'
|
65
65
|
end
|