solidus_frontend 2.5.0.beta2 → 2.5.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4d6733bbc6df7e5eb0f70e4cfdec6e6a932cc59665d9babf9e6b2fdf2bf26c9
-  data.tar.gz: 38a552d07ee3008213d1be66b4b3c63575d60bdf21d692dded95201e4f662971
+  metadata.gz: afcc84b1a77998f966e9566e8d59f26970b0f5ef04298f2f14110eecf20f249d
+  data.tar.gz: 551753a14ed1cbc435237a065aa43697fd249582c2b6d5f821d9300ead4b1e60
 SHA512:
-  metadata.gz: 259293d584c19a0dc31e43b840e6427904c0ebdce0eb5c072dba9472d912683e1dae9234623b913475bfb2e71085c7dcd33ea011e79b8e83d0823b8299b91b68
-  data.tar.gz: 5bf2a1a6ff188e7b7e48ce9bb8206e316ab9134921d1513132ce1474e60d1c871dea9fe46a5908c9b28c27f1ccad465922ca10895187f42b5b98f61a6e2c720c
+  metadata.gz: 88e80456f440c19062e49df87c7cbd963dca27e546a6fb69bf1b9c07036d69732e31c508883733acbd3eb8600f7509e73a02e6983bb392726bfddff66654a71f
+  data.tar.gz: 1fde497b602c484be15d6e8cf0c3a11b008c64c629ce37651db7e490cef080f2f6a053d6c41711407f640143849badc2aadadf832dec43154bed3e8e560c1a3f

data/app/views/spree/shared/_products.html.erb

@@ -32,9 +32,11 @@
           </div>
           <%= link_to truncate(product.name, length: 50), url, class: 'info', itemprop: "name", title: product.name %>
           <span itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-            <span class="price selling" itemprop="price" content="<%= product.price_for(current_pricing_options).to_d %>">
-              <%= display_price(product) %>
-            </span>
+            <% if price = product.price_for(current_pricing_options) %>
+              <span class="price selling" itemprop="price" content="<%= price.to_d %>">
+                <%= price.to_html %>
+              </span>
+            <% end %>
             <span itemprop="priceCurrency" content="<%= current_pricing_options.currency %>"></span>
           </span>
         <% end %>

data/spec/features/products_spec.rb

@@ -269,6 +269,14 @@ describe "Visiting Products", type: :feature, inaccessible: true do
     expect(page).not_to have_content "add-to-cart-button"
   end
 
+  it "should be able to list products without a price" do
+    product = FactoryBot.create(:base_product, description: nil, name: 'Sample', price: '19.99')
+    Spree::Config.currency = "CAN"
+    Spree::Config.show_products_without_price = true
+    visit spree.products_path
+    expect(page).to have_content(product.name)
+  end
+
   it "should return the correct title when displaying a single product" do
     product = Spree::Product.find_by(name: "Ruby on Rails Baseball Jersey")
     click_link product.name

data/spec/features/taxons_spec.rb

@@ -132,4 +132,25 @@ describe "viewing products", type: :feature, inaccessible: true do
       expect(tmp.sort!).to eq(["Ruby on Rails Bag", "Ruby on Rails Tote"])
     end
   end
+
+  # Regression test for https://github.com/solidusio/solidus/issues/2602
+  context "root taxon page" do
+    it "shows taxon previews" do
+      visit spree.nested_taxons_path(taxonomy.root)
+
+      expect(page).to have_css('ul.product-listing li', count: 2)
+      expect(page).to have_content("Superman T-Shirt", count: 2)
+    end
+
+    context "with prices in other currency" do
+      before { Spree::Price.update_all(currency: "CAD") }
+
+      it "shows no products" do
+        visit spree.nested_taxons_path(taxonomy.root)
+
+        expect(page).to have_css('ul.product-listing li', count: 0)
+        expect(page).to have_no_content("Superman T-Shirt")
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 2.5.0.beta2
+  version: 2.5.0.rc1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.0.beta2
+        version: 2.5.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.0.beta2
+        version: 2.5.0.rc1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.0.beta2
+        version: 2.5.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.0.beta2
+        version: 2.5.0.rc1
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement