solidus_core 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6a0e506dd5c20cd114029a4d8f7cf6c9dff0ef0ce08c3b92cdd24e39b58f97e
-  data.tar.gz: 1936cc0f6fda95d9a4931b584eeec1c3529d64dec7aee80c92e0b58183d0c19b
+  metadata.gz: 5b97bcb067eec1433b2f01d45c66c881e4029bba591ca53a3e3a9118f14392cb
+  data.tar.gz: 11de3f68e6f50ae439477ddf23b21f62f7200e7ad90172116e054215e34ebfb9
 SHA512:
-  metadata.gz: fd93440711741bf2970e57db6cc86325f0ae2faa28642651a959f40004bf9b384cd39343d23836ef6bdb5565c04aa818822b1443284c3feee93ebdc51b4b4b84
-  data.tar.gz: 46461444d4462294444911f9ec1a7da35e75e82a3713e62879ef7e08cc4f58cc02b01eefd2678cee624cd3158ad165a28c0ecefb9c456cf1df5167af1b812550
+  metadata.gz: 59b2593c7b3f0b12ae9a6b1eed82ff49f2f753733452a4d9cbf0ef3e7ef42498ae213070336c22dfbbb1c363be7a108855ea00f9019594690fd2c4def752b3f7
+  data.tar.gz: 9060ad03693075e534b219f75d423de322569e25f806c702be946920e0b981503bfb8c417d498ff75094cf3a0396415d1f5b48d21497d85ead39cfc8eac99388

data/db/migrate/20180710170104_create_spree_store_credit_reasons_table.rb

@@ -21,15 +21,28 @@ class CreateSpreeStoreCreditReasonsTable < ActiveRecord::Migration[5.1]
       StoreCreditReason.create!(name: update_reason.name)
     end
 
-    drop_table :spree_store_credit_update_reasons
-    rename_column :spree_store_credit_events, :update_reason_id, :store_credit_reason_id
+    add_column :spree_store_credit_events, :store_credit_reason_id, :integer
+    execute "update spree_store_credit_events set store_credit_reason_id = update_reason_id"
+
+    # TODO: table spree_store_credit_update_reasons and column
+    # column spree_store_credit_update_reasons.update_reason_id
+    # must be dropped in a future Solidus release
   end
 
   def down
-    create_table :spree_store_credit_update_reasons do |t|
-      t.string :name
-
-      t.timestamps
+    # This table and column  may not exist anymore as another irreversible
+    # migration may have removed it later. They must be added back or the
+    # `up` method would fail
+    unless table_exists? :spree_store_credit_update_reasons
+      create_table :spree_store_credit_update_reasons do |t|
+        t.string :name
+
+        t.timestamps
+      end
+
+      unless column_exists? :spree_store_credit_events, :update_reason_id
+        add_column :spree_store_credit_events, :update_reason_id, :integer
+      end
     end
 
     StoreCreditReason.all.each do |store_credit_reason|
@@ -37,6 +50,6 @@ class CreateSpreeStoreCreditReasonsTable < ActiveRecord::Migration[5.1]
     end
 
     drop_table :spree_store_credit_reasons
-    rename_column :spree_store_credit_events, :store_credit_reason_id, :update_reason_id
+    remove_column :spree_store_credit_events, :store_credit_reason_id
   end
 end

data/db/migrate/20190106184413_remove_code_from_spree_promotions.rb

@@ -5,10 +5,11 @@ require 'solidus/migrations/promotions_with_code_handlers'
 class RemoveCodeFromSpreePromotions < ActiveRecord::Migration[5.1]
   class Promotion < ActiveRecord::Base
     self.table_name = "spree_promotions"
+    self.ignored_columns = %w(type)
   end
 
   def up
-    promotions_with_code = Promotion.where.not(code: nil)
+    promotions_with_code = Promotion.where.not(code: [nil, ''])
 
     if promotions_with_code.any?
       # You have some promotions with "code" field present! This is not good

data/lib/spree/core/version.rb

@@ -2,7 +2,7 @@
 
 module Spree
   def self.solidus_version
-    "2.8.1"
+    "2.8.2"
   end
 
   def self.solidus_gem_version

data/spec/migrate/20190106184413_remove_code_from_spree_promotions_spec.rb

@@ -44,7 +44,18 @@ RSpec.describe RemoveCodeFromSpreePromotions do
     DatabaseCleaner.clean_with(:truncation)
   end
 
+  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, code)
+  end
+
   context 'when there are no promotions with code' do
+    let(:code) { '' }
+
     it 'does not call any promotion with code handler' do
       expect(described_class).not_to receive(:promotions_with_code_handler)
 
@@ -53,14 +64,7 @@ RSpec.describe RemoveCodeFromSpreePromotions do
   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
+    let(:code) { 'Just An Old Promo Code' }
 
     context 'with the deafult handler (Solidus::Migrations::PromotionWithCodeHandlers::RaiseException)' do
       it 'raise a StandardError exception' do
@@ -96,6 +100,14 @@ RSpec.describe RemoveCodeFromSpreePromotions do
           end
         end
 
+        context 'with promotions with type set (legacy feature)' do
+          let(:promotion_with_code) { create(:promotion, type: 'Spree::Promotion') }
+
+          it 'does not raise a STI error' do
+            expect { subject }.not_to raise_error
+          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) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer