spree_core 3.0.10 → 3.1.0.rc1

data/lib/tasks/core.rake

@@ -98,4 +98,72 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
     puts "Bootstrap Complete.\n\n"
   end
 
+
+
+  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|
+    def get_input
+      STDOUT.flush
+      input = STDIN.gets.chomp
+      case input.upcase
+        when "Y"
+          return true
+
+        when "N"
+          puts "aborting ....."
+          return false
+        else
+          return true
+      end
+    end
+
+    puts "WARNING: This task will re-associate any line_items associated with deleted variants to non-deleted variants with matching SKUs. Because other attributes and product associations may switch during the re-association, this may have unintended side-effects. If this task finishes successfully, line items for old order should no longer be orphaned from their varaints. You should run this task after you have already run the db migratoin AddDiscontinuedToProductsAndVariants. If the db migration did not warn you that it was leaving deleted records in place because of duplicate SKUs, then you do not need to run this rake task."
+    puts "Are you sure you want to continue? (Y/n):"
+
+    if get_input
+      puts "looping through all your deleted variants ..."
+
+      # first verify that I can really fix all of your line items
+
+      no_live_variants_found = []
+      variants_to_fix = []
+
+      Spree::Variant.deleted.each do |variant|
+        # check if this variant has any line items at all
+        if !variant.line_items.any?
+          next
+        end
+
+        variants_to_fix << variant
+        dup_variant = Spree::Variant.find_by(sku: variant.sku)
+        if dup_variant
+          # this variant is OK
+        else
+          no_live_variants_found << variant
+        end
+      end
+
+      if !variants_to_fix.any?
+        abort(  "ABORT: You have no deleted variants that are associated to line items. You do not need to run this raks task.")
+      end
+
+      if no_live_variants_found.any?
+        puts "ABORT: Unfortunately, I found some deleted variants in your database that do not have matching non-deleted variants to replace them with. This script can only be used to cleanup deleted variants that have SKUs that match non-deleted variants. To continue, you must either (1) un-delete these variants (hint: mark them 'discontinued' instead) or (2) create new variants with a matching SKU for each variant in the list below."
+        no_live_variants_found.each do |deleted_variant|
+          puts "variant id #{deleted_variant.id} (sku is '#{deleted_variant.sku}') ... no match found"
+        end
+        abort()
+      end
+
+
+      puts "Ready to fix..."
+      variants_to_fix.each do |variant|
+        dup_variant = Spree::Variant.find_by(sku: variant.sku)
+        puts "Changing all line items for #{variant.sku} variant id #{variant.id} (deleted) to variant id #{dup_variant.id} (not deleted) ..."
+        Spree::LineItem.unscoped.where(variant_id: variant.id).update_all(variant_id: dup_variant.id)
+      end
+
+      puts "DONE !   Your database should no longer have line items that are associated with deleted variants."
+    end
+  end
 end

data/lib/tasks/exchanges.rake

@@ -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

@@ -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

@@ -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

@@ -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

@@ -103,7 +103,7 @@ 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(" ")
+      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"]
@@ -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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'spec_helper'
+require "spec_helper"
 
 module Spree
   describe ProductsHelper, :type => :helper 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
@@ -193,10 +197,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(:current_price_options) { price_options }
       end
 
       context 'when there is a maximum updated date' do
@@ -206,7 +214,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 +225,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

@@ -34,11 +34,11 @@ 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

data/spec/lib/search/base_spec.rb

@@ -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
 

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

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'spree/testing_support/url_helpers'
 
 class FakesController < ApplicationController
   include Spree::Core::ControllerHelpers::Auth
@@ -7,6 +8,7 @@ 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
@@ -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/store_spec.rb

@@ -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