spree_core 3.1.14 → 3.2.0.rc1

data/lib/spree/core/product_filters.rb

@@ -108,7 +108,7 @@ module Spree
         pp = Spree::ProductProperty.arel_table
         conds = Hash[*brands.map { |b| [b, pp[:value].eq(b)] }.flatten]
         {
-          name:   'Brands',
+          name:   I18n.t('spree.taxonomy_brands_name'),
           scope:  :brand_any,
           conds:  conds,
           labels: (brands.sort).map { |k| [k, k] }

data/lib/spree/core/search/base.rb

@@ -70,7 +70,7 @@ module Spree
               else
                 base_scope = base_scope.merge(Spree::Product.ransack({scope_name => scope_attribute}).result)
               end
-            end if search.is_a?(Hash)
+            end if search.is_a?(ActionController::Parameters)
             base_scope
           end
 

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.1.14"
+    "3.2.0.rc1"
   end
 end

data/lib/spree/i18n/initializer.rb

@@ -1 +1 @@
-Spree::BaseController.send(:include, Spree::ViewContext)
+Spree::BaseController.include Spree::ViewContext

data/lib/spree/money.rb

@@ -15,17 +15,13 @@ module Spree
 
     attr_reader :money
 
-    delegate :cents, :currency, to: :money
+    delegate :cents, to: :money
 
     def initialize(amount, options={})
       @money = Monetize.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
       @options = Spree::Money.default_formatting_rules.merge(options)
     end
 
-    def amount_in_cents
-      (cents / currency.subunit_to_unit.to_f * 100).round
-    end
-
     def to_s
       @money.format(@options)
     end
@@ -44,16 +40,6 @@ module Spree
       to_s
     end
 
-    def decimal_mark
-      return @money.decimal_mark if @options[:decimal_mark].nil?
-      @options[:decimal_mark]
-    end
-
-    def thousands_separator
-      return @money.thousands_separator if @options[:thousands_separator].nil?
-      @options[:thousands_separator]
-    end
-
     def ==(obj)
       @money == obj.money
     end

data/lib/spree/permitted_attributes.rb

@@ -45,7 +45,7 @@ module Spree
 
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 
-    @@inventory_unit_attributes = [:shipment, :variant_id]
+    @@inventory_unit_attributes = [:shipment, :shipment_id, :variant_id]
 
     @@line_item_attributes = [:id, :variant_id, :quantity]
 

data/lib/spree/testing_support/caching.rb

@@ -24,9 +24,9 @@ module Spree
 end
 
 RSpec.configure do |config|
-  config.include Spree::TestingSupport::Caching, :caching => true
+  config.include Spree::TestingSupport::Caching, caching: true
 
-  config.before(:each, :caching => true) do
+  config.before(:each, caching: true) do
     ActionController::Base.perform_caching = true
 
     ActiveSupport::Notifications.subscribe("read_fragment.action_controller") do |event, start_time, finish_time, _, details|
@@ -40,7 +40,7 @@ RSpec.configure do |config|
     end
   end
 
-  config.after(:each, :caching => true) do
+  config.after(:each, caching: true) do
     ActionController::Base.perform_caching = false
     Rails.cache.clear
   end

data/lib/spree/testing_support/common_rake.rb

@@ -3,7 +3,6 @@ unless defined?(Spree::InstallGenerator)
 end
 
 require 'generators/spree/dummy/dummy_generator'
-require 'rails'
 
 desc "Generates a dummy app for testing"
 namespace :common do
@@ -12,7 +11,6 @@ namespace :common do
     require ENV['LIB_NAME'].to_s
 
     ENV['RAILS_ENV'] = 'test'
-    Rails.env = 'test'
 
     Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--quiet"]
     Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--auto-accept", "--migrate=false", "--seed=false", "--sample=false", "--quiet", "--user_class=#{args[:user_class]}"]

data/lib/spree/testing_support/controller_requests.rb

@@ -6,7 +6,7 @@
 #
 #   require 'spree/testing_support/controller_requests'
 #   RSpec.configure do |c|
-#     c.include Spree::TestingSupport::ControllerRequests, :type => :controller
+#     c.include Spree::TestingSupport::ControllerRequests, type: :controller
 #   end
 #
 # Then, in your controller tests, you can access spree routes like this:
@@ -80,13 +80,13 @@ module Spree
 
       def process_spree_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
         parameters ||= {}
-        process(action, method, parameters, session, flash)
+        process(action, method: method, params: parameters, session: session, flash: flash)
       end
 
       def process_spree_xhr_action(action, parameters = nil, session = nil, flash = nil, method = :get)
         parameters ||= {}
-        parameters.reverse_merge!(:format => :json)
-        xml_http_request(method, action, parameters, session, flash)
+        parameters.reverse_merge!(format: :json)
+        process(action, method: method, params: parameters, session: session, flash: flash, xhr: true)
       end
     end
   end

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

@@ -2,7 +2,6 @@ FactoryGirl.define do
   factory :line_item, class: Spree::LineItem do
     quantity 1
     price { BigDecimal.new('10.00') }
-    pre_tax_amount { price }
     order
     transient do
       association :product

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

@@ -81,6 +81,7 @@ FactoryGirl.define do
                 shipment.inventory_units.update_all state: 'shipped'
                 shipment.update_column('state', 'shipped')
               end
+              order.update_column('shipment_state', 'shipped')
               order.reload
             end
           end

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

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :tag, class: Spree::Tag do
+    sequence(:name) { |n| "Tag ##{n} - #{Kernel.rand(9999)}" }
+  end
+end

data/lib/spree/testing_support/kernel.rb

@@ -0,0 +1,18 @@
+module Spree
+  module TestingSupport
+    module Kernel
+
+      private
+
+      def silence_stream(stream)
+        old_stream = stream.dup
+        stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
+        stream.sync = true
+        yield
+      ensure
+        stream.reopen(old_stream)
+        old_stream.close
+      end
+    end
+  end
+end

data/lib/spree/testing_support/order_walkthrough.rb

@@ -13,8 +13,8 @@ class OrderWalkthrough
     # Need to create a valid zone too...
     zone = FactoryGirl.create(:zone)
     country = FactoryGirl.create(:country)
-    zone.members << Spree::ZoneMember.create(:zoneable => country)
-    country.states << FactoryGirl.create(:state, :country => country)
+    zone.members << Spree::ZoneMember.create(zoneable: country)
+    country.states << FactoryGirl.create(:state, country: country)
 
     # A shipping method must exist for rates to be displayed on checkout page
     unless Spree::ShippingMethod.exists?
@@ -45,8 +45,8 @@ class OrderWalkthrough
   end
 
   def self.address(order)
-    order.bill_address = FactoryGirl.create(:address, :country_id => Spree::Zone.global.members.first.zoneable.id)
-    order.ship_address = FactoryGirl.create(:address, :country_id => Spree::Zone.global.members.first.zoneable.id)
+    order.bill_address = FactoryGirl.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
+    order.ship_address = FactoryGirl.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
     order.next!
   end
 

data/lib/tasks/core.rake

@@ -32,7 +32,7 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
   end
 
   desc "Migrate schema to version 0 and back up again. WARNING: Destroys all data in tables!!"
-  task :remigrate => :environment do
+  task remigrate: :environment do
     require 'highline/import'
 
     if ENV['SKIP_NAG'] or ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [y/n] ")
@@ -101,7 +101,7 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
 
 
   desc "Fix orphan line items after upgrading to Spree 3.1: only needed if you have line items attached to deleted records with Slug (product) and SKU (variant) duplicates of non-deleted records."
-  task :fix_orphan_line_items => :environment do |t, args|
+  task fix_orphan_line_items: :environment do |t, args|
     def get_input
       STDOUT.flush
       input = STDIN.gets.chomp

data/spec/helpers/base_helper_spec.rb

@@ -0,0 +1,200 @@
+require 'spec_helper'
+
+describe Spree::BaseHelper, type: :helper do
+  include Spree::BaseHelper
+
+  let(:current_store){ create :store }
+
+  context "available_countries" do
+    let(:country) { create(:country) }
+
+    before do
+      3.times { create(:country) }
+    end
+
+    context "with no checkout zone defined" do
+      before do
+        Spree::Config[:checkout_zone] = nil
+      end
+
+      it "return complete list of countries" do
+        expect(available_countries.count).to eq(Spree::Country.count)
+      end
+    end
+
+    context "with a checkout zone defined" do
+      context "checkout zone is of type country" do
+        before do
+          @country_zone = create(:zone, name: "CountryZone")
+          @country_zone.members.create(zoneable: country)
+          Spree::Config[:checkout_zone] = @country_zone.name
+        end
+
+        it "return only the countries defined by the checkout zone" do
+          expect(available_countries).to eq([country])
+        end
+      end
+
+      context "checkout zone is of type state" do
+        before do
+          state_zone = create(:zone, name: "StateZone")
+          state = create(:state, country: country)
+          state_zone.members.create(zoneable: state)
+          Spree::Config[:checkout_zone] = state_zone.name
+        end
+
+        it "return complete list of countries" do
+          expect(available_countries.count).to eq(Spree::Country.count)
+        end
+      end
+    end
+  end
+
+  # Regression test for #1436
+  context "defining custom image helpers" do
+    let(:product) { mock_model(Spree::Product, images: [], variant_images: []) }
+    before do
+      Spree::Image.class_eval do
+        attachment_definitions[:attachment][:styles].merge!({very_strange: '1x1'})
+      end
+    end
+
+    it "should not raise errors when style exists" do
+      expect { very_strange_image(product) }.not_to raise_error
+    end
+
+    it "should raise NoMethodError when style is not exists" do
+      expect { another_strange_image(product) }.to raise_error(NoMethodError)
+    end
+  end
+
+  context "link_to_tracking" do
+    it "returns tracking link if available" do
+      a = link_to_tracking_html(shipping_method: true, tracking: '123', tracking_url: 'http://g.c/?t=123').css('a')
+
+      expect(a.text).to eq '123'
+      expect(a.attr('href').value).to eq 'http://g.c/?t=123'
+    end
+
+    it "returns tracking without link if link unavailable" do
+      html = link_to_tracking_html(shipping_method: true, tracking: '123', tracking_url: nil)
+      expect(html.css('span').text).to eq '123'
+    end
+
+    it "returns nothing when no shipping method" do
+      html = link_to_tracking_html(shipping_method: nil, tracking: '123')
+      expect(html.css('span').text).to eq ''
+    end
+
+    it "returns nothing when no tracking" do
+      html = link_to_tracking_html(tracking: nil)
+      expect(html.css('span').text).to eq ''
+    end
+
+    def link_to_tracking_html(options = {})
+      node = link_to_tracking(double(:shipment, options))
+      Nokogiri::HTML(node.to_s)
+    end
+  end
+
+  # Regression test for #2396
+  context "meta_data_tags" do
+    it "truncates a product description to 160 characters" do
+      # Because the controller_name method returns "test"
+      # controller_name is used by this method to infer what it is supposed
+      # to be generating meta_data_tags for
+      text = FFaker::Lorem.paragraphs(2).join(" ")
+      @test = Spree::Product.new(description: text)
+      tags = Nokogiri::HTML.parse(meta_data_tags)
+      content = tags.css("meta[name=description]").first["content"]
+      assert content.length <= 160, "content length is not truncated to 160 characters"
+    end
+  end
+
+  # Regression test for #5384
+  context "custom image helpers conflict with inproper statements" do
+    let(:product) { mock_model(Spree::Product, images: [], variant_images: []) }
+    before do
+      Spree::Image.class_eval do
+        attachment_definitions[:attachment][:styles].merge!({foobar: '1x1'})
+      end
+    end
+
+    it "should not raise errors when helper method called" do
+      expect { foobar_image(product) }.not_to raise_error
+    end
+
+    it "should raise NoMethodError when statement with name equal to style name called" do
+      expect { foobar(product) }.to raise_error(NoMethodError)
+    end
+  end
+
+  context "pretty_time" do
+    it "prints in a format" do
+      expect(pretty_time(DateTime.new(2012, 5, 6, 13, 33))).to eq "May 06, 2012  1:33 PM"
+    end
+  end
+
+  describe "#display_price" do
+    let!(:product) { create(:product) }
+    let(:current_currency) { "USD" }
+    let(:current_price_options) { { tax_zone: current_tax_zone } }
+
+    context "when there is no current order" do
+      let (:current_tax_zone) { nil }
+
+      it "returns the price including default vat" do
+        expect(display_price(product)).to eq("$19.99")
+      end
+
+      context "with a default VAT" do
+        let(:current_tax_zone) { create(:zone_with_country, default_tax: true) }
+        let!(:tax_rate) do
+          create :tax_rate,
+                 included_in_price: true,
+                 zone: current_tax_zone,
+                 tax_category: product.tax_category,
+                 amount: 0.2
+        end
+
+        it "returns the price adding the VAT" do
+          expect(display_price(product)).to eq("$19.99")
+        end
+      end
+    end
+
+    context "with an order that has a tax zone" do
+      let(:current_tax_zone) { create(:zone_with_country) }
+      let(:current_order) { Spree::Order.new }
+      let(:default_zone) { create(:zone_with_country, default_tax: true) }
+
+      let!(:default_vat) do
+        create :tax_rate,
+               included_in_price: true,
+               zone: default_zone,
+               tax_category: product.tax_category,
+               amount: 0.2
+      end
+
+      context "that matches no VAT" do
+        it "returns the price excluding VAT" do
+          expect(display_price(product)).to eq("$16.66")
+        end
+      end
+
+      context "that matches a VAT" do
+        let!(:other_vat) do
+          create :tax_rate,
+                 included_in_price: true,
+                 zone: current_tax_zone,
+                 tax_category: product.tax_category,
+                 amount: 0.4
+        end
+
+        it "returns the price adding the VAT" do
+          expect(display_price(product)).to eq("$23.32")
+        end
+      end
+    end
+  end
+end