solidus_core 2.8.6 → 2.9.0.rc.1

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 (141) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/logo/solidus.svg +1 -18
  3. data/app/assets/images/logo/solidus_logo.png +0 -0
  4. data/app/mailers/spree/test_mailer.rb +2 -0
  5. data/app/models/concerns/spree/default_price.rb +1 -1
  6. data/app/models/concerns/spree/ransackable_attributes.rb +1 -1
  7. data/app/models/concerns/spree/user_reporting.rb +1 -1
  8. data/app/models/spree/billing_integration.rb +7 -2
  9. data/app/models/spree/country.rb +2 -0
  10. data/app/models/spree/customer_return.rb +1 -1
  11. data/app/models/spree/image.rb +2 -44
  12. data/app/models/spree/image/paperclip_attachment.rb +55 -0
  13. data/app/models/spree/inventory_unit.rb +0 -1
  14. data/app/models/spree/option_type.rb +2 -0
  15. data/app/models/spree/option_value.rb +1 -1
  16. data/app/models/spree/order.rb +8 -13
  17. data/app/models/spree/payment.rb +1 -1
  18. data/app/models/spree/payment_method.rb +8 -4
  19. data/app/models/spree/product.rb +1 -1
  20. data/app/models/spree/promotion.rb +18 -11
  21. data/app/models/spree/promotion/rules/first_order.rb +1 -3
  22. data/app/models/spree/promotion/rules/item_total.rb +9 -1
  23. data/app/models/spree/promotion/rules/one_use_per_user.rb +2 -2
  24. data/app/models/spree/promotion/rules/product.rb +3 -3
  25. data/app/models/spree/promotion/rules/taxon.rb +5 -8
  26. data/app/models/spree/promotion/rules/user_logged_in.rb +1 -1
  27. data/app/models/spree/promotion_handler/coupon.rb +19 -3
  28. data/app/models/spree/property.rb +2 -0
  29. data/app/models/spree/reimbursement.rb +5 -5
  30. data/app/models/spree/return_item.rb +6 -2
  31. data/app/models/spree/state.rb +6 -0
  32. data/app/models/spree/stock/location_filter/active.rb +14 -0
  33. data/app/models/spree/stock/location_filter/base.rb +43 -0
  34. data/app/models/spree/stock/simple_coordinator.rb +4 -1
  35. data/app/models/spree/stock_location.rb +2 -0
  36. data/app/models/spree/tax_category.rb +11 -0
  37. data/app/models/spree/taxon.rb +4 -11
  38. data/app/models/spree/taxon/paperclip_attachment.rb +21 -0
  39. data/app/models/spree/taxonomy.rb +2 -0
  40. data/app/models/spree/unit_cancel.rb +12 -1
  41. data/app/models/spree/variant.rb +1 -1
  42. data/app/models/spree/variant/pricing_options.rb +10 -0
  43. data/app/models/spree/wallet_payment_source.rb +26 -10
  44. data/app/models/spree/zone.rb +1 -1
  45. data/app/views/spree/order_mailer/inventory_cancellation_email.text.erb +3 -3
  46. data/config/locales/en.yml +26 -53
  47. data/db/default/spree/store_credit.rb +1 -0
  48. data/db/migrate/20161123154034_add_available_to_users_and_remove_display_on_from_shipping_methods.rb +1 -1
  49. data/db/migrate/20170608074534_rename_bogus_gateways.rb +9 -8
  50. data/db/migrate/20190220093635_drop_spree_store_credit_update_reasons.rb +19 -0
  51. data/lib/generators/spree/install/install_generator.rb +0 -3
  52. data/lib/generators/spree/install/templates/config/initializers/spree.rb.tt +3 -0
  53. data/lib/solidus/migrations/rename_gateways.rb +2 -0
  54. data/lib/spree/app_configuration.rb +24 -0
  55. data/lib/spree/core.rb +1 -0
  56. data/lib/spree/core/controller_helpers/pricing.rb +1 -4
  57. data/lib/spree/core/controller_helpers/strong_parameters.rb +7 -21
  58. data/lib/spree/core/engine.rb +5 -0
  59. data/lib/spree/core/importer/order.rb +1 -3
  60. data/lib/spree/core/stock_configuration.rb +5 -0
  61. data/lib/spree/core/version.rb +3 -1
  62. data/lib/spree/deprecation.rb +50 -0
  63. data/lib/spree/event.rb +111 -0
  64. data/lib/spree/event/adapters/active_support_notifications.rb +35 -0
  65. data/lib/spree/event/configuration.rb +17 -0
  66. data/lib/spree/event/processors/mailer_processor.rb +27 -0
  67. data/lib/spree/event/subscriber.rb +84 -0
  68. data/lib/spree/permitted_attributes.rb +7 -76
  69. data/lib/spree/testing_support/capybara_ext.rb +15 -0
  70. data/lib/spree/testing_support/common_rake.rb +1 -1
  71. data/lib/spree/testing_support/dummy_app.rb +3 -10
  72. data/lib/spree/testing_support/factories/promotion_factory.rb +10 -0
  73. data/lib/spree/testing_support/factories/return_item_factory.rb +1 -0
  74. data/lib/spree/testing_support/preferences.rb +62 -0
  75. data/lib/tasks/email.rake +2 -0
  76. data/lib/tasks/migrations/copy_order_bill_address_to_credit_card.rake +4 -0
  77. data/lib/tasks/migrations/migrate_shipping_rate_taxes.rake +2 -0
  78. data/lib/tasks/migrations/migrate_user_addresses.rake +3 -0
  79. data/lib/tasks/migrations/rename_gateways.rake +2 -0
  80. data/lib/tasks/order_capturing.rake +2 -0
  81. data/spec/helpers/base_helper_spec.rb +3 -3
  82. data/spec/helpers/products_helper_spec.rb +2 -2
  83. data/spec/{models → lib}/spree/app_configuration_spec.rb +11 -1
  84. data/spec/lib/spree/core/controller_helpers/pricing_spec.rb +13 -0
  85. data/spec/lib/spree/core/controller_helpers/strong_parameters_spec.rb +1 -8
  86. data/spec/lib/spree/core/testing_support/factories/shipping_method_factory_spec.rb +1 -1
  87. data/spec/lib/spree/core/testing_support/preferences_spec.rb +33 -0
  88. data/spec/lib/spree/event/subscriber_spec.rb +85 -0
  89. data/spec/lib/spree/event_spec.rb +92 -0
  90. data/spec/lib/spree/money_spec.rb +3 -9
  91. data/spec/lib/tasks/migrations/migrate_shipping_rate_taxes_spec.rb +5 -3
  92. data/spec/mailers/order_mailer_spec.rb +1 -1
  93. data/spec/mailers/test_mailer_spec.rb +3 -1
  94. data/spec/models/spree/address_spec.rb +5 -4
  95. data/spec/models/spree/concerns/user_address_book_spec.rb +4 -4
  96. data/spec/models/spree/country_spec.rb +5 -5
  97. data/spec/models/spree/customer_return_spec.rb +1 -1
  98. data/spec/models/spree/order/checkout_spec.rb +3 -7
  99. data/spec/models/spree/order/finalizing_spec.rb +1 -1
  100. data/spec/models/spree/order/payment_spec.rb +3 -3
  101. data/spec/models/spree/order_inventory_spec.rb +1 -1
  102. data/spec/models/spree/order_spec.rb +67 -2
  103. data/spec/models/spree/order_updater_spec.rb +2 -2
  104. data/spec/models/spree/payment_spec.rb +12 -0
  105. data/spec/models/spree/product_spec.rb +3 -3
  106. data/spec/models/spree/promotion/rules/first_order_spec.rb +13 -3
  107. data/spec/models/spree/promotion/rules/item_total_spec.rb +15 -0
  108. data/spec/models/spree/promotion/rules/one_use_per_user_spec.rb +10 -0
  109. data/spec/models/spree/promotion/rules/product_spec.rb +15 -0
  110. data/spec/models/spree/promotion/rules/taxon_spec.rb +59 -8
  111. data/spec/models/spree/promotion/rules/user_logged_in_spec.rb +5 -0
  112. data/spec/models/spree/promotion_handler/shipping_spec.rb +1 -1
  113. data/spec/models/spree/promotion_spec.rb +80 -0
  114. data/spec/models/spree/reimbursement_spec.rb +3 -2
  115. data/spec/models/spree/return_item_spec.rb +9 -0
  116. data/spec/models/spree/shipment_spec.rb +3 -3
  117. data/spec/models/spree/stock/availability_spec.rb +1 -1
  118. data/spec/models/spree/stock/estimator_spec.rb +5 -7
  119. data/spec/models/spree/stock/location_filter/active_spec.rb +22 -0
  120. data/spec/models/spree/stock/location_sorter/default_first_spec.rb +4 -2
  121. data/spec/models/spree/stock/location_sorter/unsorted_spec.rb +3 -1
  122. data/spec/models/spree/stock/quantifier_spec.rb +1 -1
  123. data/spec/models/spree/stock/simple_coordinator_spec.rb +5 -0
  124. data/spec/models/spree/stock_item_spec.rb +3 -2
  125. data/spec/models/spree/stock_movement_spec.rb +1 -1
  126. data/spec/models/spree/store_credit_spec.rb +1 -1
  127. data/spec/models/spree/tax/order_adjuster_spec.rb +1 -1
  128. data/spec/models/spree/tax/taxation_integration_spec.rb +1 -1
  129. data/spec/models/spree/tax_category_spec.rb +21 -0
  130. data/spec/models/spree/taxon_spec.rb +28 -0
  131. data/spec/models/spree/unit_cancel_spec.rb +41 -0
  132. data/spec/models/spree/user_spec.rb +3 -3
  133. data/spec/models/spree/variant/pricing_options_spec.rb +23 -0
  134. data/spec/models/spree/variant/vat_price_generator_spec.rb +1 -1
  135. data/spec/models/spree/variant_spec.rb +11 -8
  136. data/spec/models/spree/wallet_payment_source_spec.rb +35 -6
  137. data/spec/models/spree/wallet_spec.rb +1 -1
  138. data/spec/spec_helper.rb +0 -4
  139. data/spec/support/concerns/default_price.rb +8 -0
  140. metadata +18 -5
  141. data/spec/lib/spree/permitted_attributes_spec.rb +0 -41
@@ -123,7 +123,7 @@ RSpec.describe Spree::Wallet, type: :model do
123
123
  end
124
124
 
125
125
  context 'with a wallet payment source that does not belong to the wallet' do
126
- let(:other_wallet_credit_card) { other_wallet.add(credit_card) }
126
+ let(:other_wallet_credit_card) { other_wallet.add(other_credit_card) }
127
127
  let(:other_wallet) { Spree::Wallet.new(other_user) }
128
128
  let(:other_credit_card) { create(:credit_card, user_id: other_user.id) }
129
129
  let(:other_user) { create(:user) }
@@ -22,10 +22,6 @@ RSpec.configure do |config|
22
22
  c.syntax = :expect
23
23
  end
24
24
 
25
- config.before :each do
26
- reset_spree_preferences
27
- end
28
-
29
25
  config.include Spree::TestingSupport::Preferences
30
26
  config.extend WithModel
31
27
 
@@ -32,5 +32,13 @@ RSpec.shared_examples_for "default_price" do
32
32
  describe '#has_default_price?' do
33
33
  subject { super().has_default_price? }
34
34
  it { is_expected.to be_truthy }
35
+
36
+ context 'when default price is discarded' do
37
+ before do
38
+ instance.default_price.discard
39
+ end
40
+
41
+ it { is_expected.to be_falsey }
42
+ end
35
43
  end
36
44
  end
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.8.6
4
+ version: 2.9.0.rc.1
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-07-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: actionmailer
@@ -445,6 +445,7 @@ files:
445
445
  - app/models/spree/gateway/bogus.rb
446
446
  - app/models/spree/gateway/bogus_simple.rb
447
447
  - app/models/spree/image.rb
448
+ - app/models/spree/image/paperclip_attachment.rb
448
449
  - app/models/spree/inventory_unit.rb
449
450
  - app/models/spree/legacy_user.rb
450
451
  - app/models/spree/line_item.rb
@@ -572,6 +573,8 @@ files:
572
573
  - app/models/spree/stock/inventory_unit_builder.rb
573
574
  - app/models/spree/stock/inventory_units_finalizer.rb
574
575
  - app/models/spree/stock/inventory_validator.rb
576
+ - app/models/spree/stock/location_filter/active.rb
577
+ - app/models/spree/stock/location_filter/base.rb
575
578
  - app/models/spree/stock/location_sorter/base.rb
576
579
  - app/models/spree/stock/location_sorter/default_first.rb
577
580
  - app/models/spree/stock/location_sorter/unsorted.rb
@@ -611,6 +614,7 @@ files:
611
614
  - app/models/spree/tax_rate.rb
612
615
  - app/models/spree/tax_rate_tax_category.rb
613
616
  - app/models/spree/taxon.rb
617
+ - app/models/spree/taxon/paperclip_attachment.rb
614
618
  - app/models/spree/taxonomy.rb
615
619
  - app/models/spree/unit_cancel.rb
616
620
  - app/models/spree/user_address.rb
@@ -687,6 +691,7 @@ files:
687
691
  - db/migrate/20180328172631_add_join_characters_to_promotion_code_batch.rb
688
692
  - db/migrate/20180710170104_create_spree_store_credit_reasons_table.rb
689
693
  - db/migrate/20190106184413_remove_code_from_spree_promotions.rb
694
+ - db/migrate/20190220093635_drop_spree_store_credit_update_reasons.rb
690
695
  - db/seeds.rb
691
696
  - lib/generators/spree/custom_user/custom_user_generator.rb
692
697
  - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -738,6 +743,11 @@ files:
738
743
  - lib/spree/core/validators/email.rb
739
744
  - lib/spree/core/version.rb
740
745
  - lib/spree/deprecation.rb
746
+ - lib/spree/event.rb
747
+ - lib/spree/event/adapters/active_support_notifications.rb
748
+ - lib/spree/event/configuration.rb
749
+ - lib/spree/event/processors/mailer_processor.rb
750
+ - lib/spree/event/subscriber.rb
741
751
  - lib/spree/i18n.rb
742
752
  - lib/spree/localized_number.rb
743
753
  - lib/spree/mailer_previews/carton_preview.rb
@@ -878,6 +888,7 @@ files:
878
888
  - spec/lib/i18n_spec.rb
879
889
  - spec/lib/search/base_spec.rb
880
890
  - spec/lib/search/variant_spec.rb
891
+ - spec/lib/spree/app_configuration_spec.rb
881
892
  - spec/lib/spree/core/class_constantizer_spec.rb
882
893
  - spec/lib/spree/core/controller_helpers/auth_spec.rb
883
894
  - spec/lib/spree/core/controller_helpers/order_spec.rb
@@ -952,11 +963,12 @@ files:
952
963
  - spec/lib/spree/core/testing_support/preferences_spec.rb
953
964
  - spec/lib/spree/core/validators/email_spec.rb
954
965
  - spec/lib/spree/core/version_spec.rb
966
+ - spec/lib/spree/event/subscriber_spec.rb
967
+ - spec/lib/spree/event_spec.rb
955
968
  - spec/lib/spree/localized_number_spec.rb
956
969
  - spec/lib/spree/migrations_spec.rb
957
970
  - spec/lib/spree/money_spec.rb
958
971
  - spec/lib/spree/permission_sets/default_customer_spec.rb
959
- - spec/lib/spree/permitted_attributes_spec.rb
960
972
  - spec/lib/tasks/dummy_task.rake
961
973
  - spec/lib/tasks/dummy_task_spec.rb
962
974
  - spec/lib/tasks/migrations/migrate_shipping_rate_taxes_spec.rb
@@ -970,7 +982,6 @@ files:
970
982
  - spec/models/spree/address_spec.rb
971
983
  - spec/models/spree/adjustment_reason_spec.rb
972
984
  - spec/models/spree/adjustment_spec.rb
973
- - spec/models/spree/app_configuration_spec.rb
974
985
  - spec/models/spree/asset_spec.rb
975
986
  - spec/models/spree/calculator/default_tax_spec.rb
976
987
  - spec/models/spree/calculator/distributed_amount_spec.rb
@@ -1139,6 +1150,7 @@ files:
1139
1150
  - spec/models/spree/stock/estimator_spec.rb
1140
1151
  - spec/models/spree/stock/inventory_unit_builder_spec.rb
1141
1152
  - spec/models/spree/stock/inventory_units_finalizer_spec.rb
1153
+ - spec/models/spree/stock/location_filter/active_spec.rb
1142
1154
  - spec/models/spree/stock/location_sorter/default_first_spec.rb
1143
1155
  - spec/models/spree/stock/location_sorter/unsorted_spec.rb
1144
1156
  - spec/models/spree/stock/package_spec.rb
@@ -1215,7 +1227,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1215
1227
  - !ruby/object:Gem::Version
1216
1228
  version: 1.8.23
1217
1229
  requirements: []
1218
- rubygems_version: 3.0.3
1230
+ rubyforge_project:
1231
+ rubygems_version: 2.7.3
1219
1232
  signing_key:
1220
1233
  specification_version: 4
1221
1234
  summary: Essential models, mailers, and classes for the Solidus e-commerce project.
@@ -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