solidus_core 2.7.4 → 2.8.0

data/lib/spree/testing_support/dummy_app/assets/javascripts/spree/frontend/all.js

@@ -5,6 +5,6 @@
 // the compiled file.
 //
 //= require jquery
-//= require jquery_ujs
+//= require rails-ujs
 //= require spree/frontend
 //= require_tree .

data/lib/spree/testing_support/factories/store_credit_event_factory.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'spree/testing_support/factories/store_credit_factory'
-require 'spree/testing_support/factories/store_credit_update_reason_factory'
+require 'spree/testing_support/factories/store_credit_reason_factory'
 
 FactoryBot.define do
   factory :store_credit_event, class: 'Spree::StoreCreditEvent' do
@@ -18,13 +18,13 @@ FactoryBot.define do
     end
 
     factory :store_credit_adjustment_event do
-      action             { Spree::StoreCredit::ADJUSTMENT_ACTION }
-      update_reason      { create(:store_credit_update_reason) }
+      action              { Spree::StoreCredit::ADJUSTMENT_ACTION }
+      store_credit_reason { create(:store_credit_reason) }
     end
 
     factory :store_credit_invalidate_event do
-      action             { Spree::StoreCredit::INVALIDATE_ACTION }
-      update_reason      { create(:store_credit_update_reason) }
+      action              { Spree::StoreCredit::INVALIDATE_ACTION }
+      store_credit_reason { create(:store_credit_reason) }
     end
   end
 end

data/lib/spree/testing_support/factories/{store_credit_update_reason_factory.rb → store_credit_reason_factory.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :store_credit_update_reason, class: 'Spree::StoreCreditUpdateReason' do
+  factory :store_credit_reason, class: 'Spree::StoreCreditReason' do
     name { "Input error" }
   end
 end

data/lib/spree/testing_support/partial_double_verification.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+RSpec.configure do |config|
+  config.mock_with :rspec do |c|
+    c.verify_partial_doubles = true
+  end
+
+  config.around(:each, partial_double_verification: false) do |example|
+    without_partial_double_verification do
+      example.run
+    end
+  end
+end

data/lib/spree/testing_support/shared_examples/gallery.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'a gallery' do
+  describe '#images' do
+    subject { gallery.images }
+
+    it { is_expected.to be_empty }
+
+    context 'there are images' do
+      include_context 'has multiple images'
+
+      it 'has the associated images' do
+        expect(subject.map { |picture| picture.id }).
+          to match_array([first_image.id, second_image.id])
+      end
+    end
+  end
+end

data/spec/helpers/products_helper_spec.rb

@@ -15,7 +15,9 @@ module Spree
     end
 
     before do
-      allow(helper).to receive(:current_pricing_options) { pricing_options }
+      without_partial_double_verification do
+        allow(helper).to receive(:current_pricing_options) { pricing_options }
+      end
     end
 
     context "#variant_price_diff" do
@@ -31,7 +33,7 @@ module Spree
         context "when variant is more than master" do
           let(:variant_price) { 15 }
 
-          it { is_expected.to eq("(Add: $5.00)") }
+          it { is_expected.to eq("(Add: <span class=\"money-currency-symbol\">$</span><span class=\"money-whole\">5</span><span class=\"money-decimal-mark\">.</span><span class=\"money-decimal\">00</span>)") }
           # Regression test for https://github.com/spree/spree/issues/2737
           it { is_expected.to be_html_safe }
         end
@@ -39,7 +41,7 @@ module Spree
         context "when variant is less than master" do
           let(:product_price) { 15 }
 
-          it { is_expected.to eq("(Subtract: $5.00)") }
+          it { is_expected.to eq("(Subtract: <span class=\"money-currency-symbol\">$</span><span class=\"money-whole\">5</span><span class=\"money-decimal-mark\">.</span><span class=\"money-decimal\">00</span>)") }
         end
       end
 
@@ -56,13 +58,13 @@ module Spree
         context "when variant is more than master" do
           let(:variant_price) { 150 }
 
-          it { is_expected.to eq("(Add: &#x00A5;50)") }
+          it { is_expected.to eq("(Add: <span class=\"money-currency-symbol\">&#x00A5;</span><span class=\"money-whole\">50</span>)") }
         end
 
         context "when variant is less than master" do
           let(:product_price) { 150 }
 
-          it { is_expected.to eq("(Subtract: &#x00A5;50)") }
+          it { is_expected.to eq("(Subtract: <span class=\"money-currency-symbol\">&#x00A5;</span><span class=\"money-whole\">50</span>)") }
         end
       end
     end
@@ -79,8 +81,8 @@ module Spree
 
       context "when currency is default" do
         it "should return the variant price if the price is different than master" do
-          expect(helper.variant_price(variant)).to eq("$15.00")
-          expect(helper.variant_price(variant_2)).to eq("$20.00")
+          expect(helper.variant_price(variant)).to eq("<span class=\"money-currency-symbol\">$</span><span class=\"money-whole\">15</span><span class=\"money-decimal-mark\">.</span><span class=\"money-decimal\">00</span>")
+          expect(helper.variant_price(variant_2)).to eq("<span class=\"money-currency-symbol\">$</span><span class=\"money-whole\">20</span><span class=\"money-decimal-mark\">.</span><span class=\"money-decimal\">00</span>")
         end
       end
 
@@ -95,7 +97,7 @@ module Spree
         end
 
         it "should return the variant price if the price is different than master" do
-          expect(helper.variant_price(variant)).to eq("&#x00A5;150")
+          expect(helper.variant_price(variant)).to eq("<span class=\"money-currency-symbol\">&#x00A5;</span><span class=\"money-whole\">150</span>")
         end
       end
 

data/spec/helpers/taxons_helper_spec.rb

@@ -8,7 +8,9 @@ RSpec.describe Spree::TaxonsHelper, type: :helper do
     Spree::Config.pricing_options_class.new(currency: currency)
   end
   before do
-    allow(helper).to receive(:current_pricing_options) { pricing_options }
+    without_partial_double_verification do
+      allow(helper).to receive(:current_pricing_options) { pricing_options }
+    end
   end
 
   describe "#taxon_preview" do

data/spec/lib/i18n_spec.rb

@@ -30,23 +30,28 @@ RSpec.describe "i18n" do
   end
 
   it "translates within the spree scope" do
+    expect(Spree::Deprecation).to receive(:warn).twice
     expect(Spree.t(:foo)).to eql("bar")
     expect(Spree.translate(:foo)).to eql("bar")
   end
 
   it "prepends a string scope" do
+    expect(Spree::Deprecation).to receive(:warn)
     expect(Spree.t(:foo, scope: "bar")).to eql("bar within bar scope")
   end
 
   it "prepends to an array scope" do
+    expect(Spree::Deprecation).to receive(:warn)
     expect(Spree.t(:foo, scope: ["bar"])).to eql("bar within bar scope")
   end
 
   it "returns two translations" do
+    expect(Spree::Deprecation).to receive(:warn)
     expect(Spree.t([:foo, 'bar.foo'])).to eql(["bar", "bar within bar scope"])
   end
 
   it "returns reasonable string for missing translations" do
+    expect(Spree::Deprecation).to receive(:warn)
     expect(Spree.t(:missing_entry)).to include("<span")
   end
 

data/spec/lib/spree/core/controller_helpers/auth_spec.rb

@@ -55,11 +55,15 @@ RSpec.describe Spree::Core::ControllerHelpers::Auth, type: :controller do
 
   describe '#try_spree_current_user' do
     it 'calls spree_current_user when define spree_current_user method' do
-      expect(controller).to receive(:spree_current_user)
+      without_partial_double_verification do
+        expect(controller).to receive(:spree_current_user)
+      end
       controller.try_spree_current_user
     end
     it 'calls current_spree_user when define current_spree_user method' do
-      expect(controller).to receive(:current_spree_user)
+      without_partial_double_verification do
+        expect(controller).to receive(:current_spree_user)
+      end
       controller.try_spree_current_user
     end
     it 'returns nil' do

data/spec/lib/spree/core/stock_configuration_spec.rb

@@ -20,6 +20,7 @@ RSpec.describe Spree::Core::StockConfiguration do
       end
     end
   end
+
   describe '#estimator_class' do
     let(:stock_configuration) { described_class.new }
     subject { stock_configuration.estimator_class }
@@ -37,4 +38,22 @@ RSpec.describe Spree::Core::StockConfiguration do
       end
     end
   end
+
+  describe '#location_sorter_class' do
+    let(:stock_configuration) { described_class.new }
+    subject { stock_configuration.location_sorter_class }
+
+    it "returns Spree::Stock::LocationSorter::Unsorted" do
+      is_expected.to be ::Spree::Stock::LocationSorter::Unsorted
+    end
+
+    context "with another constant name assiged" do
+      MySorter = Class.new
+      before { stock_configuration.location_sorter_class = MySorter.to_s }
+
+      it "returns the constant" do
+        is_expected.to be MySorter
+      end
+    end
+  end
 end

data/spec/lib/spree/core/testing_support/factories/store_credit_reason_factory_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'spree/testing_support/factories/store_credit_reason_factory'
+
+RSpec.describe 'store credit reason factory' do
+  let(:factory_class) { Spree::StoreCreditReason }
+
+  describe 'store credit reason' do
+    let(:factory) { :store_credit_reason }
+
+    it_behaves_like 'a working factory'
+  end
+end

data/spec/lib/spree/money_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-require 'spree/money'
+require 'rails_helper'
 
 RSpec.describe Spree::Money do
   before do
@@ -97,7 +96,7 @@ RSpec.describe Spree::Money do
 
   context "with currency" do
     it "passed in option" do
-      money = Spree::Money.new(10, with_currency: true, html: false)
+      money = Spree::Money.new(10, with_currency: true, html_wrap: false)
       expect(money.to_s).to eq("$10.00 USD")
     end
   end
@@ -117,14 +116,14 @@ RSpec.describe Spree::Money do
   context "currency parameter" do
     context "when currency is specified in Canadian Dollars" do
       it "uses the currency param over the global configuration" do
-        money = Spree::Money.new(10, currency: 'CAD', with_currency: true, html: false)
+        money = Spree::Money.new(10, currency: 'CAD', with_currency: true, html_wrap: false)
         expect(money.to_s).to eq("$10.00 CAD")
       end
     end
 
     context "when currency is specified in Japanese Yen" do
       it "uses the currency param over the global configuration" do
-        money = Spree::Money.new(100, currency: 'JPY', html: false)
+        money = Spree::Money.new(100, currency: 'JPY', html_wrap: false)
         expect(money.to_s).to eq("¥100")
       end
     end
@@ -132,12 +131,12 @@ RSpec.describe Spree::Money do
 
   context "symbol positioning" do
     it "passed in option" do
-      money = Spree::Money.new(10, symbol_position: :after, html: false)
+      money = Spree::Money.new(10, format: '%n %u', html_wrap: false)
       expect(money.to_s).to eq("10.00 $")
     end
 
     it "config option" do
-      money = Spree::Money.new(10, symbol_position: :after, html: false)
+      money = Spree::Money.new(10, format: '%n %u', html_wrap: false)
       expect(money.to_s).to eq("10.00 $")
     end
   end
@@ -162,7 +161,7 @@ RSpec.describe Spree::Money do
     end
 
     it "formats correctly" do
-      money = Spree::Money.new(1000, html: false)
+      money = Spree::Money.new(1000, html_wrap: false)
       expect(money.to_s).to eq("¥1,000")
     end
   end
@@ -176,20 +175,20 @@ RSpec.describe Spree::Money do
 
     # Regression test for https://github.com/spree/spree/issues/2634
     it "formats as plain by default" do
-      money = Spree::Money.new(10, symbol_position: :after)
+      money = Spree::Money.new(10, format: '%n %u')
       expect(money.to_s).to eq("10.00 €")
     end
 
     it "formats as HTML if asked (nicely) to" do
-      money = Spree::Money.new(10, symbol_position: :after)
+      money = Spree::Money.new(10, format: '%n %u')
       # The HTML'ified version of "10.00 €"
-      expect(money.to_html).to eq("10.00 €")
+      expect(money.to_html).to eq("<span class=\"money-whole\">10</span><span class=\"money-decimal-mark\">.</span><span class=\"money-decimal\">00</span> <span class=\"money-currency-symbol\">&#x20AC;</span>")
     end
 
     it "formats as HTML with currency" do
-      money = Spree::Money.new(10, symbol_position: :after, with_currency: true)
+      money = Spree::Money.new(10, format: '%n %u', with_currency: true)
       # The HTML'ified version of "10.00 €"
-      expect(money.to_html).to eq("10.00&nbsp;&#x20AC; <span class=\"currency\">EUR</span>")
+      expect(money.to_html).to eq("<span class=\"money-whole\">10</span><span class=\"money-decimal-mark\">.</span><span class=\"money-decimal\">00</span> <span class=\"money-currency-symbol\">&#x20AC;</span> <span class=\"money-currency\">EUR</span>")
     end
   end
 

data/spec/migrate/20190106184413_remove_code_from_spree_promotions_spec.rb

@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require Spree::Core::Engine.root.join('db/migrate/20190106184413_remove_code_from_spree_promotions.rb')
+
+RSpec.describe RemoveCodeFromSpreePromotions do
+  let(:migrations_paths) { ActiveRecord::Migrator.migrations_paths }
+  let(:migrations) do
+    if ActiveRecord::Base.connection.respond_to?(:migration_context)
+      # Rails >= 5.2
+      ActiveRecord::MigrationContext.new(migrations_paths).migrations
+    else
+      ActiveRecord::Migrator.migrations(migrations_paths)
+    end
+  end
+  let(:previous_version) { 20180710170104 }
+  let(:current_version) { 20190106184413 }
+
+  subject { ActiveRecord::Migrator.new(:up, migrations, current_version).migrate }
+
+  # This is needed for MySQL since it is not able to rollback to the previous
+  # state when database schema changes within that transaction.
+  before(:all) { self.use_transactional_tests = false }
+  after(:all)  { self.use_transactional_tests = true }
+
+  around do |example|
+    DatabaseCleaner.clean_with(:truncation)
+    # Silence migrations output in specs report.
+    ActiveRecord::Migration.suppress_messages do
+      # Migrate back to the previous version
+      ActiveRecord::Migrator.new(:down, migrations, previous_version).migrate
+      # If other tests using Spree::Promotion ran before this one, Rails has
+      # stored information about table's columns and we need to reset those
+      # since the migration changed the database structure.
+      Spree::Promotion.reset_column_information
+
+      example.run
+
+      # Re-update column information after the migration has been executed
+      # again in the example. This will make the promotion attributes cache
+      # ready for other tests.
+      Spree::Promotion.reset_column_information
+    end
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  context 'when there are no promotions with code' do
+    it 'does not call any promotion with code handler' do
+      expect(described_class).not_to receive(:promotions_with_code_handler)
+
+      subject
+    end
+  end
+
+  context 'when there are promotions with code' do
+    let(:promotion_with_code) { create(:promotion) }
+
+    before do
+      # We can't set code via factory since `code=` is currently raising
+      # an error, see more at:
+      # https://github.com/solidusio/solidus/blob/cf96b03eb9e80002b69736e082fd485c870ab5d9/core/app/models/spree/promotion.rb#L65
+      promotion_with_code.update_column(:code, 'Just An Old Promo Code')
+    end
+
+    context 'with the deafult handler (Solidus::Migrations::PromotionWithCodeHandlers::RaiseException)' do
+      it 'raise a StandardError exception' do
+        expect { subject }.to raise_error(StandardError)
+      end
+    end
+
+    context 'changing the default handler' do
+      before do
+        allow(described_class)
+          .to receive(:promotions_with_code_handler)
+          .and_return(promotions_with_code_handler)
+      end
+
+      context 'to Solidus::Migrations::PromotionWithCodeHandlers::MoveToSpreePromotionCode' do
+        let(:promotions_with_code_handler) { Solidus::Migrations::PromotionWithCodeHandlers::MoveToSpreePromotionCode }
+
+        context 'when there are no Spree::PromotionCode with the same value' do
+          it 'moves the code into a Spree::PromotionCode' do
+            migration_context = double('a migration context')
+            allow_any_instance_of(promotions_with_code_handler)
+              .to receive(:migration_context)
+              .and_return(migration_context)
+
+            expect(migration_context)
+              .to receive(:say)
+              .with("Creating Spree::PromotionCode with value 'just an old promo code' for Spree::Promotion with id '#{promotion_with_code.id}'")
+
+            expect { subject }
+              .to change { Spree::PromotionCode.all.size }
+              .from(0)
+              .to(1)
+          end
+        end
+
+        context 'when there is a Spree::PromotionCode with the same value' do
+          context 'associated with the same promotion' do
+            let!(:existing_promotion_code) { create(:promotion_code, value: 'just an old promo code', promotion: promotion_with_code) }
+
+            it 'does not create a new Spree::PromotionCode' do
+              expect { subject }.not_to change { Spree::PromotionCode.all.size }
+            end
+          end
+
+          context 'associated with another promotion' do
+            let!(:existing_promotion_code) { create(:promotion_code, value: 'just an old promo code') }
+
+            it 'raises an exception' do
+              expect { subject }.to raise_error(StandardError)
+            end
+          end
+        end
+      end
+
+      context 'to Solidus::Migrations::PromotionWithCodeHandlers::DoNothing' do
+        let(:promotions_with_code_handler) { Solidus::Migrations::PromotionWithCodeHandlers::DoNothing }
+
+        it 'just prints a message' do
+          migration_context = double('a migration context')
+          allow_any_instance_of(promotions_with_code_handler)
+            .to receive(:migration_context)
+            .and_return(migration_context)
+
+          expect(migration_context)
+            .to receive(:say)
+            .with("Code 'Just An Old Promo Code' is going to be removed from Spree::Promotion with id '#{promotion_with_code.id}'")
+
+          subject
+        end
+      end
+    end
+  end
+end