solidus_core 2.11.3 → 2.11.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of solidus_core might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/models/spree/base.rb +1 -2
- data/app/models/spree/calculator.rb +4 -4
- data/app/models/spree/calculator/free_shipping.rb +1 -0
- data/app/models/spree/calculator/percent_per_item.rb +2 -0
- data/app/models/spree/calculator/price_sack.rb +1 -0
- data/app/models/spree/order/payments.rb +2 -2
- data/app/models/spree/payment/cancellation.rb +3 -22
- data/app/models/spree/payment_source.rb +2 -2
- data/app/models/spree/product/scopes.rb +0 -1
- data/lib/generators/spree/dummy/templates/rails/test.rb +1 -1
- data/lib/spree/app_configuration.rb +1 -1
- data/lib/spree/core.rb +1 -0
- data/lib/spree/core/engine.rb +1 -1
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/permitted_attributes.rb +5 -5
- data/lib/spree/testing_support.rb +40 -0
- data/lib/spree/testing_support/factories.rb +2 -4
- data/lib/spree/testing_support/factories/address_factory.rb +2 -2
- data/lib/spree/testing_support/factories/adjustment_factory.rb +2 -5
- data/lib/spree/testing_support/factories/adjustment_reason_factory.rb +3 -0
- data/lib/spree/testing_support/factories/calculator_factory.rb +3 -0
- data/lib/spree/testing_support/factories/carton_factory.rb +2 -2
- data/lib/spree/testing_support/factories/country_factory.rb +3 -0
- data/lib/spree/testing_support/factories/credit_card_factory.rb +3 -0
- data/lib/spree/testing_support/factories/customer_return_factory.rb +2 -3
- data/lib/spree/testing_support/factories/image_factory.rb +3 -0
- data/lib/spree/testing_support/factories/inventory_unit_factory.rb +2 -4
- data/lib/spree/testing_support/factories/line_item_factory.rb +2 -2
- data/lib/spree/testing_support/factories/option_type_factory.rb +3 -0
- data/lib/spree/testing_support/factories/option_value_factory.rb +3 -0
- data/lib/spree/testing_support/factories/order_factory.rb +2 -6
- data/lib/spree/testing_support/factories/order_promotion_factory.rb +2 -2
- data/lib/spree/testing_support/factories/payment_factory.rb +2 -4
- data/lib/spree/testing_support/factories/payment_method_factory.rb +3 -0
- data/lib/spree/testing_support/factories/price_factory.rb +2 -1
- data/lib/spree/testing_support/factories/product_factory.rb +2 -5
- data/lib/spree/testing_support/factories/product_option_type_factory.rb +2 -2
- data/lib/spree/testing_support/factories/product_property_factory.rb +2 -2
- data/lib/spree/testing_support/factories/promotion_category_factory.rb +3 -0
- data/lib/spree/testing_support/factories/promotion_code_factory.rb +2 -2
- data/lib/spree/testing_support/factories/promotion_factory.rb +2 -2
- data/lib/spree/testing_support/factories/property_factory.rb +3 -0
- data/lib/spree/testing_support/factories/refund_factory.rb +2 -2
- data/lib/spree/testing_support/factories/refund_reason_factory.rb +3 -0
- data/lib/spree/testing_support/factories/reimbursement_factory.rb +2 -1
- data/lib/spree/testing_support/factories/reimbursement_type_factory.rb +3 -0
- data/lib/spree/testing_support/factories/return_authorization_factory.rb +2 -3
- data/lib/spree/testing_support/factories/return_item_factory.rb +2 -3
- data/lib/spree/testing_support/factories/return_reason_factory.rb +3 -0
- data/lib/spree/testing_support/factories/role_factory.rb +3 -0
- data/lib/spree/testing_support/factories/shipment_factory.rb +2 -3
- data/lib/spree/testing_support/factories/shipping_category_factory.rb +3 -0
- data/lib/spree/testing_support/factories/shipping_method_factory.rb +2 -3
- data/lib/spree/testing_support/factories/shipping_rate_factory.rb +2 -2
- data/lib/spree/testing_support/factories/state_factory.rb +2 -1
- data/lib/spree/testing_support/factories/stock_item_factory.rb +2 -2
- data/lib/spree/testing_support/factories/stock_location_factory.rb +2 -3
- data/lib/spree/testing_support/factories/stock_movement_factory.rb +2 -1
- data/lib/spree/testing_support/factories/stock_package_factory.rb +2 -2
- data/lib/spree/testing_support/factories/store_credit_category_factory.rb +3 -0
- data/lib/spree/testing_support/factories/store_credit_event_factory.rb +2 -2
- data/lib/spree/testing_support/factories/store_credit_factory.rb +2 -3
- data/lib/spree/testing_support/factories/store_credit_reason_factory.rb +3 -0
- data/lib/spree/testing_support/factories/store_credit_type_factory.rb +3 -0
- data/lib/spree/testing_support/factories/store_factory.rb +4 -1
- data/lib/spree/testing_support/factories/tax_category_factory.rb +2 -1
- data/lib/spree/testing_support/factories/tax_rate_factory.rb +2 -3
- data/lib/spree/testing_support/factories/taxon_factory.rb +2 -1
- data/lib/spree/testing_support/factories/taxonomy_factory.rb +3 -0
- data/lib/spree/testing_support/factories/user_factory.rb +2 -3
- data/lib/spree/testing_support/factories/variant_factory.rb +2 -4
- data/lib/spree/testing_support/factories/variant_property_rule_condition_factory.rb +2 -2
- data/lib/spree/testing_support/factories/variant_property_rule_factory.rb +2 -3
- data/lib/spree/testing_support/factories/variant_property_rule_value_factory.rb +2 -2
- data/lib/spree/testing_support/factories/zone_factory.rb +2 -2
- data/lib/spree/testing_support/order_walkthrough.rb +1 -1
- data/{app/models → lib}/spree/user_class_handle.rb +0 -0
- data/lib/tasks/email.rake +3 -2
- data/solidus_core.gemspec +1 -1
- metadata +20 -19
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7c2f2034c2f239923f522b08eeb9e6da4925058e86026d70d69cccf42ea975b9
|
4
|
+
data.tar.gz: c0f56fb7091eace3ef9a91a34846035a2f0bdffd248ad5ca9ae204a7d8faae68
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a2e41a38b785af3e8da52ac03b86c9b1179cd2a92ec59a32c77ae6d54398115c99679ad8024b6f2988d95ddf515a9df2e0b118a687a239c2afb0920c17493b5f
|
7
|
+
data.tar.gz: d023f2e92ee65585e76103d5a8921f3525965480984fc9f0f48e7f69c76d5671d98bdc4d388112ee52c8b3f1f68a1ae51a215be903ef66ee1d5958c1a2c64009
|
data/app/models/spree/base.rb
CHANGED
@@ -3,8 +3,6 @@
|
|
3
3
|
class Spree::Base < ActiveRecord::Base
|
4
4
|
include Spree::Preferences::Preferable
|
5
5
|
include Spree::Core::Permalinks
|
6
|
-
serialize :preferences, Hash
|
7
|
-
|
8
6
|
include Spree::RansackableAttributes
|
9
7
|
|
10
8
|
def initialize_preference_defaults
|
@@ -18,6 +16,7 @@ class Spree::Base < ActiveRecord::Base
|
|
18
16
|
def self.preference(*args)
|
19
17
|
# after_initialize can be called multiple times with the same symbol, it
|
20
18
|
# will only be called once on initialization.
|
19
|
+
serialize :preferences, Hash
|
21
20
|
after_initialize :initialize_preference_defaults
|
22
21
|
super
|
23
22
|
end
|
@@ -10,12 +10,12 @@ module Spree
|
|
10
10
|
def compute(computable)
|
11
11
|
# Spree::LineItem -> :compute_line_item
|
12
12
|
computable_name = computable.class.name.demodulize.underscore
|
13
|
-
|
13
|
+
method_name = "compute_#{computable_name}".to_sym
|
14
14
|
calculator_class = self.class
|
15
|
-
if respond_to?(
|
16
|
-
send(
|
15
|
+
if respond_to?(method_name)
|
16
|
+
send(method_name, computable)
|
17
17
|
else
|
18
|
-
raise NotImplementedError, "Please implement '#{
|
18
|
+
raise NotImplementedError, "Please implement '#{method_name}(#{computable_name})' in your calculator: #{calculator_class.name}"
|
19
19
|
end
|
20
20
|
end
|
21
21
|
|
@@ -8,6 +8,7 @@ module Spree
|
|
8
8
|
# now a Promotion Action which deals with these types of promotions instead.
|
9
9
|
class Calculator::FreeShipping < Calculator
|
10
10
|
def compute(object)
|
11
|
+
Spree::Deprecation.warn('This method is deprecated, because it is no longer used')
|
11
12
|
if object.is_a?(Array)
|
12
13
|
return if object.empty?
|
13
14
|
order = object.first.order
|
@@ -15,6 +15,8 @@ module Spree
|
|
15
15
|
preference :percent, :decimal, default: 0
|
16
16
|
|
17
17
|
def compute(object = nil)
|
18
|
+
Spree::Deprecation.warn('This method is deprecated, please use adjustments at line item level')
|
19
|
+
|
18
20
|
return 0 if object.nil?
|
19
21
|
object.line_items.sum { |line_item|
|
20
22
|
value_for_line_item(line_item)
|
@@ -11,6 +11,7 @@ module Spree
|
|
11
11
|
|
12
12
|
# as object we always get line items, as calculable we have Coupon, ShippingMethod
|
13
13
|
def compute(object)
|
14
|
+
Spree::Deprecation.warn('This method is deprecated, please use adjustments at line item level')
|
14
15
|
if object.is_a?(Array)
|
15
16
|
base = object.sum { |element| element.respond_to?(:amount) ? element.amount : BigDecimal(element.to_s) }
|
16
17
|
else
|
@@ -37,14 +37,14 @@ module Spree
|
|
37
37
|
|
38
38
|
private
|
39
39
|
|
40
|
-
def process_payments_with(
|
40
|
+
def process_payments_with(method_name)
|
41
41
|
# Don't run if there is nothing to pay.
|
42
42
|
return true if payment_total >= total
|
43
43
|
|
44
44
|
unprocessed_payments.each do |payment|
|
45
45
|
break if payment_total >= total
|
46
46
|
|
47
|
-
payment.public_send(
|
47
|
+
payment.public_send(method_name)
|
48
48
|
end
|
49
49
|
rescue Core::GatewayError => error
|
50
50
|
result = !!Spree::Config[:allow_checkout_on_gateway_error]
|
@@ -26,16 +26,10 @@ module Spree
|
|
26
26
|
# @param payment [Spree::Payment] - the payment that should be canceled
|
27
27
|
#
|
28
28
|
def cancel(payment)
|
29
|
-
|
30
|
-
|
31
|
-
if response = payment.payment_method.try_void(payment)
|
32
|
-
payment.handle_void_response(response)
|
33
|
-
else
|
34
|
-
payment.refunds.create!(amount: payment.credit_allowed, reason: refund_reason, perform_after_create: false).perform!
|
35
|
-
end
|
29
|
+
if response = payment.payment_method.try_void(payment)
|
30
|
+
payment.handle_void_response(response)
|
36
31
|
else
|
37
|
-
|
38
|
-
deprecated_behavior(payment)
|
32
|
+
payment.refunds.create!(amount: payment.credit_allowed, reason: refund_reason, perform_after_create: false).perform!
|
39
33
|
end
|
40
34
|
end
|
41
35
|
|
@@ -44,19 +38,6 @@ module Spree
|
|
44
38
|
def refund_reason
|
45
39
|
Spree::RefundReason.where(name: reason).first_or_create
|
46
40
|
end
|
47
|
-
|
48
|
-
def try_void_available?(payment_method)
|
49
|
-
payment_method.respond_to?(:try_void) &&
|
50
|
-
payment_method.method(:try_void).owner != Spree::PaymentMethod
|
51
|
-
end
|
52
|
-
|
53
|
-
def deprecated_behavior(payment)
|
54
|
-
Spree::Deprecation.warn "#{payment.payment_method.class.name}#cancel is deprecated and will be removed. " \
|
55
|
-
'Please implement a `try_void` method instead that returns a response object if void succeeds ' \
|
56
|
-
'or `false|nil` if not. Solidus will refund the payment then.'
|
57
|
-
response = payment.payment_method.cancel(payment.response_code)
|
58
|
-
payment.handle_void_response(response)
|
59
|
-
end
|
60
41
|
end
|
61
42
|
end
|
62
43
|
end
|
@@ -23,9 +23,9 @@ module Spree
|
|
23
23
|
end
|
24
24
|
|
25
25
|
# @param payment [Spree::Payment] the payment we want to know if can be voided
|
26
|
-
# @return [Boolean] true when the payment is not failed or
|
26
|
+
# @return [Boolean] true when the payment is not failed, voided or invalid
|
27
27
|
def can_void?(payment)
|
28
|
-
|
28
|
+
payment.can_void?
|
29
29
|
end
|
30
30
|
|
31
31
|
# Indicates whether its possible to credit the payment. Note that most
|
@@ -70,7 +70,6 @@ module Spree
|
|
70
70
|
add_search_scope :in_taxon do |taxon|
|
71
71
|
includes(:classifications)
|
72
72
|
.where('spree_products_taxons.taxon_id' => taxon.self_and_descendants.pluck(:id))
|
73
|
-
.select(Spree::Classification.arel_table[:position])
|
74
73
|
.order(Spree::Classification.arel_table[:position].asc)
|
75
74
|
end
|
76
75
|
|
@@ -24,7 +24,7 @@ Dummy::Application.configure do
|
|
24
24
|
# The :test delivery method accumulates sent emails in the
|
25
25
|
# ActionMailer::Base.deliveries array.
|
26
26
|
config.action_mailer.delivery_method = :test
|
27
|
-
ActionMailer::Base.default from: "
|
27
|
+
ActionMailer::Base.default from: "solidus@example.com"
|
28
28
|
|
29
29
|
# Raise on deprecation warnings
|
30
30
|
if ENV['SOLIDUS_RAISE_DEPRECATIONS'].present?
|
@@ -190,7 +190,7 @@ module Spree
|
|
190
190
|
|
191
191
|
# @!attribute [rw] mails_from
|
192
192
|
# @return [String] Email address used as +From:+ field in transactional emails.
|
193
|
-
preference :mails_from, :string, default: '
|
193
|
+
preference :mails_from, :string, default: 'solidus@example.com'
|
194
194
|
|
195
195
|
# @!attribute [rw] max_level_in_taxons_menu
|
196
196
|
# @return [Integer] maximum nesting level in taxons menu (default: +1+)
|
data/lib/spree/core.rb
CHANGED
@@ -90,6 +90,7 @@ require 'spree/core/state_machines'
|
|
90
90
|
require 'spree/core/stock_configuration'
|
91
91
|
require 'spree/core/validators/email'
|
92
92
|
require 'spree/permission_sets'
|
93
|
+
require 'spree/user_class_handle'
|
93
94
|
|
94
95
|
require 'spree/preferences/store'
|
95
96
|
require 'spree/preferences/static_model_preferences'
|
data/lib/spree/core/engine.rb
CHANGED
@@ -86,7 +86,7 @@ module Spree
|
|
86
86
|
Spree::Config.use_legacy_address_state_validator set to true has been
|
87
87
|
deprecated and will be removed in Solidus 3.0. The Spree::Address state
|
88
88
|
validation has been extracted into a configurable external class.
|
89
|
-
Switch Spree::Config.use_legacy_address_state_validator to
|
89
|
+
Switch Spree::Config.use_legacy_address_state_validator to false to start
|
90
90
|
using the external validation class.
|
91
91
|
DEPRECATION
|
92
92
|
end
|
data/lib/spree/core/version.rb
CHANGED
@@ -191,12 +191,12 @@ module Spree
|
|
191
191
|
|
192
192
|
private
|
193
193
|
|
194
|
-
def inject_attributes_to_all_steps(attributes,
|
194
|
+
def inject_attributes_to_all_steps(attributes, method_name)
|
195
195
|
attributes.each do |attribute|
|
196
|
-
PermittedAttributes.checkout_address_attributes.send(
|
197
|
-
PermittedAttributes.checkout_delivery_attributes.send(
|
198
|
-
PermittedAttributes.checkout_payment_attributes.send(
|
199
|
-
PermittedAttributes.checkout_confirm_attributes.send(
|
196
|
+
PermittedAttributes.checkout_address_attributes.send(method_name, attribute)
|
197
|
+
PermittedAttributes.checkout_delivery_attributes.send(method_name, attribute)
|
198
|
+
PermittedAttributes.checkout_payment_attributes.send(method_name, attribute)
|
199
|
+
PermittedAttributes.checkout_confirm_attributes.send(method_name, attribute)
|
200
200
|
end
|
201
201
|
end
|
202
202
|
end
|
@@ -0,0 +1,40 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Spree
|
4
|
+
module TestingSupport
|
5
|
+
SEQUENCES = ["#{::Spree::Core::Engine.root}/lib/spree/testing_support/sequences.rb"]
|
6
|
+
FACTORIES = Dir["#{::Spree::Core::Engine.root}/lib/spree/testing_support/factories/**/*_factory.rb"]
|
7
|
+
|
8
|
+
def self.factory_bot_paths
|
9
|
+
@paths ||= (SEQUENCES + FACTORIES).sort.map { |path| path.sub(/.rb\z/, '') }
|
10
|
+
end
|
11
|
+
|
12
|
+
def self.deprecate_cherry_picking_factory_bot_files
|
13
|
+
# All good if the factory is being loaded by FactoryBot.
|
14
|
+
return if caller.find { |line| line.include? "/factory_bot/find_definitions.rb" }
|
15
|
+
|
16
|
+
Spree::Deprecation.warn(
|
17
|
+
"Please do not cherry-pick factories, this is not well supported by FactoryBot. " \
|
18
|
+
'Use `require "spree/testing_support/factories"` instead.', caller(2)
|
19
|
+
)
|
20
|
+
end
|
21
|
+
|
22
|
+
def self.load_all_factories
|
23
|
+
require 'factory_bot'
|
24
|
+
require 'factory_bot/version'
|
25
|
+
|
26
|
+
requirement = Gem::Requirement.new("~> 4.8")
|
27
|
+
version = Gem::Version.new(FactoryBot::VERSION)
|
28
|
+
|
29
|
+
unless requirement.satisfied_by? version
|
30
|
+
Spree::Deprecation.warn(
|
31
|
+
"Please be aware that the supported version of FactoryBot is #{requirement}, " \
|
32
|
+
"using version #{version} could lead to factory loading issues.", caller(2)
|
33
|
+
)
|
34
|
+
end
|
35
|
+
|
36
|
+
FactoryBot.definition_file_paths.concat(factory_bot_paths).uniq!
|
37
|
+
FactoryBot.reload
|
38
|
+
end
|
39
|
+
end
|
40
|
+
end
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
5
|
|
6
6
|
FactoryBot.define do
|
7
7
|
factory :address, class: 'Spree::Address' do
|
@@ -1,10 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
5
|
-
require 'spree/testing_support/factories/tax_category_factory'
|
6
|
-
require 'spree/testing_support/factories/tax_rate_factory'
|
7
|
-
require 'spree/testing_support/factories/zone_factory'
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
8
5
|
|
9
6
|
FactoryBot.define do
|
10
7
|
factory :adjustment, class: 'Spree::Adjustment' do
|
@@ -1,5 +1,8 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
|
+
|
3
6
|
FactoryBot.define do
|
4
7
|
factory :adjustment_reason, class: 'Spree::AdjustmentReason' do
|
5
8
|
sequence(:name) { |n| "Refund for return ##{n}" }
|
@@ -1,5 +1,8 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
|
+
|
3
6
|
FactoryBot.define do
|
4
7
|
factory :calculator, aliases: [:flat_rate_calculator], class: 'Spree::Calculator::FlatRate' do
|
5
8
|
preferred_amount { 10.0 }
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
5
|
|
6
6
|
FactoryBot.define do
|
7
7
|
factory :carton, class: 'Spree::Carton' do
|
@@ -1,8 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
5
|
-
require 'spree/testing_support/factories/return_item_factory'
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
6
5
|
|
7
6
|
FactoryBot.define do
|
8
7
|
factory :customer_return, class: 'Spree::CustomerReturn' do
|
@@ -1,5 +1,8 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
|
+
|
3
6
|
FactoryBot.define do
|
4
7
|
factory :image, class: 'Spree::Image' do
|
5
8
|
attachment { Spree::Core::Engine.root.join('lib', 'spree', 'testing_support', 'fixtures', 'blank.jpg').open }
|
@@ -1,9 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
5
|
-
require 'spree/testing_support/factories/order_factory'
|
6
|
-
require 'spree/testing_support/factories/shipment_factory'
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
7
5
|
|
8
6
|
FactoryBot.define do
|
9
7
|
factory :inventory_unit, class: 'Spree::InventoryUnit' do
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
5
|
|
6
6
|
FactoryBot.define do
|
7
7
|
factory :line_item, class: 'Spree::LineItem' do
|
@@ -1,11 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
5
|
-
require 'spree/testing_support/factories/store_factory'
|
6
|
-
require 'spree/testing_support/factories/user_factory'
|
7
|
-
require 'spree/testing_support/factories/line_item_factory'
|
8
|
-
require 'spree/testing_support/factories/payment_factory'
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
9
5
|
|
10
6
|
FactoryBot.define do
|
11
7
|
factory :order, class: 'Spree::Order' do
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
5
|
|
6
6
|
FactoryBot.define do
|
7
7
|
factory :order_promotion, class: 'Spree::OrderPromotion' do
|
@@ -1,9 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
5
|
-
require 'spree/testing_support/factories/order_factory'
|
6
|
-
require 'spree/testing_support/factories/store_credit_factory'
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
7
5
|
|
8
6
|
FactoryBot.define do
|
9
7
|
factory :payment, aliases: [:credit_card_payment], class: 'Spree::Payment' do
|
@@ -1,5 +1,8 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
|
+
|
3
6
|
FactoryBot.define do
|
4
7
|
factory :payment_method, aliases: [:credit_card_payment_method], class: 'Spree::PaymentMethod::BogusCreditCard' do
|
5
8
|
name { 'Credit Card' }
|
@@ -1,10 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
5
|
-
require 'spree/testing_support/factories/stock_location_factory'
|
6
|
-
require 'spree/testing_support/factories/tax_category_factory'
|
7
|
-
require 'spree/testing_support/factories/product_option_type_factory'
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
8
5
|
|
9
6
|
FactoryBot.define do
|
10
7
|
factory :base_product, class: 'Spree::Product' do
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
5
|
|
6
6
|
FactoryBot.define do
|
7
7
|
factory :product_option_type, class: 'Spree::ProductOptionType' do
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
5
|
|
6
6
|
FactoryBot.define do
|
7
7
|
factory :product_property, class: 'Spree::ProductProperty' do
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
5
|
|
6
6
|
FactoryBot.define do
|
7
7
|
factory :promotion_code, class: 'Spree::PromotionCode' do
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
5
|
|
6
6
|
FactoryBot.define do
|
7
7
|
factory :promotion, class: 'Spree::Promotion' do
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
5
|
|
6
6
|
FactoryBot.define do
|
7
7
|
sequence(:refund_transaction_id) { |n| "fake-refund-transaction-#{n}" }
|
@@ -1,5 +1,8 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
|
+
|
3
6
|
FactoryBot.define do
|
4
7
|
factory :refund_reason, class: 'Spree::RefundReason' do
|
5
8
|
sequence(:name) { |n| "Refund for return ##{n}" }
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
4
5
|
|
5
6
|
FactoryBot.define do
|
6
7
|
factory :reimbursement, class: 'Spree::Reimbursement' do
|
@@ -1,5 +1,8 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
|
+
|
3
6
|
FactoryBot.define do
|
4
7
|
factory :reimbursement_type, class: 'Spree::ReimbursementType' do
|
5
8
|
sequence(:name) { |n| "Reimbursement Type #{n}" }
|
@@ -1,8 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
5
|
-
require 'spree/testing_support/factories/return_reason_factory'
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
6
5
|
|
7
6
|
FactoryBot.define do
|
8
7
|
factory :return_authorization, class: 'Spree::ReturnAuthorization' do
|
@@ -1,8 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
5
|
-
require 'spree/testing_support/factories/return_authorization_factory'
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
6
5
|
|
7
6
|
FactoryBot.define do
|
8
7
|
factory :return_item, class: 'Spree::ReturnItem' do
|
@@ -1,8 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
5
|
-
require 'spree/testing_support/factories/shipping_method_factory'
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
6
5
|
|
7
6
|
FactoryBot.define do
|
8
7
|
factory :shipment, class: 'Spree::Shipment' do
|
@@ -1,5 +1,8 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
|
+
|
3
6
|
FactoryBot.define do
|
4
7
|
factory :shipping_category, class: 'Spree::ShippingCategory' do
|
5
8
|
sequence(:name) { |n| "ShippingCategory ##{n}" }
|
@@ -1,8 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
5
|
-
require 'spree/testing_support/factories/zone_factory'
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
6
5
|
|
7
6
|
FactoryBot.define do
|
8
7
|
factory(
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
5
|
|
6
6
|
FactoryBot.define do
|
7
7
|
factory :shipping_rate, class: 'Spree::ShippingRate' do
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
5
|
|
6
6
|
FactoryBot.define do
|
7
7
|
factory :stock_item, class: 'Spree::StockItem' do
|
@@ -1,8 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
5
|
-
require 'spree/testing_support/factories/product_factory'
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
6
5
|
|
7
6
|
FactoryBot.define do
|
8
7
|
factory :stock_location, class: 'Spree::StockLocation' do
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
4
5
|
|
5
6
|
FactoryBot.define do
|
6
7
|
factory :stock_movement, class: 'Spree::StockMovement' do
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
5
|
|
6
6
|
FactoryBot.define do
|
7
7
|
factory :stock_package, class: 'Spree::Stock::Package' do
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
5
|
|
6
6
|
FactoryBot.define do
|
7
7
|
factory :store_credit_event, class: 'Spree::StoreCreditEvent' do
|
@@ -1,8 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
5
|
-
require 'spree/testing_support/factories/user_factory'
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
6
5
|
|
7
6
|
FactoryBot.define do
|
8
7
|
factory :store_credit, class: 'Spree::StoreCredit' do
|
@@ -1,5 +1,8 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
|
+
|
3
6
|
FactoryBot.define do
|
4
7
|
factory :primary_credit_type, class: 'Spree::StoreCreditType' do
|
5
8
|
name { Spree::StoreCreditType::DEFAULT_TYPE_NAME }
|
@@ -1,10 +1,13 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
|
+
|
3
6
|
FactoryBot.define do
|
4
7
|
factory :store, class: 'Spree::Store' do
|
5
8
|
sequence(:code) { |i| "spree_#{i}" }
|
6
9
|
sequence(:name) { |i| "Spree Test Store #{i}" }
|
7
10
|
sequence(:url) { |i| "www.example#{i}.com" }
|
8
|
-
mail_from_address { '
|
11
|
+
mail_from_address { 'solidus@example.org' }
|
9
12
|
end
|
10
13
|
end
|
@@ -1,8 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
5
|
-
require 'spree/testing_support/factories/zone_factory'
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
6
5
|
|
7
6
|
FactoryBot.define do
|
8
7
|
factory :tax_rate, class: 'Spree::TaxRate' do
|
@@ -1,8 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
5
|
-
require 'spree/testing_support/factories/address_factory'
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
6
5
|
|
7
6
|
FactoryBot.define do
|
8
7
|
factory :user, class: Spree::UserClassHandle.new do
|
@@ -1,9 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
5
|
-
require 'spree/testing_support/factories/option_type_factory'
|
6
|
-
require 'spree/testing_support/factories/product_factory'
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
7
5
|
|
8
6
|
FactoryBot.define do
|
9
7
|
sequence(:random_float) { BigDecimal("#{rand(200)}.#{rand(99)}") }
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
5
|
|
6
6
|
FactoryBot.define do
|
7
7
|
factory :variant_property_rule_condition, class: 'Spree::VariantPropertyRuleCondition' do
|
@@ -1,8 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
5
|
-
require 'spree/testing_support/factories/option_value_factory'
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
6
5
|
|
7
6
|
FactoryBot.define do
|
8
7
|
factory :variant_property_rule, class: 'Spree::VariantPropertyRule' do
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
5
|
|
6
6
|
FactoryBot.define do
|
7
7
|
factory :variant_property_rule_value, class: 'Spree::VariantPropertyRuleValue' do
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support
|
4
|
-
|
3
|
+
require 'spree/testing_support'
|
4
|
+
Spree::TestingSupport.deprecate_cherry_picking_factory_bot_files
|
5
5
|
|
6
6
|
FactoryBot.define do
|
7
7
|
factory :global_zone, class: 'Spree::Zone' do
|
File without changes
|
data/lib/tasks/email.rake
CHANGED
@@ -1,11 +1,12 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
namespace :email do
|
4
|
-
desc 'Sends test email to specified address - Example: EMAIL=
|
4
|
+
desc 'Sends test email to specified address - Example: EMAIL=solidus@example.com bundle exec rake email:test'
|
5
5
|
task test: :environment do
|
6
6
|
Spree::Deprecation.warn("rake email:test has been deprecated and will be removed with Solidus 3.0")
|
7
7
|
|
8
|
-
raise ArgumentError, "Must pass EMAIL environment variable. Example: EMAIL=
|
8
|
+
raise ArgumentError, "Must pass EMAIL environment variable. Example: EMAIL=solidus@example.com bundle exec rake email:test" if ENV['EMAIL'].blank?
|
9
|
+
|
9
10
|
Spree::TestMailer.test_email(ENV['EMAIL']).deliver!
|
10
11
|
end
|
11
12
|
end
|
data/solidus_core.gemspec
CHANGED
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
|
|
25
25
|
actionmailer actionpack actionview activejob activemodel activerecord
|
26
26
|
activesupport railties
|
27
27
|
].each do |rails_dep|
|
28
|
-
s.add_dependency rails_dep, ['>= 5.2', '< 6.
|
28
|
+
s.add_dependency rails_dep, ['>= 5.2', '< 6.2.x']
|
29
29
|
end
|
30
30
|
|
31
31
|
s.add_dependency 'activemerchant', '~> 1.66'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: solidus_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.11.
|
4
|
+
version: 2.11.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Solidus Team
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-01-19 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: actionmailer
|
@@ -19,7 +19,7 @@ dependencies:
|
|
19
19
|
version: '5.2'
|
20
20
|
- - "<"
|
21
21
|
- !ruby/object:Gem::Version
|
22
|
-
version: 6.
|
22
|
+
version: 6.2.x
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -29,7 +29,7 @@ dependencies:
|
|
29
29
|
version: '5.2'
|
30
30
|
- - "<"
|
31
31
|
- !ruby/object:Gem::Version
|
32
|
-
version: 6.
|
32
|
+
version: 6.2.x
|
33
33
|
- !ruby/object:Gem::Dependency
|
34
34
|
name: actionpack
|
35
35
|
requirement: !ruby/object:Gem::Requirement
|
@@ -39,7 +39,7 @@ dependencies:
|
|
39
39
|
version: '5.2'
|
40
40
|
- - "<"
|
41
41
|
- !ruby/object:Gem::Version
|
42
|
-
version: 6.
|
42
|
+
version: 6.2.x
|
43
43
|
type: :runtime
|
44
44
|
prerelease: false
|
45
45
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -49,7 +49,7 @@ dependencies:
|
|
49
49
|
version: '5.2'
|
50
50
|
- - "<"
|
51
51
|
- !ruby/object:Gem::Version
|
52
|
-
version: 6.
|
52
|
+
version: 6.2.x
|
53
53
|
- !ruby/object:Gem::Dependency
|
54
54
|
name: actionview
|
55
55
|
requirement: !ruby/object:Gem::Requirement
|
@@ -59,7 +59,7 @@ dependencies:
|
|
59
59
|
version: '5.2'
|
60
60
|
- - "<"
|
61
61
|
- !ruby/object:Gem::Version
|
62
|
-
version: 6.
|
62
|
+
version: 6.2.x
|
63
63
|
type: :runtime
|
64
64
|
prerelease: false
|
65
65
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -69,7 +69,7 @@ dependencies:
|
|
69
69
|
version: '5.2'
|
70
70
|
- - "<"
|
71
71
|
- !ruby/object:Gem::Version
|
72
|
-
version: 6.
|
72
|
+
version: 6.2.x
|
73
73
|
- !ruby/object:Gem::Dependency
|
74
74
|
name: activejob
|
75
75
|
requirement: !ruby/object:Gem::Requirement
|
@@ -79,7 +79,7 @@ dependencies:
|
|
79
79
|
version: '5.2'
|
80
80
|
- - "<"
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version: 6.
|
82
|
+
version: 6.2.x
|
83
83
|
type: :runtime
|
84
84
|
prerelease: false
|
85
85
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -89,7 +89,7 @@ dependencies:
|
|
89
89
|
version: '5.2'
|
90
90
|
- - "<"
|
91
91
|
- !ruby/object:Gem::Version
|
92
|
-
version: 6.
|
92
|
+
version: 6.2.x
|
93
93
|
- !ruby/object:Gem::Dependency
|
94
94
|
name: activemodel
|
95
95
|
requirement: !ruby/object:Gem::Requirement
|
@@ -99,7 +99,7 @@ dependencies:
|
|
99
99
|
version: '5.2'
|
100
100
|
- - "<"
|
101
101
|
- !ruby/object:Gem::Version
|
102
|
-
version: 6.
|
102
|
+
version: 6.2.x
|
103
103
|
type: :runtime
|
104
104
|
prerelease: false
|
105
105
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -109,7 +109,7 @@ dependencies:
|
|
109
109
|
version: '5.2'
|
110
110
|
- - "<"
|
111
111
|
- !ruby/object:Gem::Version
|
112
|
-
version: 6.
|
112
|
+
version: 6.2.x
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: activerecord
|
115
115
|
requirement: !ruby/object:Gem::Requirement
|
@@ -119,7 +119,7 @@ dependencies:
|
|
119
119
|
version: '5.2'
|
120
120
|
- - "<"
|
121
121
|
- !ruby/object:Gem::Version
|
122
|
-
version: 6.
|
122
|
+
version: 6.2.x
|
123
123
|
type: :runtime
|
124
124
|
prerelease: false
|
125
125
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -129,7 +129,7 @@ dependencies:
|
|
129
129
|
version: '5.2'
|
130
130
|
- - "<"
|
131
131
|
- !ruby/object:Gem::Version
|
132
|
-
version: 6.
|
132
|
+
version: 6.2.x
|
133
133
|
- !ruby/object:Gem::Dependency
|
134
134
|
name: activesupport
|
135
135
|
requirement: !ruby/object:Gem::Requirement
|
@@ -139,7 +139,7 @@ dependencies:
|
|
139
139
|
version: '5.2'
|
140
140
|
- - "<"
|
141
141
|
- !ruby/object:Gem::Version
|
142
|
-
version: 6.
|
142
|
+
version: 6.2.x
|
143
143
|
type: :runtime
|
144
144
|
prerelease: false
|
145
145
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -149,7 +149,7 @@ dependencies:
|
|
149
149
|
version: '5.2'
|
150
150
|
- - "<"
|
151
151
|
- !ruby/object:Gem::Version
|
152
|
-
version: 6.
|
152
|
+
version: 6.2.x
|
153
153
|
- !ruby/object:Gem::Dependency
|
154
154
|
name: railties
|
155
155
|
requirement: !ruby/object:Gem::Requirement
|
@@ -159,7 +159,7 @@ dependencies:
|
|
159
159
|
version: '5.2'
|
160
160
|
- - "<"
|
161
161
|
- !ruby/object:Gem::Version
|
162
|
-
version: 6.
|
162
|
+
version: 6.2.x
|
163
163
|
type: :runtime
|
164
164
|
prerelease: false
|
165
165
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -169,7 +169,7 @@ dependencies:
|
|
169
169
|
version: '5.2'
|
170
170
|
- - "<"
|
171
171
|
- !ruby/object:Gem::Version
|
172
|
-
version: 6.
|
172
|
+
version: 6.2.x
|
173
173
|
- !ruby/object:Gem::Dependency
|
174
174
|
name: activemerchant
|
175
175
|
requirement: !ruby/object:Gem::Requirement
|
@@ -648,7 +648,6 @@ files:
|
|
648
648
|
- app/models/spree/taxonomy.rb
|
649
649
|
- app/models/spree/unit_cancel.rb
|
650
650
|
- app/models/spree/user_address.rb
|
651
|
-
- app/models/spree/user_class_handle.rb
|
652
651
|
- app/models/spree/user_last_url_storer.rb
|
653
652
|
- app/models/spree/user_last_url_storer/rules/authentication_rule.rb
|
654
653
|
- app/models/spree/user_stock_location.rb
|
@@ -837,6 +836,7 @@ files:
|
|
837
836
|
- lib/spree/preferences/statically_configurable.rb
|
838
837
|
- lib/spree/preferences/store.rb
|
839
838
|
- lib/spree/promo/environment.rb
|
839
|
+
- lib/spree/testing_support.rb
|
840
840
|
- lib/spree/testing_support/ability_helpers.rb
|
841
841
|
- lib/spree/testing_support/authorization_helpers.rb
|
842
842
|
- lib/spree/testing_support/bar_ability.rb
|
@@ -927,6 +927,7 @@ files:
|
|
927
927
|
- lib/spree/testing_support/shared_examples/gallery.rb
|
928
928
|
- lib/spree/testing_support/translations.rb
|
929
929
|
- lib/spree/testing_support/url_helpers.rb
|
930
|
+
- lib/spree/user_class_handle.rb
|
930
931
|
- lib/spree_core.rb
|
931
932
|
- lib/tasks/core.rake
|
932
933
|
- lib/tasks/email.rake
|