solidus_core 1.3.2 → 1.4.0.beta1

data/spec/models/spree/stock_item_spec.rb

@@ -229,7 +229,7 @@ describe Spree::StockItem, type: :model do
     context "when deprecated binary_inventory_cache is used" do
       before do
         Spree::Config.binary_inventory_cache = binary_inventory_cache
-        allow(ActiveSupport::Deprecation).to receive(:warn)
+        allow(Spree::Deprecation).to receive(:warn)
         subject.set_count_on_hand(9)
       end
 
@@ -237,7 +237,7 @@ describe Spree::StockItem, type: :model do
         let(:binary_inventory_cache) { true }
 
         it "logs a deprecation warning" do
-          expect(ActiveSupport::Deprecation).to have_received(:warn)
+          expect(Spree::Deprecation).to have_received(:warn)
         end
       end
 
@@ -248,7 +248,7 @@ describe Spree::StockItem, type: :model do
         end
 
         it "does not log a deprecation warning" do
-          expect(ActiveSupport::Deprecation).not_to have_received(:warn)
+          expect(Spree::Deprecation).not_to have_received(:warn)
         end
       end
     end
@@ -271,170 +271,60 @@ describe Spree::StockItem, type: :model do
   end
 
   describe 'validations' do
+    before do
+      subject.backorderable = backorderable
+      subject.send(:count_on_hand=, count_on_hand)
+    end
+
     describe 'count_on_hand' do
       shared_examples_for 'valid count_on_hand' do
-        before(:each) do
-          subject.save
-        end
-
         it 'has :no errors_on' do
+          expect(subject).to be_valid
           expect(subject.errors_on(:count_on_hand).size).to eq(0)
         end
       end
 
-      shared_examples_for 'not valid count_on_hand' do
-        before(:each) do
-          subject.save
-        end
-
-        it 'has 1 error_on' do
+      shared_examples_for 'invalid count_on_hand' do
+        it 'has the correct error on count_on_hand' do
+          expect(subject).not_to be_valid
           expect(subject.error_on(:count_on_hand).size).to eq(1)
+          expect(subject.errors[:count_on_hand]).to include('must be greater than or equal to 0')
         end
-        it { expect(subject.errors[:count_on_hand]).to include 'must be greater than or equal to 0' }
       end
 
-      context 'when count_on_hand not changed' do
-        context 'when not backorderable' do
-          before(:each) do
-            subject.backorderable = false
-          end
-          it_should_behave_like 'valid count_on_hand'
-        end
+      context 'when backorderable' do
+        let(:backorderable) { true }
 
-        context 'when backorderable' do
-          before(:each) do
-            subject.backorderable = true
-          end
-          it_should_behave_like 'valid count_on_hand'
+        context 'when count_on_hand is positive' do
+          let(:count_on_hand) { 3 }
+          it_should_behave_like "valid count_on_hand"
         end
-      end
 
-      context 'when count_on_hand changed' do
-        context 'when backorderable' do
-          before(:each) do
-            subject.backorderable = true
-          end
-          context 'when both count_on_hand and count_on_hand_was are positive' do
-            context 'when count_on_hand is greater than count_on_hand_was' do
-              before(:each) do
-                subject.update_column(:count_on_hand, 3)
-                subject.send(:count_on_hand=, subject.count_on_hand + 3)
-              end
-              it_should_behave_like 'valid count_on_hand'
-            end
-
-            context 'when count_on_hand is smaller than count_on_hand_was' do
-              before(:each) do
-                subject.update_column(:count_on_hand, 3)
-                subject.send(:count_on_hand=, subject.count_on_hand - 2)
-              end
-
-              it_should_behave_like 'valid count_on_hand'
-            end
-          end
+        context 'when count_on_hand is negative' do
+          let(:count_on_hand) { -3 }
 
-          context 'when both count_on_hand and count_on_hand_was are negative' do
-            context 'when count_on_hand is greater than count_on_hand_was' do
-              before(:each) do
-                subject.update_column(:count_on_hand, -3)
-                subject.send(:count_on_hand=, subject.count_on_hand + 2)
-              end
-              it_should_behave_like 'valid count_on_hand'
-            end
-
-            context 'when count_on_hand is smaller than count_on_hand_was' do
-              before(:each) do
-                subject.update_column(:count_on_hand, 3)
-                subject.send(:count_on_hand=, subject.count_on_hand - 3)
-              end
-
-              it_should_behave_like 'valid count_on_hand'
-            end
-          end
-
-          context 'when both count_on_hand is positive and count_on_hand_was is negative' do
-            context 'when count_on_hand is greater than count_on_hand_was' do
-              before(:each) do
-                subject.update_column(:count_on_hand, -3)
-                subject.send(:count_on_hand=, subject.count_on_hand + 6)
-              end
-              it_should_behave_like 'valid count_on_hand'
-            end
-          end
+          it_should_behave_like "valid count_on_hand"
 
-          context 'when both count_on_hand is negative and count_on_hand_was is positive' do
-            context 'when count_on_hand is greater than count_on_hand_was' do
-              before(:each) do
-                subject.update_column(:count_on_hand, 3)
-                subject.send(:count_on_hand=, subject.count_on_hand - 6)
-              end
-              it_should_behave_like 'valid count_on_hand'
-            end
-          end
-        end
-
-        context 'when not backorderable' do
-          before(:each) do
+          it "can't be changed to not backorderable" do
+            expect(subject).to be_valid
             subject.backorderable = false
+            expect(subject).not_to be_valid
           end
+        end
+      end
 
-          context 'when both count_on_hand and count_on_hand_was are positive' do
-            context 'when count_on_hand is greater than count_on_hand_was' do
-              before(:each) do
-                subject.update_column(:count_on_hand, 3)
-                subject.send(:count_on_hand=, subject.count_on_hand + 3)
-              end
-              it_should_behave_like 'valid count_on_hand'
-            end
-
-            context 'when count_on_hand is smaller than count_on_hand_was' do
-              before(:each) do
-                subject.update_column(:count_on_hand, 3)
-                subject.send(:count_on_hand=, subject.count_on_hand - 2)
-              end
-
-              it_should_behave_like 'valid count_on_hand'
-            end
-          end
+      context 'when not backorderable' do
+        let(:backorderable) { false }
 
-          context 'when both count_on_hand and count_on_hand_was are negative' do
-            context 'when count_on_hand is greater than count_on_hand_was' do
-              before(:each) do
-                subject.update_column(:count_on_hand, -3)
-                subject.send(:count_on_hand=, subject.count_on_hand + 2)
-              end
-              it_should_behave_like 'valid count_on_hand'
-            end
-
-            context 'when count_on_hand is smaller than count_on_hand_was' do
-              before(:each) do
-                subject.update_column(:count_on_hand, -3)
-                subject.send(:count_on_hand=, subject.count_on_hand - 3)
-              end
-
-              it_should_behave_like 'not valid count_on_hand'
-            end
-          end
+        context 'when count_on_hand is positive' do
+          let(:count_on_hand) { 3 }
+          it_should_behave_like "valid count_on_hand"
+        end
 
-          context 'when both count_on_hand is positive and count_on_hand_was is negative' do
-            context 'when count_on_hand is greater than count_on_hand_was' do
-              before(:each) do
-                subject.update_column(:count_on_hand, -3)
-                subject.send(:count_on_hand=, subject.count_on_hand + 6)
-              end
-              it_should_behave_like 'valid count_on_hand'
-            end
-          end
+        context 'when count_on_hand is negative' do
+          let(:count_on_hand) { -3 }
 
-          context 'when both count_on_hand is negative and count_on_hand_was is positive' do
-            context 'when count_on_hand is greater than count_on_hand_was' do
-              before(:each) do
-                subject.update_column(:count_on_hand, 3)
-                subject.send(:count_on_hand=, subject.count_on_hand - 6)
-              end
-              it_should_behave_like 'not valid count_on_hand'
-            end
-          end
+          it_should_behave_like "invalid count_on_hand"
         end
       end
     end

data/spec/models/spree/store_spec.rb

@@ -16,23 +16,37 @@ describe Spree::Store, type: :model do
   end
 
   describe '.current' do
-    # there is a default store created with the test_app rake task.
-    let!(:store_1) { Spree::Store.first || create(:store) }
-
+    let!(:store_1) { create(:store) }
+    let!(:store_default) { create(:store, name: 'default', default: true) }
     let!(:store_2) { create(:store, default: false, url: 'www.subdomain.com') }
     let!(:store_3) { create(:store, default: false, url: 'www.another.com', code: 'CODE') }
 
-    it 'should return default when no domain' do
-      expect(subject.class.current).to eql(store_1)
+    delegate :current, to: :described_class
+
+    context "with no argument" do
+      it 'should return default' do
+        Spree::Deprecation.silence do
+          expect(current).to eql(store_default)
+        end
+      end
+    end
+
+    context "with no match" do
+      it 'should return the default domain' do
+        expect(current('foobar.com')).to eql(store_default)
+      end
     end
 
-    it 'should return store for domain' do
-      expect(subject.class.current('spreecommerce.com')).to eql(store_1)
-      expect(subject.class.current('www.subdomain.com')).to eql(store_2)
+    context "with matching url" do
+      it 'should return matching store' do
+        expect(current('www.subdomain.com')).to eql(store_2)
+      end
     end
 
-    it 'should return store by code' do
-      expect(subject.class.current('CODE')).to eql(store_3)
+    context "with matching code" do
+      it 'should return matching store' do
+        expect(current('CODE')).to eql(store_3)
+      end
     end
   end
 

data/spec/models/spree/tax_rate_spec.rb

@@ -140,7 +140,7 @@ describe Spree::TaxRate, type: :model do
       let(:line_item) { stub_model(Spree::LineItem) }
 
       it 'should emit a deprecation warning and call the item adjuster' do
-        expect(ActiveSupport::Deprecation).to receive(:warn)
+        expect(Spree::Deprecation).to receive(:warn)
         expect(Spree::Tax::ItemAdjuster).to receive_message_chain(:new, :adjust!)
         Spree::TaxRate.adjust(zone, [line_item])
       end
@@ -150,7 +150,7 @@ describe Spree::TaxRate, type: :model do
       let(:shipment) { stub_model(Spree::Shipment) }
 
       it 'should emit a deprecation warning and call the item adjuster' do
-        expect(ActiveSupport::Deprecation).to receive(:warn)
+        expect(Spree::Deprecation).to receive(:warn)
         expect(Spree::Tax::ItemAdjuster).to receive_message_chain(:new, :adjust!)
         Spree::TaxRate.adjust(zone, [shipment])
       end

data/spec/models/spree/user_spec.rb

@@ -96,7 +96,7 @@ describe Spree::LegacyUser, type: :model do
       end
 
       it "drops payment source" do
-        ActiveSupport::Deprecation.silence do
+        Spree::Deprecation.silence do
           user.drop_payment_source cc
         end
         expect(cc.gateway_customer_profile_id).to be_nil

data/spec/models/spree/validations/db_maximum_length_validator_spec.rb

@@ -1,23 +1,31 @@
 require 'spec_helper'
 
 describe Spree::Validations::DbMaximumLengthValidator, type: :model do
-  context 'when Spree::Product' do
-    Spree::Product.class_eval do
-      attribute :slug, ActiveRecord::Type::String.new(limit: 255)
-      # Slug currently has no validation for maximum length
+  with_model 'LimitedProduct', scope: :all do
+    table do |t|
+      t.string :slug, limit: 255
+    end
+
+    model do
       validates_with Spree::Validations::DbMaximumLengthValidator, field: :slug
     end
-    let(:limit) { 255 }
-    let(:product) { Spree::Product.new }
-    let(:slug) { "x" * (limit + 1) }
+  end
 
-    before do
-      product.slug = slug
+  let(:record) { LimitedProduct.new(slug: slug) }
+
+  context "when slug is below limit" do
+    let(:slug) { 'a' * 255 }
+    it 'should be valid' do
+      expect(record).to be_valid
+      expect(record.errors).to be_empty
     end
+  end
 
-    it 'should maximum validate slug' do
-      product.valid?
-      expect(product.errors[:slug]).to include(I18n.t("errors.messages.too_long", count: limit))
+  context "when slug is too long" do
+    let(:slug) { 'a' * 256 }
+    it 'should be invalid and set error' do
+      expect(record).not_to be_valid
+      expect(record.errors[:slug]).to include(I18n.t("errors.messages.too_long", count: 255))
     end
   end
 end

data/spec/support/concerns/working_factories.rb

@@ -6,4 +6,8 @@ RSpec.shared_examples_for 'a working factory' do
   it "creates successfully" do
     expect(create(factory)).to be_a(factory_class)
   end
+
+  it "is creates a valid record" do
+    expect(create(factory)).to be_valid
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -43,6 +43,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
@@ -50,6 +53,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
 - !ruby/object:Gem::Dependency
@@ -162,14 +168,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: paranoia
   requirement: !ruby/object:Gem::Requirement
@@ -278,14 +284,20 @@ dependencies:
   name: truncate_html
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
@@ -324,6 +336,7 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - LICENSE
+- README.md
 - Rakefile
 - app/assets/images/logo/solidus_logo.png
 - app/assets/images/noimage/large.png
@@ -561,6 +574,8 @@ files:
 - app/models/spree/variant_property_rule.rb
 - app/models/spree/variant_property_rule_condition.rb
 - app/models/spree/variant_property_rule_value.rb
+- app/models/spree/wallet/add_payment_sources_to_wallet.rb
+- app/models/spree/wallet/default_payment_builder.rb
 - app/models/spree/zone.rb
 - app/models/spree/zone_member.rb
 - app/views/layouts/spree/base_mailer.html.erb
@@ -570,6 +585,7 @@ files:
 - app/views/spree/order_mailer/confirm_email.html.erb
 - app/views/spree/order_mailer/confirm_email.text.erb
 - app/views/spree/order_mailer/inventory_cancellation_email.text.erb
+- app/views/spree/reimbursement_mailer/reimbursement_email.html.erb
 - app/views/spree/reimbursement_mailer/reimbursement_email.text.erb
 - app/views/spree/shared/_base_mailer_footer.html.erb
 - app/views/spree/shared/_base_mailer_header.html.erb
@@ -582,7 +598,6 @@ files:
 - config/initializers/premailer_assets.rb
 - config/initializers/spree_user.rb
 - config/locales/en.yml
-- config/routes.rb
 - db/default/spree/countries.rb
 - db/default/spree/return_reasons.rb
 - db/default/spree/roles.rb
@@ -881,8 +896,12 @@ 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/20160527070401_rename_shipment_address_field.rb
 - db/migrate/20160608162651_ensure_default_store.rb
 - db/migrate/20160608180751_ensure_store_on_orders.rb
+- db/migrate/20160616232103_remove_user_id_from_promotion_rules.rb
+- db/migrate/20160718205341_add_payment_id_index_to_spree_refunds.rb
+- db/migrate/20160718205859_add_reimbursement_id_index_to_spree_refunds.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -940,6 +959,7 @@ files:
 - lib/spree/localized_number.rb
 - lib/spree/mailer_previews/carton_preview.rb
 - lib/spree/mailer_previews/order_preview.rb
+- lib/spree/mailer_previews/reimbursement_preview.rb
 - lib/spree/migration_helpers.rb
 - lib/spree/migrations.rb
 - lib/spree/money.rb
@@ -1390,12 +1410,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.

data/config/routes.rb

@@ -1 +0,0 @@
-Spree::Core::Engine.draw_routes