solidus_core 1.2.3 → 1.3.0.beta1

data/spec/models/spree/permission_sets/restricted_stock_display_spec.rb

@@ -38,4 +38,3 @@ describe Spree::PermissionSets::RestrictedStockDisplay do
     it { is_expected.to_not be_able_to(:display, item2) }
   end
 end
-

data/spec/models/spree/permission_sets/restricted_stock_management_spec.rb

@@ -38,4 +38,3 @@ describe Spree::PermissionSets::RestrictedStockManagement do
     it { is_expected.to_not be_able_to(:manage, item2) }
   end
 end
-

data/spec/models/spree/permission_sets/restricted_stock_transfer_display_spec.rb

@@ -13,7 +13,6 @@ describe Spree::PermissionSets::RestrictedStockTransferDisplay do
   let!(:other_source_transfer) { create :stock_transfer, source_location: sl2 }
   let!(:dest_transfer) { create :stock_transfer, source_location: sl2, destination_location: sl1 }
 
-
   before do
     user.stock_locations << sl1
   end

data/spec/models/spree/permission_sets/restricted_stock_transfer_management_spec.rb

@@ -15,7 +15,7 @@ describe Spree::PermissionSets::RestrictedStockTransferManagement do
   let!(:variant) { create :variant }
 
   let(:transfer_with_source) { create :stock_transfer, source_location: source_location }
-  let(:transfer_with_destination) { create :stock_transfer, source_location: destination_location  }
+  let(:transfer_with_destination) { create :stock_transfer, source_location: destination_location }
   let(:transfer_with_source_and_destination) do
     create :stock_transfer, source_location: source_location, destination_location: destination_location
   end
@@ -33,7 +33,7 @@ describe Spree::PermissionSets::RestrictedStockTransferManagement do
 
   context "when activated" do
     let(:user) { create :user, stock_locations: stock_locations }
-    let(:stock_locations) {[]}
+    let(:stock_locations) { [] }
 
     before do
       user.stock_locations = stock_locations
@@ -46,7 +46,7 @@ describe Spree::PermissionSets::RestrictedStockTransferManagement do
     end
 
     context "when the user is only associated with the source location" do
-      let(:stock_locations) {[source_location]}
+      let(:stock_locations) { [source_location] }
 
       it { is_expected.to be_able_to(:display, source_location) }
       it { is_expected.to_not be_able_to(:display, destination_location) }
@@ -85,7 +85,7 @@ describe Spree::PermissionSets::RestrictedStockTransferManagement do
     end
 
     context "when the user is only associated with the destination location" do
-      let(:stock_locations) {[destination_location]}
+      let(:stock_locations) { [destination_location] }
 
       it { is_expected.to be_able_to(:display, destination_location) }
       it { is_expected.to_not be_able_to(:display, source_location) }
@@ -124,7 +124,7 @@ describe Spree::PermissionSets::RestrictedStockTransferManagement do
     end
 
     context "when the user is associated with both locations" do
-      let(:stock_locations) {[source_location, destination_location]}
+      let(:stock_locations) { [source_location, destination_location] }
 
       it { is_expected.to be_able_to(:display, source_location) }
       it { is_expected.to be_able_to(:display, destination_location) }
@@ -163,7 +163,7 @@ describe Spree::PermissionSets::RestrictedStockTransferManagement do
     end
 
     context "when the user is associated with neither location" do
-      let(:stock_locations) {[]}
+      let(:stock_locations) { [] }
 
       it { is_expected.to_not be_able_to(:display, source_location) }
       it { is_expected.to_not be_able_to(:display, destination_location) }

data/spec/models/spree/permission_sets/stock_display_spec.rb

@@ -21,4 +21,3 @@ describe Spree::PermissionSets::StockDisplay do
     it { is_expected.not_to be_able_to(:display, Spree::StockLocation) }
   end
 end
-

data/spec/models/spree/permission_sets/stock_management_spec.rb

@@ -19,4 +19,3 @@ describe Spree::PermissionSets::StockManagement do
     it { is_expected.not_to be_able_to(:display, Spree::StockLocation) }
   end
 end
-

data/spec/models/spree/permission_sets/stock_transfer_display_spec.rb

@@ -21,4 +21,3 @@ describe Spree::PermissionSets::StockTransferDisplay do
     it { is_expected.not_to be_able_to(:display, Spree::StockLocation) }
   end
 end
-

data/spec/models/spree/permission_sets/stock_transfer_management_spec.rb

@@ -21,5 +21,3 @@ describe Spree::PermissionSets::StockTransferManagement do
     it { is_expected.not_to be_able_to(:display, Spree::StockLocation) }
   end
 end
-
-

data/spec/models/spree/permission_sets/user_display_spec.rb

@@ -35,4 +35,3 @@ describe Spree::PermissionSets::UserDisplay do
     it { is_expected.not_to be_able_to(:display, Spree::Role) }
   end
 end
-

data/spec/models/spree/permission_sets/user_management_spec.rb

@@ -45,4 +45,3 @@ describe Spree::PermissionSets::UserManagement do
     it { is_expected.not_to be_able_to(:display, Spree::Role) }
   end
 end
-

data/spec/models/spree/preference_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Preference, :type => :model do
-
+describe Spree::Preference, type: :model do
   it "should require a key" do
     @preference = Spree::Preference.new
     @preference.key = :test
@@ -74,7 +73,5 @@ describe Spree::Preference, :type => :model do
       pref = round_trip_preference(key, value)
       expect(pref.value).to eq value
     end
-
   end
-
 end

data/spec/models/spree/preferences/configuration_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
 
-describe Spree::Preferences::Configuration, :type => :model do
-
+describe Spree::Preferences::Configuration, type: :model do
   before :all do
     class AppConfig < Spree::Preferences::Configuration
-      preference :color, :string, :default => :blue
+      preference :color, :string, default: :blue
     end
     @config = AppConfig.new
   end
@@ -23,8 +22,4 @@ describe Spree::Preferences::Configuration, :type => :model do
     @config.set(color: 'green')
     expect(@config.get(:color)).to eq 'green'
   end
-
 end
-
-
-

data/spec/models/spree/preferences/preferable_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Preferences::Preferable, :type => :model do
-
+describe Spree::Preferences::Preferable, type: :model do
   before :all do
     class A
       include Spree::Preferences::Preferable
@@ -15,7 +14,7 @@ describe Spree::Preferences::Preferable, :type => :model do
         @preferences ||= default_preferences
       end
 
-      preference :color, :string, :default => 'green'
+      preference :color, :string, default: 'green'
     end
 
     class B < A
@@ -71,7 +70,6 @@ describe Spree::Preferences::Preferable, :type => :model do
         @a.get_preference :flavor
       }.to raise_error(NoMethodError, "flavor preference not defined")
     end
-
   end
 
   describe "preference access" do
@@ -97,7 +95,7 @@ describe Spree::Preferences::Preferable, :type => :model do
     it "builds a hash of preferences" do
       @b.preferred_flavor = :strawberry
       expect(@b.preferences[:flavor]).to eq 'strawberry'
-      expect(@b.preferences[:color]).to eq 'green' #default from A
+      expect(@b.preferences[:color]).to eq 'green' # default from A
     end
 
     it "builds a hash of preference defaults" do
@@ -119,7 +117,6 @@ describe Spree::Preferences::Preferable, :type => :model do
         @a.set_preference(:is_integer, '')
         expect(@a.preferences[:is_integer]).to eq(0)
       end
-
     end
 
     context "converts decimal preferences to BigDecimal values" do
@@ -143,7 +140,7 @@ describe Spree::Preferences::Preferable, :type => :model do
 
     context "converts boolean preferences to boolean values" do
       before do
-        A.preference :is_boolean, :boolean, :default => true
+        A.preference :is_boolean, :boolean, default: true
       end
 
       it "with strings" do
@@ -195,21 +192,15 @@ describe Spree::Preferences::Preferable, :type => :model do
       end
 
       it "with hash and keys are integers" do
-        @a.set_preference(:is_hash, {1 => 2, 3 => 4})
-        expect(@a.preferences[:is_hash]).to eql({1 => 2, 3 => 4})
-      end
-
-      it "with ancestor of a hash" do
-        ancestor_of_hash = ActionController::Parameters.new({ key: :value })
-        @a.set_preference(:is_hash, ancestor_of_hash)
-        expect(@a.preferences[:is_hash]).to eql({"key" => :value})
+        @a.set_preference(:is_hash, { 1 => 2, 3 => 4 })
+        expect(@a.preferences[:is_hash]).to eql({ 1 => 2, 3 => 4 })
       end
     end
 
     context "converts any preferences to any values" do
       before do
-        A.preference :product_ids, :any, :default => []
-        A.preference :product_attributes, :any, :default => {}
+        A.preference :product_ids, :any, default: []
+        A.preference :product_attributes, :any, default: {}
       end
 
       it "with array" do
@@ -220,11 +211,10 @@ describe Spree::Preferences::Preferable, :type => :model do
 
       it "with hash" do
         expect(@a.preferences[:product_attributes]).to eq({})
-        @a.set_preference(:product_attributes, {:id => 1, :name => 2})
-        expect(@a.preferences[:product_attributes]).to eq({:id => 1, :name => 2})
+        @a.set_preference(:product_attributes, { id: 1, name: 2 })
+        expect(@a.preferences[:product_attributes]).to eq({ id: 1, name: 2 })
       end
     end
-
   end
 
   describe "persisted preferables" do
@@ -247,8 +237,8 @@ describe Spree::Preferences::Preferable, :type => :model do
       CreatePrefTest.migrate(:up)
 
       class PrefTest < Spree::Base
-        preference :pref_test_pref, :string, :default => 'abc'
-        preference :pref_test_any, :any, :default => []
+        preference :pref_test_pref, :string, default: 'abc'
+        preference :pref_test_any, :any, default: []
       end
     end
 
@@ -284,11 +274,10 @@ describe Spree::Preferences::Preferable, :type => :model do
       @pt.preferred_pref_test_pref = 'lmn'
       @pt.save!
       @pt.destroy
-      @pt1 = PrefTest.new(:col => 'aaaa')
+      @pt1 = PrefTest.new(col: 'aaaa')
       @pt1.id = @pt.id
       @pt1.save!
       expect(@pt1.get_preference(:pref_test_pref)).to eq('abc')
     end
   end
-
 end

data/spec/models/spree/preferences/scoped_store_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Preferences::ScopedStore, :type => :model do
+describe Spree::Preferences::ScopedStore, type: :model do
   let(:scoped_store){ described_class.new(prefix, suffix) }
   subject{ scoped_store }
   let(:prefix){ nil }

data/spec/models/spree/preferences/static_model_preferences_spec.rb

@@ -11,7 +11,6 @@ module Spree
     let(:other_class){ Class.new }
     let(:definitions){ subject.for_class(preference_class) }
 
-
     it "is empty by default" do
       expect(definitions).to be_empty
     end
@@ -24,14 +23,14 @@ module Spree
 
     it "errors assigning invalid preferences" do
       expect {
-        subject.add(preference_class, 'my_definition', {ice_cream: 'chocolate'})
+        subject.add(preference_class, 'my_definition', { ice_cream: 'chocolate' })
       }.to raise_error(/\APreference :ice_cream is not defined/)
     end
 
     context "with stored definitions" do
       before do
-        subject.add(preference_class, 'light', {color: 'white'})
-        subject.add(preference_class, 'dark', {color: 'black'})
+        subject.add(preference_class, 'light', { color: 'white' })
+        subject.add(preference_class, 'dark', { color: 'black' })
         subject.add(preference_class, 'no_preference', {})
       end
 
@@ -42,13 +41,13 @@ module Spree
         end
 
         it "can be converted to hash" do
-          expect(definition.to_hash).to eq({color: 'black'})
+          expect(definition.to_hash).to eq({ color: 'black' })
         end
 
         it "ignores assignment" do
           definition[:color] = 'maroon'
           expect(definition.fetch(:color)).to eq 'black'
-          expect(definition.to_hash).to eq({color: 'black'})
+          expect(definition.to_hash).to eq({ color: 'black' })
         end
       end
 

data/spec/models/spree/preferences/statically_configurable_spec.rb

@@ -7,11 +7,7 @@ module Spree
       Class.new do
         attr_accessor :preferences
         def initialize
-          @preferences = {color: 'blue'}
-        end
-
-        def [](key)
-          return @preferences if key == :preferences
+          @preferences = { color: 'blue' }
         end
       end
     end
@@ -56,7 +52,7 @@ module Spree
       end
 
       it "ignores assignment" do
-        subject.preferences = {color: 'orange'}
+        subject.preferences = { color: 'orange' }
         expect(subject.preferred_color).to eq "red"
       end
     end

data/spec/models/spree/preferences/store_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Preferences::Store, :type => :model do
+describe Spree::Preferences::Store, type: :model do
   before :each do
     @store = Spree::Preferences::StoreInstance.new
   end
@@ -17,7 +17,7 @@ describe Spree::Preferences::Store, :type => :model do
   end
 
   it "will return db value when cache is emtpy and cache the db value" do
-    preference = Spree::Preference.where(:key => 'test').first_or_initialize
+    preference = Spree::Preference.where(key: 'test').first_or_initialize
     preference.value = '123'
     preference.save
 
@@ -35,5 +35,4 @@ describe Spree::Preferences::Store, :type => :model do
   it "should return nil when key can't be found and fallback value is not supplied" do
     expect(@store.get(:random_key){ nil }).to be_nil
   end
-
 end

data/spec/models/spree/price_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Price, :type => :model do
+describe Spree::Price, type: :model do
   describe 'validations' do
     let(:variant) { stub_model Spree::Variant }
     subject { Spree::Price.new variant: variant, amount: amount }
@@ -22,20 +22,20 @@ describe Spree::Price, :type => :model do
       end
     end
 
-    context 'when the amount is greater than 999,999.99' do
-      let(:amount) { 1_000_000 }
+    context 'when the amount is greater than maximum amount' do
+      let(:amount) { Spree::Price::MAXIMUM_AMOUNT + 1 }
 
       it 'has 1 error_on' do
         expect(subject.error_on(:amount).size).to eq(1)
       end
       it 'populates errors' do
         subject.valid?
-        expect(subject.errors.messages[:amount].first).to eq 'must be less than or equal to 999999.99'
+        expect(subject.errors.messages[:amount].first).to eq "must be less than or equal to #{Spree::Price::MAXIMUM_AMOUNT}"
       end
     end
 
-    context 'when the amount is between 0 and 999,999.99' do
-      let(:amount) { 100 }
+    context 'when the amount is between 0 and the maximum amount' do
+      let(:amount) { Spree::Price::MAXIMUM_AMOUNT }
       it { is_expected.to be_valid }
     end
   end

data/spec/models/spree/product/scopes_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Product scopes", :type => :model do
+describe "Product scopes", type: :model do
   let!(:product) { create(:product) }
 
   context "A product assigned to parent and child taxons" do
@@ -8,8 +8,8 @@ describe "Product scopes", :type => :model do
       @taxonomy = create(:taxonomy)
       @root_taxon = @taxonomy.root
 
-      @parent_taxon = create(:taxon, :name => 'Parent', :taxonomy_id => @taxonomy.id, :parent => @root_taxon)
-      @child_taxon = create(:taxon, :name =>'Child 1', :taxonomy_id => @taxonomy.id, :parent => @parent_taxon)
+      @parent_taxon = create(:taxon, name: 'Parent', taxonomy_id: @taxonomy.id, parent: @root_taxon)
+      @child_taxon = create(:taxon, name: 'Child 1', taxonomy_id: @taxonomy.id, parent: @parent_taxon)
       @parent_taxon.reload # Need to reload for descendents to show up
 
       product.taxons << @parent_taxon
@@ -24,7 +24,7 @@ describe "Product scopes", :type => :model do
     end
 
     it "calling Product.in_taxon should not return duplicate records" do
-      expect(Spree::Product.in_taxon(@parent_taxon).to_a.count).to eq(1)
+      expect(Spree::Product.in_taxon(@parent_taxon).to_a.size).to eq(1)
     end
 
     context 'orders products based on their ordering within the classifications' do
@@ -38,7 +38,7 @@ describe "Product scopes", :type => :model do
 
       it 'after ordering changed' do
         [@child_taxon, other_taxon].each do |taxon|
-          Spree::Classification.find_by(:taxon => taxon, :product => product).insert_at(2)
+          Spree::Classification.find_by(taxon: taxon, product: product).insert_at(2)
           expect(Spree::Product.in_taxon(taxon)).to eq([product_2, product])
         end
       end
@@ -47,8 +47,8 @@ describe "Product scopes", :type => :model do
 
   context "property scopes" do
     let(:name) { "A proper tee" }
-    let(:value) { "A proper value"}
-    let!(:property) { create(:property, name: name)}
+    let(:value) { "A proper value" }
+    let!(:property) { create(:property, name: name) }
 
     before do
       product.properties << property
@@ -58,58 +58,58 @@ describe "Product scopes", :type => :model do
     context "with_property" do
       let(:with_property) { Spree::Product.method(:with_property) }
       it "finds by a property's name" do
-        expect(with_property.(name).count).to eq(1)
+        expect(with_property.call(name).count).to eq(1)
       end
 
       it "doesn't find any properties with an unknown name" do
-        expect(with_property.("fake").count).to eq(0)
+        expect(with_property.call("fake").count).to eq(0)
       end
 
       it "finds by a property" do
-        expect(with_property.(property).count).to eq(1)
+        expect(with_property.call(property).count).to eq(1)
       end
 
       it "finds by an id" do
-        expect(with_property.(property.id).count).to eq(1)
+        expect(with_property.call(property.id).count).to eq(1)
       end
 
       it "cannot find a property with an unknown id" do
-        expect(with_property.(0).count).to eq(0)
+        expect(with_property.call(0).count).to eq(0)
       end
     end
 
     context "with_property_value" do
       let(:with_property_value) { Spree::Product.method(:with_property_value) }
       it "finds by a property's name" do
-        expect(with_property_value.(name, value).count).to eq(1)
+        expect(with_property_value.call(name, value).count).to eq(1)
       end
 
       it "cannot find by an unknown property's name" do
-        expect(with_property_value.("fake", value).count).to eq(0)
+        expect(with_property_value.call("fake", value).count).to eq(0)
       end
 
       it "cannot find with a name by an incorrect value" do
-        expect(with_property_value.(name, "fake").count).to eq(0)
+        expect(with_property_value.call(name, "fake").count).to eq(0)
       end
 
       it "finds by a property" do
-        expect(with_property_value.(property, value).count).to eq(1)
+        expect(with_property_value.call(property, value).count).to eq(1)
       end
 
       it "cannot find with a property by an incorrect value" do
-        expect(with_property_value.(property, "fake").count).to eq(0)
+        expect(with_property_value.call(property, "fake").count).to eq(0)
       end
 
       it "finds by an id with a value" do
-        expect(with_property_value.(property.id, value).count).to eq(1)
+        expect(with_property_value.call(property.id, value).count).to eq(1)
       end
 
       it "cannot find with an invalid id" do
-        expect(with_property_value.(0, value).count).to eq(0)
+        expect(with_property_value.call(0, value).count).to eq(0)
       end
 
       it "cannot find with an invalid value" do
-        expect(with_property_value.(property.id, "fake").count).to eq(0)
+        expect(with_property_value.call(property.id, "fake").count).to eq(0)
       end
     end
   end

data/spec/models/spree/product_duplicator_spec.rb

@@ -1,53 +1,43 @@
 require 'spec_helper'
 
 module Spree
-
-  describe Spree::ProductDuplicator, :type => :model do
-
-    let(:product) { create(:product, properties: [create(:property, name: "MyProperty")])}
-    let!(:duplicator) { Spree::ProductDuplicator.new(product)}
+  describe Spree::ProductDuplicator, type: :model do
+    let(:product) { create(:product, properties: [create(:property, name: "MyProperty")]) }
+    let!(:duplicator) { Spree::ProductDuplicator.new(product) }
 
     let(:image) { File.open(File.expand_path('../../../fixtures/thinking-cat.jpg', __FILE__)) }
-    let(:params) { {:viewable_id => product.master.id, :viewable_type => 'Spree::Variant', :attachment => image, :alt => "position 1", :position => 1} }
+    let(:params) { { viewable_id: product.master.id, viewable_type: 'Spree::Variant', attachment: image, alt: "position 1", position: 1 } }
 
     before do
       Spree::Image.create(params)
     end
 
     it "will duplicate the product" do
-      expect{duplicator.duplicate}.to change{Spree::Product.count}.by(1)
+      expect{ duplicator.duplicate }.to change{ Spree::Product.count }.by(1)
     end
 
     context 'when image duplication enabled' do
-
       it "will duplicate the product images" do
-        expect{duplicator.duplicate}.to change{Spree::Image.count}.by(1)
+        expect{ duplicator.duplicate }.to change{ Spree::Image.count }.by(1)
       end
-
     end
 
     context 'when image duplication disabled' do
-
       let!(:duplicator) { Spree::ProductDuplicator.new(product, false) }
 
       it "will not duplicate the product images" do
-        expect{duplicator.duplicate}.to change{Spree::Image.count}.by(0)
+        expect{ duplicator.duplicate }.to change{ Spree::Image.count }.by(0)
       end
-
     end
 
     context 'image duplication default' do
-
       context 'when default is set to true' do
-
         it 'clones images if no flag passed to initializer' do
-          expect{duplicator.duplicate}.to change{Spree::Image.count}.by(1)
+          expect{ duplicator.duplicate }.to change{ Spree::Image.count }.by(1)
         end
-
       end
 
       context 'when default is set to false' do
-
         before do
           ProductDuplicator.clone_images_default = false
         end
@@ -57,15 +47,13 @@ module Spree
         end
 
         it 'does not clone images if no flag passed to initializer' do
-          expect{ProductDuplicator.new(product).duplicate}.to change{Spree::Image.count}.by(0)
+          expect{ ProductDuplicator.new(product).duplicate }.to change{ Spree::Image.count }.by(0)
         end
-
       end
-
     end
 
     context "product attributes" do
-      let!(:new_product) {duplicator.duplicate}
+      let!(:new_product) { duplicator.duplicate }
 
       it "will set an unique name" do
         expect(new_product.name).to eql "COPY OF #{product.name}"
@@ -82,22 +70,21 @@ module Spree
     end
 
     context "with variants" do
-      let(:option_type) { create(:option_type, name: "MyOptionType")}
-      let(:option_value1) { create(:option_value, name: "OptionValue1", option_type: option_type)}
-      let(:option_value2) { create(:option_value, name: "OptionValue2", option_type: option_type)}
+      let(:option_type) { create(:option_type, name: "MyOptionType") }
+      let(:option_value1) { create(:option_value, name: "OptionValue1", option_type: option_type) }
+      let(:option_value2) { create(:option_value, name: "OptionValue2", option_type: option_type) }
 
       let!(:variant1) { create(:variant, product: product, option_values: [option_value1]) }
       let!(:variant2) { create(:variant, product: product, option_values: [option_value2]) }
 
-      it  "will duplciate the variants" do
+      it "will duplciate the variants" do
         # will change the count by 3, since there will be a master variant as well
-        expect{duplicator.duplicate}.to change{Spree::Variant.count}.by(3)
+        expect{ duplicator.duplicate }.to change{ Spree::Variant.count }.by(3)
       end
 
       it "will not duplicate the option values" do
-        expect{duplicator.duplicate}.to change{Spree::OptionValue.count}.by(0)
+        expect{ duplicator.duplicate }.to change{ Spree::OptionValue.count }.by(0)
       end
-
     end
   end
 end

data/spec/models/spree/product_filter_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 require 'spree/core/product_filters'
 
-describe 'product filters', :type => :model do
+describe 'product filters', type: :model do
   # Regression test for https://github.com/spree/spree/issues/1709
   context 'finds products filtered by brand' do
     let(:product) { create(:product) }
     before do
-      property = Spree::Property.create!(:name => "brand", :presentation => "brand")
+      Spree::Property.create!(name: "brand", presentation: "brand")
       product.set_property("brand", "Nike")
     end