solidus_core 1.3.0.rc1 → 1.3.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9448c7bb96e59ed1cb4f56c29f66060c99a0abd5
-  data.tar.gz: e0cde0bf71c48efcaece95c384d457b4dd3c59ef
+  metadata.gz: f6b5b0a3568fe33572f315e0751a23fac38a4f4e
+  data.tar.gz: 9562633f680c89784fc2accad040216d8363759b
 SHA512:
-  metadata.gz: a24c63de0a3f6303aa9099fff4340f75c488a830f5a6443eafa9ec3add8a85f7d14f11085d1d7bc567661cd390676fc13c0781514dbc3a7598d31484745a4aa5
-  data.tar.gz: de47427d22d7d72d347f79347074844cdf87d1e0f3e5f3d8afbb312077c6be5e422bc0733b4bbaf0c6ddf5d3d151f82e3667c8e748eadc66af2862e2c4f7fd0d
+  metadata.gz: 917953facff8328caabe7164eda4fd5b42d05b1f5537660580b95f0ad109e2e68e11378d17dbb35651cb2c0809cc863380ec6b5a91065587b4f865bc4b36194a
+  data.tar.gz: 195cd6d1cc96d4d3581ed0d433a86685edc030f247b9c4fc76f77ff437820296ce83c4e3ab6279433a7332e9254099eeff42d1a4bc9bceb0ccbadcad03208ac0

data/app/models/concerns/spree/user_address_book.rb

@@ -108,7 +108,14 @@ module Spree
 
       if persisted?
         user_address.save!
-        user_addresses.reset # ensures proper ordering
+
+        # If these associations have already been accessed, they will be
+        # caching the existing values.
+        # user_addresses need to be reset to get the new ordering based on any changes
+        # {default_,}user_address needs to be reset as its result is likely to have changed.
+        user_addresses.reset
+        association(:default_user_address).reset
+        association(:default_address).reset
       end
 
       user_address.address

data/app/models/spree/app_configuration.rb

@@ -299,7 +299,7 @@ module Spree
     # @return [variant_price_selector_class] An instance of the pricing options class with default desired
     #   attributes
     def default_pricing_options
-      @default_pricing_options ||= pricing_options_class.new
+      pricing_options_class.new
     end
 
     attr_writer :variant_search_class

data/app/models/spree/gateway.rb

@@ -15,7 +15,7 @@ module Spree
       gateway_options = options
       gateway_options.delete :login if gateway_options.key?(:login) && gateway_options[:login].nil?
       if gateway_options[:server]
-        ActiveMerchant::Billing::Base.gateway_mode = gateway_options[:server].to_sym
+        ActiveMerchant::Billing::Base.mode = gateway_options[:server].to_sym
       end
       @provider ||= provider_class.new(gateway_options)
     end

data/app/models/spree/variant.rb

@@ -94,9 +94,11 @@ module Spree
     # Returns variants that are not deleted and have a price in the given
     # currency.
     #
+    # @deprecated Please use the .with_prices scope instead
     # @param currency [String] the currency to filter by; defaults to Spree's default
     # @return [ActiveRecord::Relation]
     def self.active(currency = nil)
+      Spree::Deprecation.warn("`Variant.active(currency)` is deprecated. Please use `Variant.with_prices(pricing_options)` instead.", caller)
       joins(:prices).where(deleted_at: nil).where('spree_prices.currency' => currency || Spree::Config[:currency]).where('spree_prices.amount IS NOT NULL')
     end
 
@@ -264,19 +266,23 @@ module Spree
 
     # Converts the variant's price to the given currency.
     #
+    # @deprecated Please use #price_for(pricing_options) instead
     # @param currency [String] the desired currency
     # @return [Spree::Price] the price in the desired currency
     def price_in(currency)
       prices.currently_valid.find_by(currency: currency)
     end
+    deprecate price_in: :price_for, deprecator: Spree::Deprecation
 
     # Fetches the price amount in the specified currency.
     #
+    # @deprecated Please use #price_for instead and use a money object rathern than a BigDecimal.
     # @param currency (see #price)
     # @return [Float] the amount in the specified currency.
     def amount_in(currency)
       price_in(currency).try(:amount)
     end
+    deprecate amount_in: :price_for, deprecator: Spree::Deprecation
 
     # Generates a friendly name and sku string.
     #

data/db/migrate/20140309033438_create_store_from_preferences.rb

@@ -27,6 +27,7 @@ class CreateStoreFromPreferences < ActiveRecord::Migration
         s.seo_title        = preference_store.get('spree/app_configuration/default_seo_title') {}
         s.default_currency = preference_store.get('spree/app_configuration/currency') {}
         s.code             = 'spree'
+        s.default          = true
       end.save!
     end
   end

data/db/migrate/20160608162651_ensure_default_store.rb

@@ -0,0 +1,13 @@
+class EnsureDefaultStore < ActiveRecord::Migration
+  class Store < ActiveRecord::Base
+    self.table_name = 'spree_stores'
+  end
+
+  def up
+    unless Store.where(default: true).exists?
+      store = Store.first
+      raise "Database has no stores. One should have been created in a previous migration." unless store
+      store.update_column(:default, true)
+    end
+  end
+end

data/db/migrate/20160608180751_ensure_store_on_orders.rb

@@ -0,0 +1,12 @@
+class EnsureStoreOnOrders < ActiveRecord::Migration
+  class Store < ActiveRecord::Base
+    self.table_name = 'spree_stores'
+  end
+  class Order < ActiveRecord::Base
+    self.table_name = 'spree_orders'
+  end
+  def up
+    default_store = Store.find_by(default: true)
+    Order.where(store_id: nil).update_all(store_id: default_store.id)
+  end
+end

data/lib/spree/core/price_migrator.rb

@@ -7,8 +7,6 @@ module Spree
       # We need to tag the exisiting prices as "default", so that the VatPriceGenerator knows
       # that they include the default zone's VAT.
       Spree::Config.admin_vat_country_iso = Spree::Zone.default_tax.countries.first.iso
-      # If we don't remove this ivar, the above line stays without effect because of caching.
-      Spree::Config.remove_instance_variable(:@default_pricing_options)
       Spree::Variant.find_each do |variant|
         new(variant).migrate_vat_prices
       end

data/lib/spree/core/version.rb

@@ -5,7 +5,7 @@ module Spree
   end
 
   def self.solidus_version
-    "1.3.0.rc1"
+    "1.3.0.rc2"
   end
 
   def self.solidus_gem_version

data/lib/tasks/migrations/create_vat_prices.rake

@@ -3,8 +3,12 @@ namespace :solidus do
     namespace :create_vat_prices do
       task up: :environment do
         print "Creating differentiated prices for VAT countries ... "
-        Spree::PriceMigrator.migrate_default_vat_prices
-        puts "Success."
+        if Spree::Zone.default_tax
+          Spree::PriceMigrator.migrate_default_vat_prices
+          puts "Success."
+        else
+          puts "No Zone set as default_tax. Skipping."
+        end
       end
     end
   end

data/lib/tasks/migrations/{assure_store_on_orders.rake → ensure_store_on_orders.rake}

@@ -1,6 +1,6 @@
 namespace :solidus do
   namespace :migrations do
-    namespace :assure_store_on_orders do
+    namespace :ensure_store_on_orders do
       desc "Makes sure every order in the system has a store attached"
       task up: :environment do
 
@@ -16,18 +16,18 @@ namespace :solidus do
 
         spree_store_count = Spree::Store.count
         if spree_store_count == 0
-          abort "You do not have a store set up. Please create a store instance for your installation."
+          raise "You do not have a store set up. Please create a store instance for your installation."
         elsif spree_store_count > 1
-          abort(<<-TEXT.squish)
+          raise(<<-TEXT.squish)
             You have more than one store set up. We can not be sure which store to attach your
             orders to. Please attach store ids to all your orders, and run this task again
             when you're finished.
           TEXT
         end
 
-        default_store = Store.where(default: true).first
+        default_store = Spree::Store.where(default: true).first
         unless default_store
-          abort "Your store is not marked as default. Please mark your one store as the default store and run this task again."
+          raise "Your store is not marked as default. Please mark your one store as the default store and run this task again."
         end
 
         Spree::Order.where(store_id: nil).update_all(store_id: Spree::Store.default.id)

data/lib/tasks/migrations/migrate_shipping_rate_taxes.rake

@@ -2,7 +2,7 @@ namespace :solidus do
   namespace :migrations do
     namespace :migrate_shipping_rate_taxes do
       task up: :environment do
-        puts "Adding persisted tax notes to historic shipping rates"
+        print "Adding persisted tax notes to historic shipping rates ... "
         Spree::ShippingRate.where.not(tax_rate_id: nil).find_each do |shipping_rate|
           tax_rate = Spree::TaxRate.unscoped.find(shipping_rate.tax_rate_id)
           shipping_rate.taxes.find_or_create_by!(
@@ -10,7 +10,8 @@ namespace :solidus do
             amount: tax_rate.compute_amount(shipping_rate)
           )
         end
-        Spree::ShippingRate.where.not(tax_rate_id: nil).update_all(tax_rate: nil)
+        Spree::ShippingRate.where.not(tax_rate_id: nil).update_all(tax_rate_id: nil)
+        puts "Success."
       end
     end
   end

data/lib/tasks/upgrade.rake

@@ -2,9 +2,9 @@ namespace :solidus do
   namespace :upgrade do
     desc "Upgrade Solidus to version 1.3"
     task one_point_three: [
-        'solidus:migrations:assure_store_on_orders:up',
+        'solidus:migrations:ensure_store_on_orders:up',
         'solidus:migrations:migrate_shipping_rate_taxes:up',
-        'solidus:migrations:create_vat_prices'
+        'solidus:migrations:create_vat_prices:up'
       ] do
       puts "Your Solidus install is ready for Solidus 1.3."
     end

data/spec/lib/tasks/dummy_task.rake

@@ -0,0 +1,10 @@
+# This is a dummy task used for generic rake task testing
+
+task dummy_task: :environment do
+  DummyTaskRunner.run
+end
+
+class DummyTaskRunner
+  def self.run
+  end
+end

data/spec/lib/tasks/dummy_task_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe 'dummy_task' do
+  include_context(
+    'rake',
+    task_name: 'dummy_task',
+    task_path: Spree::Core::Engine.root.join('spec/lib/tasks/dummy_task.rake'),
+  )
+
+  it 'calls the dummy task exactly once' do
+    expect(DummyTaskRunner).to receive(:run).once
+    task.invoke
+  end
+
+  # This tests:
+  #   1) that tasks get reenabled between examples
+  #   2) that tasks aren't loaded in the wrong way, causing them to execute
+  #      an extra time for every example that's defined.
+  # We need at least two specs to trigger the error conditions and spec order is
+  # random so we just create the same spec twice. We could probably combine this
+  # with the generic spec above but this seems clearer.
+  2.times do |i|
+    it "still calls the dummy task exactly once when more than one example is defined - #{i}" do
+      expect(DummyTaskRunner).to receive(:run).once
+      task.invoke
+    end
+  end
+end

data/spec/lib/tasks/exchanges_spec.rb

@@ -1,14 +1,11 @@
 require 'spec_helper'
 
 describe "exchanges:charge_unreturned_items" do
-  let(:task) do
-    Rake::Task['exchanges:charge_unreturned_items']
-  end
-
-  before do
-    Rails.application.load_tasks
-    task.reenable
-  end
+  include_context(
+    'rake',
+    task_name: 'exchanges:charge_unreturned_items',
+    task_path: Spree::Core::Engine.root.join('lib/tasks/exchanges.rake'),
+  )
 
   subject { task }
 

data/spec/lib/tasks/migrations/copy_shipped_shipments_to_cartons_spec.rb

@@ -1,16 +1,13 @@
 require 'spec_helper'
 
 describe 'spree:migrations:copy_shipped_shipments_to_cartons' do
-  before do
-    Rails.application.load_tasks
-    task.reenable
-  end
+  include_context(
+    'rake',
+    task_name: 'spree:migrations:copy_shipped_shipments_to_cartons:up',
+    task_path: Spree::Core::Engine.root.join('lib/tasks/migrations/copy_shipped_shipments_to_cartons.rake'),
+  )
 
   describe 'up' do
-    let(:task) do
-      Rake::Task['spree:migrations:copy_shipped_shipments_to_cartons:up']
-    end
-
     # should generate a carton
     let!(:shipped_shipment) { shipped_order.shipments.first }
     # should not generate a carton because it's not shipped

data/spec/lib/tasks/migrations/create_vat_prices_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe 'solidus:migrations:create_vat_prices' do
+  describe 'up' do
+    include_context(
+      'rake',
+      task_path: Spree::Core::Engine.root.join('lib/tasks/migrations/create_vat_prices.rake'),
+      task_name: 'solidus:migrations:create_vat_prices:up',
+    )
+
+    context "without a zone" do
+      it 'skips' do
+        expect { task.invoke }.to output(
+          "Creating differentiated prices for VAT countries ... No Zone set as default_tax. Skipping.\n"
+        ).to_stdout
+      end
+    end
+
+    context "with a zone" do
+      let!(:zone) { create(:zone, :with_country, default_tax: true) }
+
+      it 'runs' do
+        expect { task.invoke }.to output(
+          "Creating differentiated prices for VAT countries ... Success.\n"
+        ).to_stdout
+      end
+    end
+  end
+end

data/spec/lib/tasks/migrations/ensure_store_on_orders_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe 'solidus:migrations:ensure_store_on_orders' do
+  describe 'up' do
+    include_context(
+      'rake',
+      task_path: Spree::Core::Engine.root.join('lib/tasks/migrations/ensure_store_on_orders.rake'),
+      task_name: 'solidus:migrations:ensure_store_on_orders:up',
+    )
+
+    context 'with no orders' do
+      it 'succeeds' do
+        expect { task.invoke }.to output(
+          "Everything is good, all orders in your database have a store attached.\n"
+        ).to_stdout
+      end
+    end
+
+    context 'when all orders have store_ids' do
+      let!(:order) { create(:order, store: create(:store)) }
+
+      it 'succeeds' do
+        expect { task.invoke }.to output(
+          "Everything is good, all orders in your database have a store attached.\n"
+        ).to_stdout
+      end
+    end
+
+    context 'when some orders do not have store_ids' do
+      let!(:order_with_store) { create(:order, store: store) }
+      let!(:order_without_store) do
+        # due to a before_validation that adds a store when one is missing,
+        # we can't simply specify `store: nil`
+        create(:order, store: store).tap do |o|
+          o.update_columns(store_id: nil)
+        end
+      end
+      let!(:store) { create(:store) }
+
+      it 'succeeds' do
+        expect { task.invoke }.to output(
+          "All orders updated with the default store.\n"
+        ).to_stdout
+      end
+
+      context 'when there are no stores' do
+        before do
+          order_with_store.update_columns(store_id: nil)
+          # due to a before_validation that adds a store when one is missing,
+          # we can't simply specify `store: nil`
+          store.destroy
+        end
+
+        it 'raises' do
+          expect { task.invoke }.to raise_error(/You do not have a store set up/)
+        end
+      end
+
+      context 'when there are multiple stores' do
+        let!(:extra_store) { create(:store) }
+
+        it 'raises' do
+          expect { task.invoke }.to raise_error(/You have more than one store set up/)
+        end
+      end
+
+      context 'when there is no default store' do
+        before do
+          # The before_save 'ensure_default_exists_and_is_unique' means that we
+          # need to use update_columns to set up this scenario.
+          store.update_columns(default: false)
+        end
+
+        it 'raises' do
+          expect { task.invoke }.to raise_error(/Your store is not marked as default/)
+        end
+      end
+    end
+  end
+end

data/spec/lib/tasks/migrations/migrate_shipping_rate_taxes_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe 'solidus:migrations:migrate_shipping_rate_taxes' do
+  describe 'up' do
+    include_context(
+      'rake',
+      task_path: Spree::Core::Engine.root.join('lib/tasks/migrations/migrate_shipping_rate_taxes.rake'),
+      task_name: 'solidus:migrations:migrate_shipping_rate_taxes:up',
+    )
+
+    it 'runs' do
+      expect { task.invoke }.to output(
+        "Adding persisted tax notes to historic shipping rates ... Success.\n"
+      ).to_stdout
+    end
+  end
+end

data/spec/lib/tasks/order_capturing_spec.rb

@@ -1,14 +1,11 @@
 require 'spec_helper'
 
 describe "order_capturing:capture_payments" do
-  let(:task) do
-    Rake::Task['order_capturing:capture_payments']
-  end
-
-  before do
-    Rails.application.load_tasks
-    task.reenable
-  end
+  include_context(
+    'rake',
+    task_name: 'order_capturing:capture_payments',
+    task_path: Spree::Core::Engine.root.join('lib/tasks/order_capturing.rake'),
+  )
 
   subject { task }
 

data/spec/lib/tasks/upgrade_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe 'solidus:upgrade:one_point_three' do
+  include_context(
+    'rake',
+    task_path: Spree::Core::Engine.root.join('lib/tasks/upgrade.rake'),
+    task_name: 'solidus:upgrade:one_point_three',
+  )
+
+  before do
+    load Spree::Core::Engine.root.join('lib/tasks/migrations/ensure_store_on_orders.rake')
+    load Spree::Core::Engine.root.join('lib/tasks/migrations/migrate_shipping_rate_taxes.rake')
+    load Spree::Core::Engine.root.join('lib/tasks/migrations/create_vat_prices.rake')
+  end
+
+  it 'runs' do
+    expect { task.invoke }.to output(
+      /Your Solidus install is ready for Solidus 1.3./
+    ).to_stdout
+  end
+end

data/spec/models/spree/app_configuration_spec.rb

@@ -28,11 +28,6 @@ describe Spree::AppConfiguration, type: :model do
     expect(prefs.pricing_options_class).to eq Spree::Variant::PriceSelector.pricing_options_class
   end
 
-  it "has an instacached getter for the default pricing options" do
-    expect(prefs.default_pricing_options).to be_a Spree::Variant::PriceSelector.pricing_options_class
-    expect(prefs.default_pricing_options.object_id).to eq prefs.default_pricing_options.object_id
-  end
-
   describe '#stock' do
     subject { prefs.stock }
     it { is_expected.to be_a Spree::Core::StockConfiguration }

data/spec/models/spree/concerns/user_address_book_spec.rb

@@ -336,4 +336,21 @@ module Spree
       expect(subject.default_address).to eq ship_address
     end
   end
+
+  describe "ship_address=" do
+    let!(:user) { create(:user) }
+    let!(:address) { create(:address) }
+
+    # https://github.com/solidusio/solidus/issues/1241
+    it "resets the association and persists" do
+      # Load (which will cache) the has_one association
+      expect(user.ship_address).to be_nil
+
+      user.update!(ship_address: address)
+      expect(user.ship_address).to eq(address)
+
+      user.reload
+      expect(user.ship_address).to eq(address)
+    end
+  end
 end

data/spec/models/spree/promotion_handler/coupon_spec.rb

@@ -128,7 +128,7 @@ module Spree
           end
 
           context "coexists with a non coupon code promo" do
-            let!(:order) { Order.create }
+            let!(:order) { create(:order) }
 
             before do
               allow(order).to receive_messages coupon_code: "10off"

data/spec/models/spree/shipment_spec.rb

@@ -135,7 +135,7 @@ describe Spree::Shipment, type: :model do
   end
 
   context "manifest" do
-    let(:order) { Spree::Order.create }
+    let(:order) { create(:order) }
     let(:variant) { create(:variant) }
     let!(:line_item) { order.contents.add variant }
     let!(:shipment) { order.create_proposed_shipments.first }

data/spec/models/spree/store_spec.rb

@@ -37,19 +37,28 @@ describe Spree::Store, type: :model do
   end
 
   describe ".default" do
-    let!(:store)    { create(:store) }
-    let!(:store_2)  { create(:store, default: true) }
+    it "should ensure saved store becomes default if one doesn't exist yet" do
+      expect(Spree::Store.where(default: true).count).to eq(0)
+      store = build(:store)
+      expect(store.default).not_to be true
+
+      store.save!
 
-    it "should ensure there is a default if one doesn't exist yet" do
-      expect(store_2.default).to be true
+      expect(store.default).to be true
     end
 
     it "should ensure there is only one default" do
-      [store, store_2].each(&:reload)
+      orig_default_store = create(:store, default: true)
+      expect(orig_default_store.reload.default).to be true
+
+      new_default_store = create(:store, default: true)
 
       expect(Spree::Store.where(default: true).count).to eq(1)
-      expect(store_2.default).to be true
-      expect(store.default).not_to be true
+
+      [orig_default_store, new_default_store].each(&:reload)
+
+      expect(new_default_store.default).to be true
+      expect(orig_default_store.default).not_to be true
     end
   end
 

data/spec/models/spree/variant_spec.rb

@@ -205,6 +205,8 @@ describe Spree::Variant, type: :model do
 
   context "#default_price" do
     context "when multiple prices are present in addition to a default price" do
+      let(:pricing_options_germany) { Spree::Config.pricing_options_class.new(currency: "EUR") }
+      let(:pricing_options_united_states) { Spree::Config.pricing_options_class.new(currency: "USD") }
       before do
         variant.prices << create(:price, variant: variant, currency: "USD", amount: 12.12, is_default: false)
         variant.prices << create(:price, variant: variant, currency: "EUR", amount: 29.99)
@@ -217,8 +219,8 @@ describe Spree::Variant, type: :model do
       end
 
       it "displays default price" do
-        expect(variant.price_in("USD").display_amount.to_s).to eq("$19.99")
-        expect(variant.price_in("EUR").display_amount.to_s).to eq("€29.99")
+        expect(variant.price_for(pricing_options_united_states).to_s).to eq("$19.99")
+        expect(variant.price_for(pricing_options_germany).to_s).to eq("€29.99")
       end
     end
 
@@ -347,7 +349,10 @@ describe Spree::Variant, type: :model do
     before do
       variant.prices << create(:price, variant: variant, currency: "EUR", amount: 33.33)
     end
-    subject { variant.price_in(currency) }
+
+    subject do
+      Spree::Deprecation.silence { variant.price_in(currency) }
+    end
 
     context "when currency is not specified" do
       let(:currency) { nil }
@@ -379,7 +384,9 @@ describe Spree::Variant, type: :model do
       variant.prices << create(:price, variant: variant, currency: "EUR", amount: 33.33)
     end
 
-    subject { variant.amount_in(currency) }
+    subject do
+      Spree::Deprecation.silence { variant.amount_in(currency) }
+    end
 
     context "when currency is not specified" do
       let(:currency) { nil }

data/spec/support/shared_contexts/rake.rb

@@ -0,0 +1,30 @@
+#
+# Rake task spec setup.
+#
+shared_context "rake" do |task_path:, task_name:|
+  require 'rake'
+
+  let(:task) do
+    Rake::Task[task_name]
+  end
+
+  before(:each) do
+    # we need to reenable the task or else `task.invoke` will only run the task
+    # for the first example that runs.
+    task.reenable
+  end
+
+  before(:all) do
+    Rake::Task.clear
+    # Note: Using `Rails.application.load_tasks` doesn't seem to work correctly
+    # in the specs. The tasks each run twice when invoked instead of once.
+    load task_path
+    # Many tasks require the 'environment' task, which isn't needed in specs
+    # since the environment is already loaded. So generate a fake one.
+    Rake::Task.define_task(:environment)
+  end
+
+  after(:all) do
+    Rake::Task.clear
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc1
+  version: 1.3.0.rc2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -881,6 +881,8 @@ files:
 - db/migrate/20160318145302_add_timestamps_to_prices.rb
 - db/migrate/20160330204846_add_missing_timestamp_columns.rb
 - db/migrate/20160509181311_add_country_iso_to_prices.rb
+- db/migrate/20160608162651_ensure_default_store.rb
+- db/migrate/20160608180751_ensure_store_on_orders.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -1049,10 +1051,10 @@ files:
 - lib/tasks/core.rake
 - lib/tasks/email.rake
 - lib/tasks/exchanges.rake
-- lib/tasks/migrations/assure_store_on_orders.rake
 - lib/tasks/migrations/copy_order_bill_address_to_credit_card.rake
 - lib/tasks/migrations/copy_shipped_shipments_to_cartons.rake
 - lib/tasks/migrations/create_vat_prices.rake
+- lib/tasks/migrations/ensure_store_on_orders.rake
 - lib/tasks/migrations/migrate_shipping_rate_taxes.rake
 - lib/tasks/migrations/migrate_user_addresses.rake
 - lib/tasks/order_capturing.rake
@@ -1152,9 +1154,15 @@ files:
 - spec/lib/spree/localized_number_spec.rb
 - spec/lib/spree/migrations_spec.rb
 - spec/lib/spree/money_spec.rb
+- spec/lib/tasks/dummy_task.rake
+- spec/lib/tasks/dummy_task_spec.rb
 - spec/lib/tasks/exchanges_spec.rb
 - spec/lib/tasks/migrations/copy_shipped_shipments_to_cartons_spec.rb
+- spec/lib/tasks/migrations/create_vat_prices_spec.rb
+- spec/lib/tasks/migrations/ensure_store_on_orders_spec.rb
+- spec/lib/tasks/migrations/migrate_shipping_rate_taxes_spec.rb
 - spec/lib/tasks/order_capturing_spec.rb
+- spec/lib/tasks/upgrade_spec.rb
 - spec/mailers/carton_mailer_spec.rb
 - spec/mailers/order_mailer_spec.rb
 - spec/mailers/reimbursement_mailer_spec.rb
@@ -1364,6 +1372,7 @@ files:
 - spec/support/concerns/default_price.rb
 - spec/support/concerns/working_factories.rb
 - spec/support/dummy_ability.rb
+- spec/support/shared_contexts/rake.rb
 - spec/support/test_gateway.rb
 - vendor/assets/javascripts/jquery.payment.js
 - vendor/assets/javascripts/jsuri.js