Merge branch 'solidusio:master' into make-sample-load-depend-on-seed

Author: lsizani

.circleci/config.yml

@@ -3,7 +3,6 @@ version: 2.1
 orbs:
   browser-tools: circleci/browser-tools@1.3
   codecov: codecov/codecov@3.2.3
-  slack: circleci/slack@4.9.3
 
 executors:
   base:
@@ -85,13 +84,6 @@ commands:
           paths:
             - vendor/bundle
 
-  notify:
-    steps:
-      - slack/notify:
-          event: fail
-          template: basic_fail_1
-          branch_pattern: master, v[0-9]+\.[0-9]+
-
   test:
     steps:
       - run:
@@ -169,16 +161,16 @@ commands:
             cat /tmp/.tool-versions
       - restore_cache:
           keys:
-            - solidus-installer-v6-{{ checksum "/tmp/.tool-versions" }}
-            - solidus-installer-v6-
+            - solidus-installer-v7-{{ checksum "/tmp/.tool-versions" }}
+            - solidus-installer-v7-
       - run:
           name: "Prepare the rails application"
           command: |
             cd /tmp
             test -d my_app || gem install rails solidus
-            test -d my_app || rails new my_app --skip-javascript --skip-git
+            test -d my_app || rails new my_app --skip-git
       - save_cache:
-          key: solidus-installer-v5-{{ checksum "/tmp/.tool-versions" }}
+          key: solidus-installer-v7-{{ checksum "/tmp/.tool-versions" }}
           paths:
             - /tmp/my_app
             - /home/circleci/.rubygems
@@ -247,7 +239,6 @@ jobs:
             bundle add solidus --git "file://$(ruby -e"puts File.expand_path ENV['CIRCLE_WORKING_DIRECTORY']")"
             export LIB_NAME=set # dummy requireable file
             bundle exec rake -rrails -rspree/testing_support/extension_rake -e'Rake::Task["extension:test_app"].invoke'
-      - notify
 
   test_solidus:
     parameters:
@@ -279,7 +270,6 @@ jobs:
       - setup
       - libvips
       - test
-      - notify
 
   test_with_coverage:
     parameters:
@@ -301,7 +291,6 @@ jobs:
       - setup
       - libvips
       - test_with_coverage
-      - notify
 
   dev_tools:
     docker:
@@ -314,34 +303,27 @@ jobs:
             cd dev_tools
             bundle
             bundle exec rspec
-      - notify
 
 workflows:
   build:
     jobs:
-      - solidus_installer:
-          context: slack-secrets
+      - solidus_installer
 
       # Only test with coverage support with the default versions
       - test_with_coverage:
-          context: slack-secrets
           post-steps:
             - codecov/upload:
                 file: $COVERAGE_FILE
 
       # Based on supported versions for the current Solidus release and recommended versions from
       # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html.
       - test_solidus:
-          context: slack-secrets
           name: &name "test-rails-<<matrix.rails>>-ruby-<<matrix.ruby>>-<<matrix.database>>-<<#matrix.paperclip>>paperclip<</matrix.paperclip>><<^matrix.paperclip>>activestorage<</matrix.paperclip>><<#matrix.legacy_events>>-legacy_events<</matrix.legacy_events>>"
           matrix: { parameters: { rails: ['7.0'], ruby: ['3.1', '3.2'], database: ['mysql', 'sqlite', 'postgres'], paperclip: [true, false], legacy_events: [false] } }
       - test_solidus:
-          context: slack-secrets
           name: *name
           matrix: { parameters: { rails: ['6.1'], ruby: ['2.7', '3.0', '3.1'], database: ['sqlite'], paperclip: [false], legacy_events: [false] } }
       - test_solidus:
-          context: slack-secrets
           name: *name
           matrix: { parameters: { rails: ['6.0'], ruby: ['2.7'], database: ['sqlite'], paperclip: [true], legacy_events: [true] } }
-      - dev_tools:
-          context: slack-secrets
+      - dev_tools

bin/sandbox

@@ -47,8 +47,7 @@ unbundled bundle exec rails new sandbox --database="$RAILSDB" \
   --skip-keeps \
   --skip-rc \
   --skip-spring \
-  --skip-test \
-  --skip-javascript
+  --skip-test
 
 if [ ! -d "sandbox" ]; then
   echo 'sandbox rails application failed'

core/app/models/spree/wallet/add_payment_sources_to_wallet.rb

@@ -24,19 +24,19 @@ def add_to_wallet
       # add valid sources to wallet and optionally set a default
       if sources.any?
         # arbitrarily sort by id for picking a default
-        sources.sort_by(&:id).each do |source|
+        order_wallet_payment_sources = sources.sort_by(&:id).map do |source|
           order.user.wallet.add(source)
         end
 
-        make_default
+        make_default(order_wallet_payment_sources)
       end
     end
   end
 
   protected
 
-  def make_default
-    order.user.wallet.default_wallet_payment_source = order.user.wallet_payment_sources.last
+  def make_default(sources)
+    order.user.wallet.default_wallet_payment_source = sources.last
   end
 
   private

core/lib/spree/testing_support/dummy_app.rb

@@ -90,7 +90,7 @@ class Application < ::Rails::Application
     config.active_record.dump_schema_after_migration = false
 
     # Configure active storage to use storage within tmp folder
-    unless ENV['DISABLE_ACTIVE_STORAGE']
+    unless (ENV['DISABLE_ACTIVE_STORAGE'] == 'true')
       initializer 'solidus.active_storage' do
         config.active_storage.service_configurations = {
           test: {
@@ -140,7 +140,7 @@ class Application < ::Rails::Application
 Spree.config do |config|
   config.use_legacy_events = (ENV['USE_LEGACY_EVENTS'] == 'true')
 
-  if ENV['DISABLE_ACTIVE_STORAGE']
+  if (ENV['DISABLE_ACTIVE_STORAGE'] == 'true')
     config.image_attachment_module = 'Spree::Image::PaperclipAttachment'
     config.taxon_attachment_module = 'Spree::Taxon::PaperclipAttachment'
   end

core/spec/models/spree/concerns/active_storage_adapter/attachment_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-unless ENV['DISABLE_ACTIVE_STORAGE']
+unless (ENV['DISABLE_ACTIVE_STORAGE'] == 'true')
   RSpec.describe Spree::ActiveStorageAdapter::Attachment do
     describe '#variant' do
       it "converts to resize_to_limit when definition doesn't contain any special symbol" do

core/spec/models/spree/user_spec.rb

@@ -39,13 +39,13 @@
         stub_spree_preferences(completable_order_created_cutoff_days: 1)
       end
 
-      it "excludes orders updated outside of the cutoff date" do
+      it "excludes orders created outside of the cutoff date" do
         create(:order, user: user, created_by: user, created_at: 3.days.ago, updated_at: 2.days.ago)
         expect(user.last_incomplete_spree_order).to eq nil
       end
     end
 
-    context "with completable_order_created_cutoff set" do
+    context "with completable_order_updated_cutoff set" do
       before do
         stub_spree_preferences(completable_order_updated_cutoff_days: 1)
       end

core/spec/models/spree/wallet/add_payment_sources_to_wallet_spec.rb

@@ -4,14 +4,41 @@
 
 RSpec.describe Spree::Wallet::AddPaymentSourcesToWallet, type: :model do
   let(:order) { create(:order_ready_to_complete) }
+  let(:user) { order.user }
 
   describe '#add_to_wallet' do
     subject { described_class.new(order) }
 
+    before do
+      # Ensure the payment is reusable, otherwise false positives occur
+      allow_any_instance_of(Spree::CreditCard).to receive(:reusable?).and_return(true)
+    end
+
     it 'saves the payment source' do
       expect { subject.add_to_wallet }.to change {
         order.user.wallet.wallet_payment_sources.count
       }.by(1)
     end
+
+    context "when the default wallet payment source is used and a more recent wallet payment exists" do
+      before do
+        credit_card_one = user.wallet.add(create(:credit_card, user: user))
+        user.wallet.add(create(:credit_card, user: user))
+        user.wallet.default_wallet_payment_source = credit_card_one # must be the first created card
+        order.payments.first.update!(source: credit_card_one.payment_source)
+      end
+
+      it 'does not make a new wallet payment source' do
+        expect { subject.add_to_wallet }.to_not change {
+          order.user.wallet.wallet_payment_sources.count
+        }
+      end
+
+      it 'does not change the default wallet payment source' do
+        expect { subject.add_to_wallet }.to_not change {
+          user.wallet.default_wallet_payment_source
+        }
+      end
+    end
   end
 end

core/spec/rails_helper.rb

@@ -37,7 +37,7 @@
   config.use_transactional_fixtures = true
 
   config.before :suite do
-    FileUtils.rm_rf(Rails.configuration.active_storage.service_configurations[:test][:root]) unless ENV['DISABLE_ACTIVE_STORAGE']
+    FileUtils.rm_rf(Rails.configuration.active_storage.service_configurations[:test][:root]) unless (ENV['DISABLE_ACTIVE_STORAGE'] == 'true')
     DatabaseCleaner.clean_with :truncation
   end
 

sample/db/samples/assets.rb

@@ -82,11 +82,11 @@
 
 products[:solidus_tshirt].variants.each do |variant|
   color = variant.option_value("clothing-color").downcase
-  main_image = image["solidus_tshirt_#{color}", "png"]
+  main_image = image["solidus_tshirt_#{color}", "jpg"]
   File.open(main_image) do |f|
     variant.images.create!(attachment: f)
   end
-  back_image = image["solidus_tshirt_back_#{color}", "png"]
+  back_image = image["solidus_tshirt_back_#{color}", "jpg"]
 
   next unless back_image
 
@@ -97,11 +97,11 @@
 
 products[:solidus_long].variants.each do |variant|
   color = variant.option_value("clothing-color").downcase
-  main_image = image["solidus_long_#{color}", "png"]
+  main_image = image["solidus_long_#{color}", "jpg"]
   File.open(main_image) do |f|
     variant.images.create!(attachment: f)
   end
-  back_image = image["solidus_long_back_#{color}", "png"]
+  back_image = image["solidus_long_back_#{color}", "jpg"]
 
   next unless back_image
 
@@ -112,7 +112,7 @@
 
 products[:solidus_womens_tshirt].reload.variants.each do |variant|
   color = variant.option_value("clothing-color").downcase
-  main_image = image["solidus_womens_tshirt_#{color}", "png"]
+  main_image = image["solidus_womens_tshirt_#{color}", "jpg"]
   File.open(main_image) do |f|
     variant.images.create!(attachment: f)
   end