solidus_core 2.9.6 → 2.10.3

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.
Files changed (217) hide show
  1. checksums.yaml +4 -4
  2. data/app/helpers/spree/base_helper.rb +4 -4
  3. data/app/helpers/spree/products_helper.rb +2 -1
  4. data/app/jobs/spree/promotion_code_batch_job.rb +2 -2
  5. data/app/models/concerns/spree/user_address_book.rb +2 -2
  6. data/app/models/concerns/spree/user_methods.rb +2 -2
  7. data/app/models/spree/address.rb +13 -17
  8. data/app/models/spree/adjustment.rb +20 -9
  9. data/app/models/spree/asset.rb +1 -1
  10. data/app/models/spree/base.rb +0 -2
  11. data/app/models/spree/calculator.rb +1 -1
  12. data/app/models/spree/calculator/price_sack.rb +1 -1
  13. data/app/models/spree/calculator/shipping/flexi_rate.rb +2 -2
  14. data/app/models/spree/calculator/tiered_flat_rate.rb +5 -5
  15. data/app/models/spree/calculator/tiered_percent.rb +6 -6
  16. data/app/models/spree/carton.rb +3 -3
  17. data/app/models/spree/classification.rb +2 -2
  18. data/app/models/spree/credit_card.rb +4 -4
  19. data/app/models/spree/customer_return.rb +1 -1
  20. data/app/models/spree/image/paperclip_attachment.rb +1 -1
  21. data/app/models/spree/inventory_unit.rb +5 -23
  22. data/app/models/spree/line_item.rb +4 -4
  23. data/app/models/spree/line_item_action.rb +2 -2
  24. data/app/models/spree/log_entry.rb +1 -1
  25. data/app/models/spree/option_value.rb +1 -1
  26. data/app/models/spree/option_values_variant.rb +2 -2
  27. data/app/models/spree/order.rb +11 -27
  28. data/app/models/spree/order/checkout.rb +1 -1
  29. data/app/models/spree/order/payments.rb +2 -2
  30. data/app/models/spree/order_cancellations.rb +1 -1
  31. data/app/models/spree/order_capturing.rb +2 -2
  32. data/app/models/spree/order_contents.rb +2 -2
  33. data/app/models/spree/order_mutex.rb +1 -1
  34. data/app/models/spree/order_promotion.rb +3 -3
  35. data/app/models/spree/order_shipping.rb +1 -1
  36. data/app/models/spree/order_taxation.rb +3 -3
  37. data/app/models/spree/payment.rb +8 -45
  38. data/app/models/spree/payment/processing.rb +3 -3
  39. data/app/models/spree/payment_capture_event.rb +1 -1
  40. data/app/models/spree/payment_method.rb +5 -2
  41. data/app/models/spree/payment_method/bogus_credit_card.rb +1 -1
  42. data/app/models/spree/payment_source.rb +1 -1
  43. data/app/models/spree/price.rb +2 -2
  44. data/app/models/spree/product.rb +5 -5
  45. data/app/models/spree/product/scopes.rb +218 -210
  46. data/app/models/spree/product_option_type.rb +2 -2
  47. data/app/models/spree/product_promotion_rule.rb +2 -2
  48. data/app/models/spree/product_property.rb +2 -2
  49. data/app/models/spree/promotion.rb +28 -13
  50. data/app/models/spree/promotion/actions/create_quantity_adjustments.rb +1 -1
  51. data/app/models/spree/promotion/actions/free_shipping.rb +1 -1
  52. data/app/models/spree/promotion/rules/option_value.rb +2 -2
  53. data/app/models/spree/promotion/rules/product.rb +3 -3
  54. data/app/models/spree/promotion_action.rb +2 -2
  55. data/app/models/spree/promotion_chooser.rb +2 -2
  56. data/app/models/spree/promotion_code.rb +11 -10
  57. data/app/models/spree/promotion_code/batch_builder.rb +3 -3
  58. data/app/models/spree/promotion_code_batch.rb +1 -1
  59. data/app/models/spree/promotion_rule.rb +2 -2
  60. data/app/models/spree/promotion_rule_role.rb +2 -2
  61. data/app/models/spree/promotion_rule_store.rb +2 -2
  62. data/app/models/spree/promotion_rule_taxon.rb +2 -2
  63. data/app/models/spree/promotion_rule_user.rb +2 -2
  64. data/app/models/spree/refund.rb +5 -5
  65. data/app/models/spree/reimbursement.rb +5 -13
  66. data/app/models/spree/reimbursement/credit.rb +2 -2
  67. data/app/models/spree/reimbursement/reimbursement_type_engine.rb +1 -1
  68. data/app/models/spree/reimbursement_tax_calculator.rb +1 -1
  69. data/app/models/spree/reimbursement_type/reimbursement_helpers.rb +2 -2
  70. data/app/models/spree/return_authorization.rb +4 -10
  71. data/app/models/spree/return_item.rb +13 -52
  72. data/app/models/spree/return_item/eligibility_validator/default.rb +1 -1
  73. data/app/models/spree/role_user.rb +2 -2
  74. data/app/models/spree/shipment.rb +7 -41
  75. data/app/models/spree/shipping_calculator.rb +0 -4
  76. data/app/models/spree/shipping_manifest.rb +3 -3
  77. data/app/models/spree/shipping_method.rb +2 -2
  78. data/app/models/spree/shipping_method_category.rb +2 -2
  79. data/app/models/spree/shipping_method_stock_location.rb +2 -2
  80. data/app/models/spree/shipping_method_zone.rb +2 -2
  81. data/app/models/spree/shipping_rate.rb +2 -2
  82. data/app/models/spree/shipping_rate_tax.rb +2 -2
  83. data/app/models/spree/state.rb +2 -2
  84. data/app/models/spree/state_change.rb +2 -2
  85. data/app/models/spree/stock/differentiator.rb +1 -1
  86. data/app/models/spree/stock/package.rb +1 -1
  87. data/app/models/spree/stock_item.rb +3 -3
  88. data/app/models/spree/stock_location.rb +2 -2
  89. data/app/models/spree/stock_movement.rb +2 -2
  90. data/app/models/spree/stock_quantities.rb +13 -12
  91. data/app/models/spree/store_credit.rb +8 -8
  92. data/app/models/spree/store_credit_event.rb +3 -3
  93. data/app/models/spree/store_payment_method.rb +2 -2
  94. data/app/models/spree/store_shipping_method.rb +2 -2
  95. data/app/models/spree/tax_calculator/default.rb +0 -4
  96. data/app/models/spree/tax_calculator/shipping_rate.rb +0 -3
  97. data/app/models/spree/tax_rate.rb +5 -1
  98. data/app/models/spree/tax_rate_tax_category.rb +2 -2
  99. data/app/models/spree/taxon/paperclip_attachment.rb +13 -0
  100. data/app/models/spree/unit_cancel.rb +5 -2
  101. data/app/models/spree/user_address.rb +2 -2
  102. data/app/models/spree/user_last_url_storer.rb +46 -0
  103. data/app/models/spree/user_last_url_storer/rules/authentication_rule.rb +36 -0
  104. data/app/models/spree/user_stock_location.rb +2 -2
  105. data/app/models/spree/variant.rb +10 -10
  106. data/app/models/spree/variant/scopes.rb +37 -29
  107. data/app/models/spree/variant_property_rule.rb +1 -1
  108. data/app/models/spree/variant_property_rule_condition.rb +2 -2
  109. data/app/models/spree/variant_property_rule_value.rb +2 -2
  110. data/app/models/spree/wallet/add_payment_sources_to_wallet.rb +1 -1
  111. data/app/models/spree/wallet_payment_source.rb +2 -2
  112. data/app/models/spree/zone.rb +1 -1
  113. data/app/models/spree/zone_member.rb +2 -2
  114. data/config/initializers/inflections.rb +5 -0
  115. data/config/initializers/money.rb +2 -0
  116. data/config/locales/en.yml +34 -3
  117. data/lib/generators/spree/dummy/dummy_generator.rb +2 -0
  118. data/lib/generators/spree/install/templates/config/initializers/spree.rb.tt +8 -0
  119. data/lib/spree/app_configuration.rb +18 -3
  120. data/lib/spree/core.rb +12 -0
  121. data/lib/spree/core/controller_helpers/auth.rb +1 -13
  122. data/lib/spree/core/engine.rb +2 -2
  123. data/lib/spree/core/importer/order.rb +28 -28
  124. data/lib/spree/core/importer/product.rb +2 -2
  125. data/lib/spree/core/product_filters.rb +15 -15
  126. data/lib/spree/core/role_configuration.rb +2 -2
  127. data/lib/spree/core/search/variant.rb +1 -1
  128. data/lib/spree/core/state_machines.rb +78 -0
  129. data/lib/spree/core/state_machines/inventory_unit.rb +42 -0
  130. data/lib/spree/core/state_machines/payment.rb +61 -0
  131. data/lib/spree/core/state_machines/reimbursement.rb +33 -0
  132. data/lib/spree/core/state_machines/return_authorization.rb +32 -0
  133. data/lib/spree/core/state_machines/return_item/acceptance_status.rb +51 -0
  134. data/lib/spree/core/state_machines/return_item/reception_status.rb +42 -0
  135. data/lib/spree/core/state_machines/shipment.rb +58 -0
  136. data/lib/spree/core/stock_configuration.rb +1 -0
  137. data/lib/spree/core/validators/email.rb +1 -8
  138. data/lib/spree/core/version.rb +1 -1
  139. data/lib/spree/money.rb +2 -2
  140. data/lib/spree/permission_sets/default_customer.rb +1 -1
  141. data/lib/spree/permission_sets/user_management.rb +3 -0
  142. data/lib/spree/permitted_attributes.rb +3 -3
  143. data/lib/spree/preferences/static_model_preferences.rb +2 -2
  144. data/lib/spree/testing_support/dummy_app.rb +4 -1
  145. data/lib/spree/testing_support/dummy_app/rake_tasks.rb +6 -2
  146. data/lib/spree/testing_support/factories/inventory_unit_factory.rb +8 -1
  147. data/lib/spree/testing_support/factories/promotion_factory.rb +7 -0
  148. data/lib/spree/testing_support/factories/stock_package_factory.rb +1 -1
  149. data/lib/spree/testing_support/factories/user_factory.rb +4 -1
  150. data/solidus_core.gemspec +6 -6
  151. data/spec/lib/search/base_spec.rb +5 -1
  152. data/spec/lib/search/variant_spec.rb +1 -1
  153. data/spec/lib/spree/core/stock_configuration_spec.rb +36 -0
  154. data/spec/lib/spree/core/validators/email_spec.rb +18 -18
  155. data/spec/lib/spree/event_spec.rb +15 -3
  156. data/spec/models/spree/ability_spec.rb +1 -1
  157. data/spec/models/spree/address_spec.rb +23 -0
  158. data/spec/models/spree/calculator/refunds/default_refund_amount_spec.rb +1 -1
  159. data/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb +1 -1
  160. data/spec/models/spree/calculator/shipping/flat_rate_spec.rb +1 -1
  161. data/spec/models/spree/calculator/shipping/flexi_rate_spec.rb +2 -2
  162. data/spec/models/spree/calculator/shipping/per_item_spec.rb +1 -1
  163. data/spec/models/spree/calculator/shipping/price_sack_spec.rb +24 -15
  164. data/spec/models/spree/carton_spec.rb +10 -2
  165. data/spec/models/spree/classification_spec.rb +21 -9
  166. data/spec/models/spree/concerns/user_address_book_spec.rb +4 -4
  167. data/spec/models/spree/concerns/user_methods_spec.rb +5 -4
  168. data/spec/models/spree/credit_card_spec.rb +2 -2
  169. data/spec/models/spree/customer_return_spec.rb +1 -1
  170. data/spec/models/spree/order/checkout_spec.rb +1 -1
  171. data/spec/models/spree/order/outstanding_balance_integration_spec.rb +5 -5
  172. data/spec/models/spree/order/payment_spec.rb +1 -1
  173. data/spec/models/spree/order_contents_spec.rb +1 -1
  174. data/spec/models/spree/order_inventory_spec.rb +3 -3
  175. data/spec/models/spree/order_merger_spec.rb +3 -3
  176. data/spec/models/spree/order_shipping_spec.rb +1 -1
  177. data/spec/models/spree/order_spec.rb +14 -21
  178. data/spec/models/spree/order_updater_spec.rb +4 -3
  179. data/spec/models/spree/payment_create_spec.rb +6 -16
  180. data/spec/models/spree/payment_spec.rb +12 -12
  181. data/spec/models/spree/permission_sets/user_management_spec.rb +2 -0
  182. data/spec/models/spree/preference_spec.rb +4 -4
  183. data/spec/models/spree/preferences/preferable_spec.rb +3 -3
  184. data/spec/models/spree/preferences/statically_configurable_spec.rb +2 -2
  185. data/spec/models/spree/promotion/rules/first_repeat_purchase_since_spec.rb +2 -2
  186. data/spec/models/spree/promotion/rules/nth_order_spec.rb +2 -2
  187. data/spec/models/spree/promotion_rule_spec.rb +6 -6
  188. data/spec/models/spree/promotion_spec.rb +71 -54
  189. data/spec/models/spree/reimbursement_type/original_payment_spec.rb +3 -3
  190. data/spec/models/spree/return_item/exchange_variant_eligibility/same_product_spec.rb +1 -1
  191. data/spec/models/spree/return_item_spec.rb +11 -11
  192. data/spec/models/spree/returns_calculator_spec.rb +2 -2
  193. data/spec/models/spree/shipment_spec.rb +6 -6
  194. data/spec/models/spree/shipping_calculator_spec.rb +1 -13
  195. data/spec/models/spree/shipping_method_spec.rb +32 -0
  196. data/spec/models/spree/stock/availability_validator_spec.rb +2 -2
  197. data/spec/models/spree/stock/differentiator_spec.rb +2 -2
  198. data/spec/models/spree/stock/estimator_spec.rb +3 -3
  199. data/spec/models/spree/stock/inventory_units_finalizer_spec.rb +4 -4
  200. data/spec/models/spree/stock/package_spec.rb +28 -28
  201. data/spec/models/spree/stock/quantifier_spec.rb +2 -2
  202. data/spec/models/spree/stock/simple_coordinator_spec.rb +11 -11
  203. data/spec/models/spree/stock/splitter/base_spec.rb +4 -4
  204. data/spec/models/spree/stock/splitter/shipping_category_spec.rb +7 -7
  205. data/spec/models/spree/stock_quantities_spec.rb +1 -1
  206. data/spec/models/spree/store_credit_spec.rb +8 -8
  207. data/spec/models/spree/tax_category_spec.rb +1 -1
  208. data/spec/models/spree/tax_rate_spec.rb +1 -0
  209. data/spec/models/spree/taxon_spec.rb +2 -2
  210. data/spec/models/spree/taxons/paperclip_attachment_spec.rb +29 -0
  211. data/spec/models/spree/unit_cancel_spec.rb +5 -0
  212. data/spec/models/spree/user_last_url_storer/rules/authentication_rule_spec.rb +31 -0
  213. data/spec/models/spree/user_last_url_storer_spec.rb +60 -0
  214. data/spec/models/spree/user_spec.rb +3 -3
  215. metadata +49 -43
  216. data/spec/migrate/20190106184413_remove_code_from_spree_promotions_spec.rb +0 -148
  217. data/spec/models/spree/order/updating_spec.rb +0 -18
@@ -1,148 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- require 'rails_helper'
4
- require Spree::Core::Engine.root.join('db/migrate/20190106184413_remove_code_from_spree_promotions.rb')
5
-
6
- RSpec.describe RemoveCodeFromSpreePromotions do
7
- let(:migrations_paths) { ActiveRecord::Migrator.migrations_paths }
8
- let(:migrations) do
9
- if ActiveRecord::Base.connection.respond_to?(:migration_context)
10
- # Rails >= 5.2
11
- ActiveRecord::MigrationContext.new(migrations_paths).migrations
12
- else
13
- ActiveRecord::Migrator.migrations(migrations_paths)
14
- end
15
- end
16
- let(:previous_version) { 20180710170104 }
17
- let(:current_version) { 20190106184413 }
18
-
19
- subject { ActiveRecord::Migrator.new(:up, migrations, current_version).migrate }
20
-
21
- # This is needed for MySQL since it is not able to rollback to the previous
22
- # state when database schema changes within that transaction.
23
- before(:all) { self.use_transactional_tests = false }
24
- after(:all) { self.use_transactional_tests = true }
25
-
26
- around do |example|
27
- DatabaseCleaner.clean_with(:truncation)
28
- # Silence migrations output in specs report.
29
- ActiveRecord::Migration.suppress_messages do
30
- # Migrate back to the previous version
31
- ActiveRecord::Migrator.new(:down, migrations, previous_version).migrate
32
- # If other tests using Spree::Promotion ran before this one, Rails has
33
- # stored information about table's columns and we need to reset those
34
- # since the migration changed the database structure.
35
- Spree::Promotion.reset_column_information
36
-
37
- example.run
38
-
39
- # Re-update column information after the migration has been executed
40
- # again in the example. This will make the promotion attributes cache
41
- # ready for other tests.
42
- Spree::Promotion.reset_column_information
43
- end
44
- DatabaseCleaner.clean_with(:truncation)
45
- end
46
-
47
- let(:promotion_with_code) { create(:promotion) }
48
-
49
- before do
50
- # We can't set code via factory since `code=` is currently raising
51
- # an error, see more at:
52
- # https://github.com/solidusio/solidus/blob/cf96b03eb9e80002b69736e082fd485c870ab5d9/core/app/models/spree/promotion.rb#L65
53
- promotion_with_code.update_column(:code, code)
54
- end
55
-
56
- context 'when there are no promotions with code' do
57
- let(:code) { '' }
58
-
59
- it 'does not call any promotion with code handler' do
60
- expect(described_class).not_to receive(:promotions_with_code_handler)
61
-
62
- subject
63
- end
64
- end
65
-
66
- context 'when there are promotions with code' do
67
- let(:code) { 'Just An Old Promo Code' }
68
-
69
- context 'with the deafult handler (Solidus::Migrations::PromotionWithCodeHandlers::RaiseException)' do
70
- it 'raise a StandardError exception' do
71
- expect { subject }.to raise_error(StandardError)
72
- end
73
- end
74
-
75
- context 'changing the default handler' do
76
- before do
77
- allow(described_class)
78
- .to receive(:promotions_with_code_handler)
79
- .and_return(promotions_with_code_handler)
80
- end
81
-
82
- context 'to Solidus::Migrations::PromotionWithCodeHandlers::MoveToSpreePromotionCode' do
83
- let(:promotions_with_code_handler) { Solidus::Migrations::PromotionWithCodeHandlers::MoveToSpreePromotionCode }
84
-
85
- context 'when there are no Spree::PromotionCode with the same value' do
86
- it 'moves the code into a Spree::PromotionCode' do
87
- migration_context = double('a migration context')
88
- allow_any_instance_of(promotions_with_code_handler)
89
- .to receive(:migration_context)
90
- .and_return(migration_context)
91
-
92
- expect(migration_context)
93
- .to receive(:say)
94
- .with("Creating Spree::PromotionCode with value 'just an old promo code' for Spree::Promotion with id '#{promotion_with_code.id}'")
95
-
96
- expect { subject }
97
- .to change { Spree::PromotionCode.all.size }
98
- .from(0)
99
- .to(1)
100
- end
101
- end
102
-
103
- context 'with promotions with type set (legacy feature)' do
104
- let(:promotion_with_code) { create(:promotion, type: 'Spree::Promotion') }
105
-
106
- it 'does not raise a STI error' do
107
- expect { subject }.not_to raise_error
108
- end
109
- end
110
-
111
- context 'when there is a Spree::PromotionCode with the same value' do
112
- context 'associated with the same promotion' do
113
- let!(:existing_promotion_code) { create(:promotion_code, value: 'just an old promo code', promotion: promotion_with_code) }
114
-
115
- it 'does not create a new Spree::PromotionCode' do
116
- expect { subject }.not_to change { Spree::PromotionCode.all.size }
117
- end
118
- end
119
-
120
- context 'associated with another promotion' do
121
- let!(:existing_promotion_code) { create(:promotion_code, value: 'just an old promo code') }
122
-
123
- it 'raises an exception' do
124
- expect { subject }.to raise_error(StandardError)
125
- end
126
- end
127
- end
128
- end
129
-
130
- context 'to Solidus::Migrations::PromotionWithCodeHandlers::DoNothing' do
131
- let(:promotions_with_code_handler) { Solidus::Migrations::PromotionWithCodeHandlers::DoNothing }
132
-
133
- it 'just prints a message' do
134
- migration_context = double('a migration context')
135
- allow_any_instance_of(promotions_with_code_handler)
136
- .to receive(:migration_context)
137
- .and_return(migration_context)
138
-
139
- expect(migration_context)
140
- .to receive(:say)
141
- .with("Code 'Just An Old Promo Code' is going to be removed from Spree::Promotion with id '#{promotion_with_code.id}'")
142
-
143
- subject
144
- end
145
- end
146
- end
147
- end
148
- end
@@ -1,18 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- require 'rails_helper'
4
-
5
- RSpec.describe Spree::Order, type: :model do
6
- let(:order) { create(:order) }
7
-
8
- context "#update!" do
9
- context "when there are update hooks", partial_double_verification: false do
10
- before { Spree::Order.register_update_hook :foo }
11
- after { Spree::Order.update_hooks.clear }
12
- it "should call each of the update hooks" do
13
- expect(order).to receive :foo
14
- order.recalculate
15
- end
16
- end
17
- end
18
- end