solidus_core 2.9.6 → 2.10.0.beta1

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 (131) hide show
  1. checksums.yaml +4 -4
  2. data/app/models/concerns/spree/user_address_book.rb +2 -2
  3. data/app/models/spree/address.rb +2 -2
  4. data/app/models/spree/adjustment.rb +9 -9
  5. data/app/models/spree/asset.rb +1 -1
  6. data/app/models/spree/base.rb +0 -2
  7. data/app/models/spree/calculator.rb +1 -1
  8. data/app/models/spree/carton.rb +3 -3
  9. data/app/models/spree/classification.rb +2 -2
  10. data/app/models/spree/credit_card.rb +2 -2
  11. data/app/models/spree/customer_return.rb +1 -1
  12. data/app/models/spree/image/paperclip_attachment.rb +1 -1
  13. data/app/models/spree/inventory_unit.rb +4 -4
  14. data/app/models/spree/line_item.rb +3 -3
  15. data/app/models/spree/line_item_action.rb +2 -2
  16. data/app/models/spree/log_entry.rb +1 -1
  17. data/app/models/spree/option_value.rb +1 -1
  18. data/app/models/spree/option_values_variant.rb +2 -2
  19. data/app/models/spree/order.rb +8 -25
  20. data/app/models/spree/order_cancellations.rb +1 -1
  21. data/app/models/spree/order_contents.rb +2 -2
  22. data/app/models/spree/order_mutex.rb +1 -1
  23. data/app/models/spree/order_promotion.rb +3 -3
  24. data/app/models/spree/order_shipping.rb +1 -1
  25. data/app/models/spree/order_taxation.rb +1 -1
  26. data/app/models/spree/payment/processing.rb +1 -1
  27. data/app/models/spree/payment.rb +4 -4
  28. data/app/models/spree/payment_capture_event.rb +1 -1
  29. data/app/models/spree/payment_method/bogus_credit_card.rb +1 -1
  30. data/app/models/spree/payment_method.rb +3 -0
  31. data/app/models/spree/payment_source.rb +1 -1
  32. data/app/models/spree/price.rb +2 -2
  33. data/app/models/spree/product/scopes.rb +217 -210
  34. data/app/models/spree/product.rb +2 -2
  35. data/app/models/spree/product_option_type.rb +2 -2
  36. data/app/models/spree/product_promotion_rule.rb +2 -2
  37. data/app/models/spree/product_property.rb +2 -2
  38. data/app/models/spree/promotion.rb +1 -1
  39. data/app/models/spree/promotion_action.rb +1 -1
  40. data/app/models/spree/promotion_code.rb +2 -2
  41. data/app/models/spree/promotion_code_batch.rb +1 -1
  42. data/app/models/spree/promotion_rule.rb +1 -1
  43. data/app/models/spree/promotion_rule_role.rb +2 -2
  44. data/app/models/spree/promotion_rule_store.rb +2 -2
  45. data/app/models/spree/promotion_rule_taxon.rb +2 -2
  46. data/app/models/spree/promotion_rule_user.rb +2 -2
  47. data/app/models/spree/refund.rb +3 -3
  48. data/app/models/spree/reimbursement/credit.rb +2 -2
  49. data/app/models/spree/reimbursement.rb +2 -2
  50. data/app/models/spree/reimbursement_tax_calculator.rb +1 -1
  51. data/app/models/spree/return_authorization.rb +3 -3
  52. data/app/models/spree/return_item.rb +10 -10
  53. data/app/models/spree/role_user.rb +2 -2
  54. data/app/models/spree/shipment.rb +3 -3
  55. data/app/models/spree/shipping_manifest.rb +3 -3
  56. data/app/models/spree/shipping_method.rb +1 -1
  57. data/app/models/spree/shipping_method_category.rb +2 -2
  58. data/app/models/spree/shipping_method_stock_location.rb +2 -2
  59. data/app/models/spree/shipping_method_zone.rb +2 -2
  60. data/app/models/spree/shipping_rate.rb +2 -2
  61. data/app/models/spree/shipping_rate_tax.rb +2 -2
  62. data/app/models/spree/state.rb +1 -1
  63. data/app/models/spree/state_change.rb +2 -2
  64. data/app/models/spree/stock_item.rb +2 -2
  65. data/app/models/spree/stock_location.rb +2 -2
  66. data/app/models/spree/stock_movement.rb +2 -2
  67. data/app/models/spree/store_credit.rb +8 -8
  68. data/app/models/spree/store_credit_event.rb +3 -3
  69. data/app/models/spree/store_payment_method.rb +2 -2
  70. data/app/models/spree/store_shipping_method.rb +2 -2
  71. data/app/models/spree/tax_rate.rb +1 -1
  72. data/app/models/spree/tax_rate_tax_category.rb +2 -2
  73. data/app/models/spree/unit_cancel.rb +5 -2
  74. data/app/models/spree/user_address.rb +2 -2
  75. data/app/models/spree/user_stock_location.rb +2 -2
  76. data/app/models/spree/variant/scopes.rb +37 -29
  77. data/app/models/spree/variant.rb +1 -1
  78. data/app/models/spree/variant_property_rule.rb +1 -1
  79. data/app/models/spree/variant_property_rule_condition.rb +2 -2
  80. data/app/models/spree/variant_property_rule_value.rb +2 -2
  81. data/app/models/spree/wallet_payment_source.rb +2 -2
  82. data/app/models/spree/zone_member.rb +2 -2
  83. data/config/initializers/inflections.rb +5 -0
  84. data/config/locales/en.yml +22 -3
  85. data/lib/generators/spree/dummy/dummy_generator.rb +2 -0
  86. data/lib/generators/spree/install/install_generator.rb +0 -3
  87. data/lib/spree/core/controller_helpers/strong_parameters.rb +7 -21
  88. data/lib/spree/core/environment_extension.rb +0 -9
  89. data/lib/spree/core/importer/order.rb +3 -4
  90. data/lib/spree/core/importer/product.rb +2 -2
  91. data/lib/spree/core/version.rb +1 -1
  92. data/lib/spree/permission_sets/default_customer.rb +1 -1
  93. data/lib/spree/permitted_attributes.rb +6 -75
  94. data/lib/spree/testing_support/dummy_app/rake_tasks.rb +6 -2
  95. data/solidus_core.gemspec +4 -4
  96. data/spec/lib/search/base_spec.rb +5 -1
  97. data/spec/lib/search/variant_spec.rb +1 -1
  98. data/spec/lib/spree/core/controller_helpers/strong_parameters_spec.rb +1 -8
  99. data/spec/lib/spree/core/environment_extension_spec.rb +1 -12
  100. data/spec/lib/spree/event_spec.rb +15 -3
  101. data/spec/migrate/20190106184413_remove_code_from_spree_promotions_spec.rb +18 -4
  102. data/spec/models/spree/calculator/refunds/default_refund_amount_spec.rb +1 -1
  103. data/spec/models/spree/carton_spec.rb +2 -2
  104. data/spec/models/spree/concerns/user_methods_spec.rb +3 -3
  105. data/spec/models/spree/credit_card_spec.rb +2 -2
  106. data/spec/models/spree/customer_return_spec.rb +1 -1
  107. data/spec/models/spree/order/checkout_spec.rb +1 -1
  108. data/spec/models/spree/order/outstanding_balance_integration_spec.rb +5 -5
  109. data/spec/models/spree/order/payment_spec.rb +1 -1
  110. data/spec/models/spree/order_contents_spec.rb +1 -1
  111. data/spec/models/spree/order_inventory_spec.rb +3 -3
  112. data/spec/models/spree/order_shipping_spec.rb +1 -1
  113. data/spec/models/spree/order_spec.rb +6 -6
  114. data/spec/models/spree/payment_create_spec.rb +2 -2
  115. data/spec/models/spree/payment_spec.rb +12 -12
  116. data/spec/models/spree/promotion/rules/first_repeat_purchase_since_spec.rb +2 -2
  117. data/spec/models/spree/promotion/rules/nth_order_spec.rb +2 -2
  118. data/spec/models/spree/promotion/rules/taxon_spec.rb +0 -1
  119. data/spec/models/spree/promotion_spec.rb +0 -4
  120. data/spec/models/spree/reimbursement_type/original_payment_spec.rb +2 -2
  121. data/spec/models/spree/return_item_spec.rb +11 -11
  122. data/spec/models/spree/shipment_spec.rb +6 -6
  123. data/spec/models/spree/stock/inventory_units_finalizer_spec.rb +4 -4
  124. data/spec/models/spree/stock/quantifier_spec.rb +2 -2
  125. data/spec/models/spree/store_credit_spec.rb +7 -7
  126. data/spec/models/spree/tax_category_spec.rb +1 -1
  127. data/spec/models/spree/taxon_spec.rb +2 -2
  128. data/spec/models/spree/unit_cancel_spec.rb +5 -0
  129. data/spec/models/spree/user_spec.rb +3 -3
  130. metadata +32 -32
  131. data/spec/lib/spree/permitted_attributes_spec.rb +0 -41
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.9.6
4
+ version: 2.10.0.beta1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Solidus Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-07-16 00:00:00.000000000 Z
11
+ date: 2019-09-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.1'
20
20
  - - "<"
21
21
  - !ruby/object:Gem::Version
22
- version: 5.3.x
22
+ version: 7.0.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.1'
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
- version: 5.3.x
32
+ version: 7.0.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.1'
40
40
  - - "<"
41
41
  - !ruby/object:Gem::Version
42
- version: 5.3.x
42
+ version: 7.0.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.1'
50
50
  - - "<"
51
51
  - !ruby/object:Gem::Version
52
- version: 5.3.x
52
+ version: 7.0.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.1'
60
60
  - - "<"
61
61
  - !ruby/object:Gem::Version
62
- version: 5.3.x
62
+ version: 7.0.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.1'
70
70
  - - "<"
71
71
  - !ruby/object:Gem::Version
72
- version: 5.3.x
72
+ version: 7.0.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.1'
80
80
  - - "<"
81
81
  - !ruby/object:Gem::Version
82
- version: 5.3.x
82
+ version: 7.0.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.1'
90
90
  - - "<"
91
91
  - !ruby/object:Gem::Version
92
- version: 5.3.x
92
+ version: 7.0.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.1'
100
100
  - - "<"
101
101
  - !ruby/object:Gem::Version
102
- version: 5.3.x
102
+ version: 7.0.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.1'
110
110
  - - "<"
111
111
  - !ruby/object:Gem::Version
112
- version: 5.3.x
112
+ version: 7.0.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.1'
120
120
  - - "<"
121
121
  - !ruby/object:Gem::Version
122
- version: 5.3.x
122
+ version: 7.0.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.1'
130
130
  - - "<"
131
131
  - !ruby/object:Gem::Version
132
- version: 5.3.x
132
+ version: 7.0.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.1'
140
140
  - - "<"
141
141
  - !ruby/object:Gem::Version
142
- version: 5.3.x
142
+ version: 7.0.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.1'
150
150
  - - "<"
151
151
  - !ruby/object:Gem::Version
152
- version: 5.3.x
152
+ version: 7.0.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.1'
160
160
  - - "<"
161
161
  - !ruby/object:Gem::Version
162
- version: 5.3.x
162
+ version: 7.0.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.1'
170
170
  - - "<"
171
171
  - !ruby/object:Gem::Version
172
- version: 5.3.x
172
+ version: 7.0.x
173
173
  - !ruby/object:Gem::Dependency
174
174
  name: activemerchant
175
175
  requirement: !ruby/object:Gem::Requirement
@@ -204,34 +204,34 @@ dependencies:
204
204
  requirements:
205
205
  - - "~>"
206
206
  - !ruby/object:Gem::Version
207
- version: '3.0'
208
- - - ">="
209
- - !ruby/object:Gem::Version
210
- version: 3.0.1
207
+ version: '3.2'
211
208
  type: :runtime
212
209
  prerelease: false
213
210
  version_requirements: !ruby/object:Gem::Requirement
214
211
  requirements:
215
212
  - - "~>"
216
213
  - !ruby/object:Gem::Version
217
- version: '3.0'
218
- - - ">="
219
- - !ruby/object:Gem::Version
220
- version: 3.0.1
214
+ version: '3.2'
221
215
  - !ruby/object:Gem::Dependency
222
216
  name: cancancan
223
217
  requirement: !ruby/object:Gem::Requirement
224
218
  requirements:
225
- - - "~>"
219
+ - - ">="
226
220
  - !ruby/object:Gem::Version
227
221
  version: '2.2'
222
+ - - "<"
223
+ - !ruby/object:Gem::Version
224
+ version: '4.0'
228
225
  type: :runtime
229
226
  prerelease: false
230
227
  version_requirements: !ruby/object:Gem::Requirement
231
228
  requirements:
232
- - - "~>"
229
+ - - ">="
233
230
  - !ruby/object:Gem::Version
234
231
  version: '2.2'
232
+ - - "<"
233
+ - !ruby/object:Gem::Version
234
+ version: '4.0'
235
235
  - !ruby/object:Gem::Dependency
236
236
  name: carmen
237
237
  requirement: !ruby/object:Gem::Requirement
@@ -356,14 +356,14 @@ dependencies:
356
356
  requirements:
357
357
  - - "~>"
358
358
  - !ruby/object:Gem::Version
359
- version: '0.4'
359
+ version: '0.6'
360
360
  type: :runtime
361
361
  prerelease: false
362
362
  version_requirements: !ruby/object:Gem::Requirement
363
363
  requirements:
364
364
  - - "~>"
365
365
  - !ruby/object:Gem::Version
366
- version: '0.4'
366
+ version: '0.6'
367
367
  description: Essential models, mailers, and classes for the Solidus e-commerce project.
368
368
  email: contact@solidus.io
369
369
  executables: []
@@ -656,6 +656,7 @@ files:
656
656
  - app/views/spree/test_mailer/test_email.text.erb
657
657
  - config/initializers/assets.rb
658
658
  - config/initializers/friendly_id.rb
659
+ - config/initializers/inflections.rb
659
660
  - config/initializers/money.rb
660
661
  - config/locales/en.yml
661
662
  - db/default/spree/countries.rb
@@ -971,7 +972,6 @@ files:
971
972
  - spec/lib/spree/migrations_spec.rb
972
973
  - spec/lib/spree/money_spec.rb
973
974
  - spec/lib/spree/permission_sets/default_customer_spec.rb
974
- - spec/lib/spree/permitted_attributes_spec.rb
975
975
  - spec/lib/spree/promo/environment_spec.rb
976
976
  - spec/lib/tasks/dummy_task.rake
977
977
  - spec/lib/tasks/dummy_task_spec.rb
@@ -1230,7 +1230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1230
1230
  - !ruby/object:Gem::Version
1231
1231
  version: 1.8.23
1232
1232
  requirements: []
1233
- rubygems_version: 3.0.3
1233
+ rubygems_version: 3.0.6
1234
1234
  signing_key:
1235
1235
  specification_version: 4
1236
1236
  summary: Essential models, mailers, and classes for the Solidus e-commerce project.
data/spec/lib/spree/permitted_attributes_spec.rb DELETED
@@ -1,41 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- require "rails_helper"
4
-
5
- RSpec.describe Spree::PermittedAttributes do
6
- describe ".checkout_attributes" do
7
- subject(:permitted_attributes) { described_class }
8
-
9
- it "when read emits a deprecation warning and return all steps attributes" do
10
- expect(Spree::Deprecation).to receive(:warn)
11
- all_attributes = permitted_attributes.checkout_attributes
12
-
13
- expect(all_attributes).to include(*permitted_attributes.checkout_address_attributes)
14
- expect(all_attributes).to include(*permitted_attributes.checkout_delivery_attributes)
15
- expect(all_attributes).to include(*permitted_attributes.checkout_payment_attributes)
16
- end
17
-
18
- it "when changed emits a deprecation warning and push changes to all steps' attributes" do
19
- expect(Spree::Deprecation).to receive(:warn).exactly(4).times
20
- permitted_attributes.checkout_attributes.push :appended_attribute
21
- permitted_attributes.checkout_attributes.append :appended_with_alias_attribute
22
- permitted_attributes.checkout_attributes << :another_appended_attribute
23
- permitted_attributes.checkout_attributes.prepend :prepended_attribute
24
-
25
- checkout_steps_attributes = [
26
- permitted_attributes.checkout_address_attributes,
27
- permitted_attributes.checkout_delivery_attributes,
28
- permitted_attributes.checkout_payment_attributes,
29
- permitted_attributes.checkout_confirm_attributes
30
- ]
31
-
32
- checkout_steps_attributes.each do |step_attributes|
33
- expect(step_attributes).to include(
34
- :appended_attribute,
35
- :appended_with_alias_attribute,
36
- :another_appended_attribute,
37
- :prepended_attribute)
38
- end
39
- end
40
- end
41
- end