spree_frontend 3.0.10 → 3.1.0.rc1

data/spec/features/checkout_unshippable_spec.rb

@@ -14,7 +14,7 @@ describe "checkout with unshippable items", type: :feature, inaccessible: true d
 
     user = create(:user)
     order.user = user
-    order.update!
+    order.update_with_updater!
 
     allow_any_instance_of(Spree::CheckoutController).to receive_messages(:current_order => order)
     allow_any_instance_of(Spree::CheckoutController).to receive_messages(:try_spree_current_user => user)

data/spec/features/products_spec.rb

@@ -20,6 +20,23 @@ describe "Visiting Products", type: :feature, inaccessible: true do
     expect(page).to have_content("Shopping Cart")
   end
 
+  describe "correct displaying of microdata" do
+    let(:products) { Spree::TestingSupport::Microdata::Document.new(page.body).extract_items }
+    let(:ringer) { products.keep_if { |product| product.properties["name"].first.match("Ringer") }.first }
+
+    it "correctly displays the product name via microdata" do
+      expect(ringer.properties["name"]).to eq ["Ruby on Rails Ringer T-Shirt"]
+    end
+
+    it "correctly displays the product image via microdata" do
+      expect(ringer.properties['image'].first).to include '/assets/noimage/small'
+    end
+
+    it "correctly displays the product url via microdata" do
+      expect(ringer.properties["url"]).to eq ["http://www.example.com/products/ruby-on-rails-ringer-t-shirt"]
+    end
+  end
+
   describe 'meta tags and title' do
     let(:jersey) { Spree::Product.find_by_name('Ruby on Rails Baseball Jersey') }
     let(:metas) { { meta_description: 'Brand new Ruby on Rails Jersey', meta_title: 'Ruby on Rails Baseball Jersey Buy High Quality Geek Apparel', meta_keywords: 'ror, jersey, ruby' } }
@@ -124,7 +141,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
   context "a product with variants" do
     let(:product) { Spree::Product.find_by_name("Ruby on Rails Baseball Jersey") }
     let(:option_value) { create(:option_value) }
-    let!(:variant) { product.variants.create!(:price => 5.59) }
+    let!(:variant) { build(:variant, price: 5.59, product: product, option_values: []) }
 
     before do
       # Need to have two images to trigger the error
@@ -134,6 +151,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
 
       product.option_types << option_value.option_type
       variant.option_values << option_value
+      variant.save!
     end
 
     it "should be displayed" do
@@ -156,17 +174,26 @@ describe "Visiting Products", type: :feature, inaccessible: true do
         expect(page).not_to have_content Spree.t(:out_of_stock)
       end
     end
+
+    it "doesn't display cart form if all variants (including master) are out of stock" do
+      product.variants_including_master.each { |v| v.stock_items.update_all count_on_hand: 0, backorderable: false }
+
+      click_link product.name
+      within("[data-hook=product_price]") do
+        expect(page).not_to have_content Spree.t(:add_to_cart)
+      end
+    end
   end
 
   context "a product with variants, images only for the variants" do
     let(:product) { Spree::Product.find_by_name("Ruby on Rails Baseball Jersey") }
+    let(:variant1) { create(:variant, product: product, price: 9.99) }
+    let(:variant2) { create(:variant, product: product, price: 10.99) }
 
     before do
       image = File.open(File.expand_path('../../fixtures/thinking-cat.jpg', __FILE__))
-      v1 = product.variants.create!(price: 9.99)
-      v2 = product.variants.create!(price: 10.99)
-      v1.images.create!(attachment: image)
-      v2.images.create!(attachment: image)
+      variant1.images.create!(attachment: image)
+      variant2.images.create!(attachment: image)
     end
 
     it "should not display no image available" do
@@ -175,6 +202,51 @@ describe "Visiting Products", type: :feature, inaccessible: true do
     end
   end
 
+  context "an out of stock product without variants" do
+    let(:product) { Spree::Product.find_by_name("Ruby on Rails Tote") }
+
+    before do
+      product.master.stock_items.update_all count_on_hand: 0, backorderable: false
+    end
+
+    it "does display out of stock for master product" do
+      click_link product.name
+      within("#product-price") do
+        expect(page).to have_content Spree.t(:out_of_stock)
+      end
+    end
+
+    it "doesn't display cart form if master is out of stock" do
+      click_link product.name
+      within("[data-hook=product_price]") do
+        expect(page).not_to have_content Spree.t(:add_to_cart)
+      end
+    end
+  end
+
+  context 'product with taxons' do
+    let(:product) { Spree::Product.find_by_name("Ruby on Rails Tote") }
+    let(:taxon) { product.taxons.first }
+
+    it 'displays breadcrumbs for the default taxon when none selected' do
+      click_link product.name
+      within("#breadcrumbs") do
+        expect(page).to have_content taxon.name
+      end
+    end
+
+    it 'displays selected taxon in breadcrumbs' do
+      taxon = Spree::Taxon.last
+      product.taxons << taxon
+      product.save!
+      visit '/t/' + taxon.to_param
+      click_link product.name
+      within("#breadcrumbs") do
+        expect(page).to have_content taxon.name
+      end
+    end
+  end
+
   it "should be able to hide products without price" do
     expect(page.all('#products .product-list-item').size).to eq(9)
     Spree::Config.show_products_without_price = false
@@ -209,11 +281,11 @@ describe "Visiting Products", type: :feature, inaccessible: true do
     within(:css, '#sidebar_products_search') { click_button "Search" }
 
     expect(page.all('#products .product-list-item').size).to eq(2)
-    products = page.all('#products .product-list-item a[itemprop=name]')
+    products = page.all('#products .product-list-item span[itemprop=name]')
     expect(products.count).to eq(2)
 
     find('.pagination .next a').click
-    products = page.all('#products .product-list-item a[itemprop=name]')
+    products = page.all('#products .product-list-item span[itemprop=name]')
     expect(products.count).to eq(1)
   end
 

data/spec/helpers/frontend_helper_spec.rb

@@ -37,5 +37,21 @@ module Spree
       taxon = create(:taxon, name: "iphone")
       expect(spree.nested_taxons_path(taxon)).to eq("/t/iphone")
     end
+
+    context '#checkout_progress' do
+      before do
+        @order = create(:order, state: 'address')
+      end
+
+      it 'does not include numbers by default' do
+        output = checkout_progress
+        expect(output).to_not include('1.')
+      end
+
+      it 'has option to include numbers' do
+        output = checkout_progress(numbers: true)
+        expect(output).to include('1.')
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -45,6 +45,7 @@ require 'spree/testing_support/url_helpers'
 require 'spree/testing_support/order_walkthrough'
 require 'spree/testing_support/caching'
 require 'spree/testing_support/shoulda_matcher_configuration'
+require 'spree/testing_support/microdata'
 
 require 'paperclip/matchers'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.1.0.rc1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: 3.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: 3.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: 3.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: 3.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +106,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -421,6 +420,7 @@ files:
 - app/views/spree/checkout/edit.html.erb
 - app/views/spree/checkout/payment/_check.html.erb
 - app/views/spree/checkout/payment/_gateway.html.erb
+- app/views/spree/checkout/payment/_storecredit.html.erb
 - app/views/spree/content/cvv.html.erb
 - app/views/spree/content/test.html.erb
 - app/views/spree/home/index.html.erb
@@ -460,6 +460,7 @@ files:
 - app/views/spree/shared/_shipment_tracking.html.erb
 - app/views/spree/shared/_sidebar.html.erb
 - app/views/spree/shared/_taxonomies.html.erb
+- app/views/spree/shared/forbidden.html.erb
 - app/views/spree/shared/unauthorized.html.erb
 - app/views/spree/store/cart_link.html.erb
 - app/views/spree/taxons/_taxon.html.erb
@@ -498,6 +499,7 @@ files:
 - spec/features/currency_spec.rb
 - spec/features/free_shipping_promotions_spec.rb
 - spec/features/locale_spec.rb
+- spec/features/microdata_spec.rb
 - spec/features/order_spec.rb
 - spec/features/page_promotions_spec.rb
 - spec/features/products_spec.rb
@@ -578,13 +580,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.
@@ -612,6 +614,7 @@ test_files:
 - spec/features/currency_spec.rb
 - spec/features/free_shipping_promotions_spec.rb
 - spec/features/locale_spec.rb
+- spec/features/microdata_spec.rb
 - spec/features/order_spec.rb
 - spec/features/page_promotions_spec.rb
 - spec/features/products_spec.rb

data/CHANGELOG.md

@@ -1 +0,0 @@
-## Spree 3.0.0 (unreleased) ##