RubyGems - spree_core - Versions diffs - 3.0.9 → 3.2.0 - Mend

spree_core 3.0.9 → 3.2.0

Files changed (627) hide show

data/lib/tasks/exchanges.rake CHANGED Viewed

@@ -35,7 +35,7 @@ namespace :exchanges do
           variant_inventory_units.each { |i| i.update_attributes!(line_item_id: line_item.id, order_id: order.id) }
         end
-        order.reload.update!
+        order.reload.update_with_updater!
         while order.state != order.checkout_steps[-2] && order.next; end
         unless order.payments.present?
@@ -54,7 +54,7 @@ namespace :exchanges do
         order.update_attributes!(state: "confirm")
         order.reload.next!
-        order.update!
+        order.update_with_updater!
         order.finalize!
         failed_orders << order unless order.completed? && order.valid?

data/spec/fixtures/microdata.html ADDED Viewed

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+    <!-- shameless -->
+    <head>
+        <title>Jason Ronallo</title>
+    </head>
+    <body>
+      <span itemscope itemtype="http://schema.org/Person"
+        itemid="http://ronallo.com#me">
+        <a itemprop="url" href="http://twitter.com/ronallo">
+          <span itemprop="name">Jason Ronallo</span>
+        </a> is the
+        <span itemprop="jobTitle">Associate Head of Digital Library Initiatives</span> at
+        <span itemprop="affiliation" itemscope itemtype="http://schema.org/Library" itemid="http://lib.ncsu.edu">
+          <span itemprop="name">
+            <a itemprop="url" href="http://www.lib.ncsu.edu">NCSU Libraries</a>
+          </span>
+        </span>
+      </span>
+    </body>
+</html>

data/spec/fixtures/microdata_itemref.html ADDED Viewed

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+      <title>itemref example from Microdata spec</title>
+  </head>
+  <body>
+    <div itemscope id="amanda" itemref="a b"></div>
+    <p id="a">Name: <span itemprop="name">Amanda</span></p>
+    <div id="b" itemprop="band" itemscope itemref="c"></div>
+    <div id="c">
+      <p>Band: <span itemprop="name">Jazz Band</span></p>
+      <p>Size: <span itemprop="size">12</span> players</p>
+    </div>
+  </body>
+</html>

data/spec/fixtures/microdata_no_itemscope.html ADDED Viewed

@@ -0,0 +1,20 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Jason Ronallo</title>
+    </head>
+    <body>
+      <span itemtype="http://schema.org/Person"
+        itemid="http://ronallo.com#me">
+        <a itemprop="url" href="http://twitter.com/ronallo">
+          <span itemprop="name">Jason Ronallo</span>
+        </a> is the
+        <span itemprop="jobTitle">Associate Head of Digital Library Initiatives</span> at
+        <span itemprop="affiliation" itemtype="http://schema.org/Library" itemid="http://lib.ncsu.edu">
+          <span itemprop="name">
+            <a itemprop="url" href="http://www.lib.ncsu.edu">NCSU Libraries</a>
+          </span>
+        </span>
+      </span>
+    </body>
+</html>

data/spec/helpers/base_helper_spec.rb CHANGED Viewed

@@ -25,8 +25,8 @@ describe Spree::BaseHelper, type: :helper do
     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)
+          @country_zone = create(:zone, name: "CountryZone")
+          @country_zone.members.create(zoneable: country)
           Spree::Config[:checkout_zone] = @country_zone.name
         end
@@ -37,9 +37,9 @@ describe Spree::BaseHelper, type: :helper do
       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)
+          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
@@ -52,10 +52,10 @@ describe Spree::BaseHelper, type: :helper do
   # Regression test for #1436
   context "defining custom image helpers" do
-    let(:product) { mock_model(Spree::Product, :images => [], :variant_images => []) }
+    let(:product) { mock_model(Spree::Product, images: [], variant_images: []) }
     before do
       Spree::Image.class_eval do
-        attachment_definitions[:attachment][:styles].merge!({:very_strange => '1x1'})
+        attachment_definitions[:attachment][:styles].merge!({very_strange: '1x1'})
       end
     end
@@ -103,8 +103,8 @@ describe Spree::BaseHelper, type: :helper 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 = Faker::Lorem.paragraphs(2).join(" ")
-      @test = Spree::Product.new(:description => text)
+      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"
@@ -113,10 +113,10 @@ describe Spree::BaseHelper, type: :helper do
   # Regression test for #5384
   context "custom image helpers conflict with inproper statements" do
-    let(:product) { mock_model(Spree::Product, :images => [], :variant_images => []) }
+    let(:product) { mock_model(Spree::Product, images: [], variant_images: []) }
     before do
       Spree::Image.class_eval do
-        attachment_definitions[:attachment][:styles].merge!({:foobar => '1x1'})
+        attachment_definitions[:attachment][:styles].merge!({foobar: '1x1'})
       end
     end
@@ -134,4 +134,67 @@ describe Spree::BaseHelper, type: :helper 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

data/spec/helpers/products_helper_spec.rb CHANGED Viewed

@@ -1,9 +1,9 @@
 # encoding: utf-8
-require 'spec_helper'
+require "spec_helper"
 module Spree
-  describe ProductsHelper, :type => :helper do
+  describe ProductsHelper, type: :helper do
     include ProductsHelper
     let(:product) { create(:product) }
@@ -18,7 +18,7 @@ module Spree
       let(:variant_price) { 10 }
       before do
-        @variant = create(:variant, :product => product)
+        @variant = create(:variant, product: product)
         product.price = 15
         @variant.price = 10
         allow(product).to receive(:amount_in) { product_price }
@@ -75,8 +75,8 @@ module Spree
     context "#variant_price_full" do
       before do
         Spree::Config[:show_variant_full_price] = true
-        @variant1 = create(:variant, :product => product)
-        @variant2 = create(:variant, :product => product)
+        @variant1 = create(:variant, product: product)
+        @variant2 = create(:variant, product: product)
       end
       context "when currency is default" do
@@ -158,6 +158,10 @@ THIS IS THE BEST PRODUCT EVER!
         expect(description).to eq(initialDescription)
       end
+      context "renders a product description default description incase description is blank" do
+        before { product.description = '' }
+        it { expect(product_description(product)).to eq(Spree.t(:product_has_no_description)) }
+      end
     end
     shared_examples_for "line item descriptions" do
@@ -179,13 +183,6 @@ THIS IS THE BEST PRODUCT EVER!
       end
     end
-    context "#line_item_description" do
-      let(:variant) { create(:variant, :product => product, description: description) }
-      subject { line_item_description_text(variant.product.description) }
-      it_should_behave_like "line item descriptions"
-    end
     context '#line_item_description_text' do
       subject { line_item_description_text description }
@@ -193,10 +190,14 @@ THIS IS THE BEST PRODUCT EVER!
     end
     context '#cache_key_for_products' do
+      let(:zone) { Spree::Zone.new }
+      let(:price_options) { { tax_zone: zone } }
       subject { helper.cache_key_for_products }
       before(:each) do
         @products = double('products collection')
-        allow(helper).to receive(:params) { {:page => 10} }
+        allow(helper).to receive(:params) { {page: 10} }
+        allow(helper).to receive(:current_price_options) { price_options }
       end
       context 'when there is a maximum updated date' do
@@ -206,7 +207,7 @@ THIS IS THE BEST PRODUCT EVER!
           allow(@products).to receive(:maximum).with(:updated_at) { updated_at }
         end
-        it { is_expected.to eq('en/USD/spree/products/all-10-20111213-5') }
+        it { is_expected.to eq("en/USD/spree/zones/new/spree/products/all-10-20111213-5") }
       end
       context 'when there is no considered maximum updated date' do
@@ -217,7 +218,71 @@ THIS IS THE BEST PRODUCT EVER!
           allow(Date).to receive(:today) { today }
         end
-        it { is_expected.to eq('en/USD/spree/products/all-10-20131211-1234567') }
+        it { is_expected.to eq("en/USD/spree/zones/new/spree/products/all-10-20131211-1234567") }
+      end
+    end
+    context "#cache_key_for_product" do
+      let(:product) { Spree::Product.new }
+      let(:price_options) { { tax_zone: zone } }
+      subject(:cache_key) { helper.cache_key_for_product(product) }
+      before do
+        allow(helper).to receive(:current_price_options) { price_options }
+      end
+      context "when there is a current tax zone" do
+        let(:zone) { Spree::Zone.new }
+        it "includes the current_tax_zone" do
+          is_expected.to eq("en/USD/spree/zones/new/spree/products/new/")
+        end
+      end
+      context "when there is no current tax zone" do
+        let(:zone) { nil }
+        it { is_expected.to eq("en/USD/spree/products/new/") }
+      end
+      context "when current_price_options includes nil values" do
+        let(:price_options) do
+          {
+            a: nil,
+            b: Spree::Zone.new
+          }
+        end
+        it "does not include nil values" do
+          expect(cache_key).to eq("en/USD/spree/zones/new/spree/products/new/")
+        end
+      end
+      context "when current_price_options includes values that do not implement cache_key" do
+        let(:price_options) do
+          {
+            a: true,
+            b: Spree::Zone.new
+          }
+        end
+        it "includes string representations of these values" do
+          expect(cache_key).to eq("en/USD/true/spree/zones/new/spree/products/new/")
+        end
+      end
+      context "when keys in the options hash are inserted in non-alphabetical order" do
+        let(:price_options) do
+          {
+            b: Spree::Zone.new,
+            a: true
+          }
+        end
+        it "the values are nevertheless returned in alphabetical order of their keys" do
+          expect(cache_key).to eq("en/USD/true/spree/zones/new/spree/products/new/")
+        end
       end
     end
   end

data/spec/lib/i18n_spec.rb CHANGED Viewed

@@ -6,15 +6,15 @@ describe "i18n" do
   before do
     I18n.backend.store_translations(:en,
     {
-      :spree => {
-        :foo => "bar",
-        :bar => {
-          :foo => "bar within bar scope",
-          :invalid => nil,
-          :legacy_translation => "back in the day..."
+      spree: {
+        foo: "bar",
+        bar: {
+          foo: "bar within bar scope",
+          invalid: nil,
+          legacy_translation: "back in the day..."
         },
-        :invalid => nil,
-        :legacy_translation => "back in the day..."
+        invalid: nil,
+        legacy_translation: "back in the day..."
       }
     })
   end
@@ -34,19 +34,19 @@ describe "i18n" do
   it "raise error without any context when using a path" do
     expect {
       Spree.normal_t('.legacy_translation')
-    }.to raise_error
+    }.to raise_error(StandardError)
     expect {
       Spree.translate('.legacy_translation')
-    }.to raise_error
+    }.to raise_error(StandardError)
   end
   it "prepends a string scope" do
-    expect(Spree.normal_t(:foo, :scope => "bar")).to eql("bar within bar scope")
+    expect(Spree.normal_t(:foo, scope: "bar")).to eql("bar within bar scope")
   end
   it "prepends to an array scope" do
-    expect(Spree.normal_t(:foo, :scope => ["bar"])).to eql("bar within bar scope")
+    expect(Spree.normal_t(:foo, scope: ["bar"])).to eql("bar within bar scope")
   end
   it "returns two translations" do
@@ -74,7 +74,7 @@ describe "i18n" do
       end
       it "logs missing translations" do
-        Spree.t(:missing, :scope => [:else, :where])
+        Spree.t(:missing, scope: [:else, :where])
         Spree.check_missing_translations
         assert_missing_translation("else")
         assert_missing_translation("else.where")

data/spec/lib/search/base_spec.rb CHANGED Viewed

@@ -12,7 +12,7 @@ describe Spree::Core::Search::Base do
   end
   it "returns all products by default" do
-    params = { :per_page => "" }
+    params = { per_page: "" }
     searcher = Spree::Core::Search::Base.new(params)
     expect(searcher.retrieve_products.count).to eq(2)
   end
@@ -22,8 +22,8 @@ describe Spree::Core::Search::Base do
     subject { described_class.new(params).retrieve_products }
     before do
-      @product1.master.images.create(attachment_file_name: "Test", position: 2)
-      @product1.master.images.create(attachment_file_name: "Test1", position: 1)
+      @product1.master.images << create(:image, position: 2)
+      @product1.master.images << create(:image, position: 1)
       @product1.reload
     end
@@ -34,38 +34,38 @@ describe Spree::Core::Search::Base do
   end
   it "switches to next page according to the page parameter" do
-    @product3 = create(:product, :name => "RoR Pants", :price => 14.00)
+    @product3 = create(:product, name: "RoR Pants", price: 14.00)
-    params = { :per_page => "2" }
-    searcher = Spree::Core::Search::Base.new(params)
+    params = { per_page: "2" }
+    searcher = Spree::Core::Search::Base.new(ActionController::Parameters.new(params))
     expect(searcher.retrieve_products.count).to eq(2)
-    params.merge! :page => "2"
-    searcher = Spree::Core::Search::Base.new(params)
+    params.merge! page: "2"
+    searcher = Spree::Core::Search::Base.new(ActionController::Parameters.new(params))
     expect(searcher.retrieve_products.count).to eq(1)
   end
   it "maps search params to named scopes" do
-    params = { :per_page => "",
-               :search => { "price_range_any" => ["Under $10.00"] }}
-    searcher = Spree::Core::Search::Base.new(params)
+    params = { per_page: "",
+               search: { "price_range_any" => ["Under $10.00"] }}
+    searcher = Spree::Core::Search::Base.new(ActionController::Parameters.new(params))
     expect(searcher.send(:get_base_scope).to_sql).to match /<= 10/
     expect(searcher.retrieve_products.count).to eq(1)
   end
   it "maps multiple price_range_any filters" do
-    params = { :per_page => "",
-               :search => { "price_range_any" => ["Under $10.00", "$10.00 - $15.00"] }}
-    searcher = Spree::Core::Search::Base.new(params)
+    params = { per_page: "",
+               search: { "price_range_any" => ["Under $10.00", "$10.00 - $15.00"] }}
+    searcher = Spree::Core::Search::Base.new(ActionController::Parameters.new(params))
     expect(searcher.send(:get_base_scope).to_sql).to match /<= 10/
     expect(searcher.send(:get_base_scope).to_sql).to match /between 10 and 15/i
     expect(searcher.retrieve_products.count).to eq(2)
   end
   it "uses ransack if scope not found" do
-    params = { :per_page => "",
-               :search => { "name_not_cont" => "Shirt" }}
-    searcher = Spree::Core::Search::Base.new(params)
+    params = { per_page: "",
+               search: { "name_not_cont" => "Shirt" }}
+    searcher = Spree::Core::Search::Base.new(ActionController::Parameters.new(params))
     expect(searcher.retrieve_products.count).to eq(1)
   end
@@ -77,7 +77,7 @@ describe Spree::Core::Search::Base do
   end
   it "finds products in alternate currencies" do
-    price = create(:price, :currency => 'EUR', :variant => @product1.master)
+    price = create(:price, currency: 'EUR', variant: @product1.master)
     searcher = Spree::Core::Search::Base.new({})
     searcher.current_currency = 'EUR'
     expect(searcher.retrieve_products).to eq([@product1])

data/spec/lib/spree/core/controller_helpers/auth_spec.rb CHANGED Viewed

@@ -1,12 +1,14 @@
 require 'spec_helper'
+require 'spree/testing_support/url_helpers'
 class FakesController < ApplicationController
   include Spree::Core::ControllerHelpers::Auth
-  def index; render text: 'index'; end
+  def index; render plain: 'index'; end
 end
 describe Spree::Core::ControllerHelpers::Auth, type: :controller do
   controller(FakesController) {}
+  include Spree::TestingSupport::UrlHelpers
   describe '#current_ability' do
     it 'returns Spree::Ability instance' do
@@ -38,7 +40,7 @@ describe Spree::Core::ControllerHelpers::Auth, type: :controller do
     controller(FakesController) do
       def index
         set_guest_token
-        render text: 'index'
+        render plain: 'index'
       end
     end
     it 'sends cookie header' do
@@ -77,9 +79,9 @@ describe Spree::Core::ControllerHelpers::Auth, type: :controller do
       before do
         allow(controller).to receive_messages(try_spree_current_user: double('User', id: 1, last_incomplete_spree_order: nil))
       end
-      it 'redirects unauthorized path' do
+      it 'redirects forbidden path' do
         get :index
-        expect(response).to redirect_to('/unauthorized')
+        expect(response).to redirect_to(spree.forbidden_path)
       end
     end
     context 'when guest user' do

data/spec/lib/spree/core/controller_helpers/order_spec.rb CHANGED Viewed

@@ -45,6 +45,21 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller do
         expect(Spree::Order.last.store_id).to eq store.id
       end
     end
+    context 'gets using the guest_token' do
+      let!(:order) { create :order, user: user }
+      let!(:guest_order) { create :order, user: nil, email: nil, guest_token: 'token' }
+      before do
+        expect(controller).to receive(:current_order_params).and_return(
+          currency: Spree::Config[:currency], guest_token: 'token', store_id: guest_order.store_id, user_id: user.id,
+        )
+      end
+      specify 'without the guest token being bound to any user yet' do
+        expect(controller.current_order).to eq guest_order
+      end
+    end
   end
   describe '#associate_user' do

data/spec/lib/spree/core/controller_helpers/store_spec.rb CHANGED Viewed

@@ -1,6 +1,8 @@
 require 'spec_helper'
 class FakesController < ApplicationController
+  include Spree::Core::ControllerHelpers::Auth
+  include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 end
@@ -13,4 +15,58 @@ describe Spree::Core::ControllerHelpers::Store, type: :controller do
       expect(controller.current_store).to eq store
     end
   end
+  describe "#current_price_options" do
+    subject(:current_price_options) { controller.current_price_options }
+    context "when there is a default tax zone" do
+      let(:default_zone) { Spree::Zone.new }
+      before do
+        allow(Spree::Zone).to receive(:default_tax).and_return(default_zone)
+      end
+      context "when there is no current order" do
+        it "returns the default tax zone" do
+          is_expected.to include(tax_zone: default_zone)
+        end
+      end
+      context "when there is a current order" do
+        let(:other_zone) { Spree::Zone.new }
+        let(:current_order) { Spree::Order.new }
+        before do
+          allow(current_order).to receive(:tax_zone).and_return(other_zone)
+          allow(controller).to receive(:current_order).and_return(current_order)
+        end
+        it { is_expected.to include(tax_zone: other_zone) }
+      end
+    end
+    context "when there is no default tax zone" do
+      before do
+        allow(Spree::Zone).to receive(:default_tax).and_return(nil)
+      end
+      context "when there is no current order" do
+        it "return nil when asked for the current tax zone" do
+          expect(current_price_options[:tax_zone]).to be_nil
+        end
+      end
+      context "when there is a current order" do
+        let(:other_zone) { Spree::Zone.new }
+        let(:current_order) { Spree::Order.new }
+        before do
+          allow(current_order).to receive(:tax_zone).and_return(other_zone)
+          allow(controller).to receive(:current_order).and_return(current_order)
+        end
+        it { is_expected.to include(tax_zone: other_zone) }
+      end
+    end
+  end
 end