solidus_frontend 2.3.1 → 2.4.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4d176efa0436e1940a95991523624736fb3d1e0
-  data.tar.gz: af932af8026330bf6bff2f79d494a870ef9c8cb6
+  metadata.gz: 67186cb07ac12ada0005473b10b274aefd20d75f
+  data.tar.gz: 1ac41dd260ca844e9d30010c49d607d3966d78cf
 SHA512:
-  metadata.gz: 12f0588f86bd39eac042c2b3c10cab6eb7f6e979592eab4dbcb75e0c4ebf54f833d9babdd0c6791d60fc18927bbdbdaf5ed3bbb52c76280f28e22f92562df1c0
-  data.tar.gz: 337973a26fa1bdd7854235f3b7fe8d7d4f26e39f7b1bdb84b348d4ef0ad91552da8ea5490db89c582607d7048a837919e4000fca868ce23c3e5ec8303b8ef513
+  metadata.gz: e72385aba870300b90a8186d602e5f22ba8eb63028274f89fc65e76822540e41ea7e6038cc8e0039a193c86431a200198c89fc807e147afd803f7f5b19fe11e4
+  data.tar.gz: 4cb6950834f9f2e1b0c576f0d51552074aaa5a13799624091ed2a6fc9bd6bac72ce3c6859ea4487e61e46d18c3ed8d081dfbbe8fc11c6605474cebd788ba52a4

data/app/assets/stylesheets/spree/frontend/_variables.scss

@@ -12,6 +12,7 @@ $link_text_color:           #00ADEE !default;
 $product_background_color:  #FFFFFF !default;
 $product_title_text_color:  #404042 !default;
 $product_body_text_color:   #404042 !default;
+$product_price_text_color:  #252525 !default;
 $product_link_text_color:   #BBBBBB !default;
 
 /*--------------------------------------*/

data/app/assets/stylesheets/spree/frontend/screen.css.scss

@@ -452,7 +452,7 @@ nav#taxonomies {
 
 %price_text {
   font-weight: bold;
-  color: $link_text_color;
+  color: $product_price_text_color;
 }
 
 span.price {
@@ -520,7 +520,7 @@ ul#products {
     }
 
     .price {
-      color: $link_text_color;
+      color: $product_price_text_color;
       font-size: $product_list_price_font_size;
       padding-top: 5px;
       display: block;
@@ -752,7 +752,7 @@ ul#products {
   }
 }
 
-#billing {
+#billing, #shipping {
   input[type="text"], input[type="email"],
   input[type="tel"], input[type="number"],
   select, textarea {

data/app/controllers/spree/products_controller.rb

@@ -9,8 +9,8 @@ module Spree
     respond_to :html
 
     def index
-      @searcher = build_searcher(params.merge(include_images: true))
-      @products = @searcher.retrieve_products
+      @searcher = build_searcher(params.merge(include_images: true).reject { |k, _| ["per_page", "page"].include?(k) } )
+      @products = @searcher.retrieve_products.page(params[:page] || 1).per(params[:per_page].presence || Spree::Config[:products_per_page])
       @taxonomies = Spree::Taxonomy.includes(root: :children)
     end
 

data/app/controllers/spree/store_controller.rb

@@ -3,8 +3,6 @@ module Spree
     include Spree::Core::ControllerHelpers::Pricing
     include Spree::Core::ControllerHelpers::Order
 
-    skip_before_action :set_current_order, only: :cart_link
-
     def unauthorized
       render 'spree/shared/unauthorized', layout: Spree::Config[:layout], status: 401
     end

data/app/controllers/spree/taxons_controller.rb

@@ -9,8 +9,8 @@ module Spree
       @taxon = Spree::Taxon.find_by!(permalink: params[:id])
       return unless @taxon
 
-      @searcher = build_searcher(params.merge(taxon: @taxon.id, include_images: true))
-      @products = @searcher.retrieve_products
+      @searcher = build_searcher(params.merge(taxon: @taxon.id, include_images: true).reject { |k, _| ["per_page", "page"].include?(k) } )
+      @products = @searcher.retrieve_products.page(params[:page] || 1).per(params[:per_page].presence || Spree::Config[:products_per_page])
       @taxonomies = Spree::Taxonomy.includes(root: :children)
     end
 

data/app/helpers/spree/orders_helper.rb

@@ -0,0 +1,16 @@
+require 'truncate_html'
+require 'app/helpers/truncate_html_helper'
+
+module Spree
+  module OrdersHelper
+    include TruncateHtmlHelper
+
+    def truncated_product_description(product)
+      truncate_html(raw(product.description))
+    end
+
+    def order_just_completed?(order)
+      flash[:order_completed] && order.present?
+    end
+  end
+end

data/app/views/spree/checkout/edit.html.erb

@@ -12,7 +12,7 @@
         <% if @order.state == 'address' || !@order.email? %>
           <p class="field" style='clear: both'>
             <%= form.label :email %><br />
-            <%= form.text_field :email %>
+            <%= form.email_field :email %>
           </p>
         <% end %>
         <%= render @order.state, form: form %>

data/app/views/spree/orders/_adjustments.html.erb

@@ -13,7 +13,7 @@
     <tr>
       <td colspan="4" align='right'><h5><%= Spree.t(:shipping) %>: <%= shipment.shipping_method.name %></h5></td>
       <td colspan='2'>
-        <h5><%= shipment.display_discounted_cost %></h5>
+        <h5><%= shipment.display_total_before_tax %></h5>
       </td>
     </tr>
   <% end %>

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

@@ -110,7 +110,7 @@
     <% order.shipments.group_by { |s| s.selected_shipping_rate.name }.each do |name, shipments| %>
       <tr class="total" data-hook='shipment-row'>
         <td colspan="4"><%= Spree.t(:shipping) %>: <strong><%= name %></strong></td>
-        <td class="total"><span><%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: order.currency).to_html %></span></td>
+        <td class="total"><span><%= Spree::Money.new(shipments.sum(&:total_before_tax), currency: order.currency).to_html %></span></td>
       </tr>
     <% end %>
   </tfoot>

data/lib/spree/frontend.rb

@@ -7,6 +7,5 @@ require 'font-awesome-rails'
 
 require 'spree/core'
 
-require 'spree/responder'
 require 'spree/frontend/middleware/seo_assist'
 require 'spree/frontend/engine'

data/solidus_frontend.gemspec

@@ -8,7 +8,6 @@ Gem::Specification.new do |s|
   s.summary     = 'Cart and storefront for the Solidus e-commerce project.'
   s.description = s.summary
 
-  s.required_ruby_version = '>= 2.1.0'
   s.author      = 'Solidus Team'
   s.email       = 'contact@solidus.io'
   s.homepage    = 'http://solidus.io/'
@@ -29,6 +28,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'sass-rails'
   s.add_dependency 'coffee-rails'
   s.add_dependency 'font-awesome-rails', '~> 4.0'
+  s.add_dependency 'truncate_html', '~> 0.9', '>= 0.9.2'
+  s.add_dependency 'kaminari', '>= 0.17', '< 2.0'
 
   s.add_development_dependency 'capybara-accessible'
 end

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -81,9 +81,9 @@ describe Spree::CheckoutController, type: :controller do
         }
       end
 
-      let!(:payment_method) { create(:payment_method) }
       before do
         # Must have *a* shipping method and a payment method so updating from address works
+        allow(order).to receive_messages available_payment_methods: [stub_model(Spree::PaymentMethod)]
         allow(order).to receive_messages ensure_available_shipping_rates: true
         order.line_items << FactoryGirl.create(:line_item)
       end
@@ -225,53 +225,6 @@ describe Spree::CheckoutController, type: :controller do
         end
       end
 
-      context "when in the payment state" do
-        let(:order) { create(:order_with_line_items) }
-        let(:payment_method) { create(:credit_card_payment_method) }
-
-        let(:params) do
-          {
-            state: 'payment',
-            order: {
-              payments_attributes: [
-                {
-                  payment_method_id: payment_method.id.to_s,
-                  source_attributes: attributes_for(:credit_card)
-                }
-              ]
-            }
-          }
-        end
-
-        before do
-          order.update_attributes! user: user
-          3.times { order.next! } # should put us in the payment state
-        end
-
-        context 'with a permitted payment method' do
-          it 'sets the payment amount' do
-            post :update, params: params
-            order.reload
-            expect(order.state).to eq('confirm')
-            expect(order.payments.size).to eq(1)
-            expect(order.payments.first.amount).to eq(order.total)
-          end
-        end
-
-        context 'with an unpermitted payment method' do
-          before { payment_method.update!(available_to_users: false) }
-
-          it 'sets the payment amount' do
-            expect {
-              post :update, params: params
-            }.to raise_error(ActiveRecord::RecordNotFound)
-
-            expect(order.state).to eq('payment')
-            expect(order.payments).to be_empty
-          end
-        end
-      end
-
       context "when in the confirm state" do
         before do
           order.update_attributes! user: user

data/spec/features/checkout_spec.rb

@@ -93,7 +93,7 @@ describe "Checkout", type: :feature, inaccessible: true do
 
         order.reload
         order.user = user
-        order.update!
+        order.recalculate
         order
       end
 
@@ -211,13 +211,13 @@ describe "Checkout", type: :feature, inaccessible: true do
 
   # Regression test for https://github.com/spree/spree/issues/2694 and https://github.com/spree/spree/issues/4117
   context "doesn't allow bad credit card numbers" do
-    let!(:payment_method) { create(:credit_card_payment_method) }
     before(:each) do
       order = OrderWalkthrough.up_to(:delivery)
+      allow(order).to receive_messages(available_payment_methods: [create(:credit_card_payment_method)])
 
       user = create(:user)
       order.user = user
-      order.update!
+      order.recalculate
 
       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)
@@ -245,7 +245,7 @@ describe "Checkout", type: :feature, inaccessible: true do
 
       order.reload
       order.user = user
-      order.update!
+      order.recalculate
       order
     end
 
@@ -292,7 +292,7 @@ describe "Checkout", type: :feature, inaccessible: true do
       order = OrderWalkthrough.up_to(:delivery)
       allow(order).to receive_messages(available_payment_methods: [check_payment, credit_cart_payment])
       order.user = create(:user)
-      order.update!
+      order.recalculate
 
       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: order.user)
@@ -314,8 +314,7 @@ describe "Checkout", type: :feature, inaccessible: true do
   end
 
   context "user has payment sources", js: true do
-    before { Spree::PaymentMethod.all.each(&:really_destroy!) }
-    let!(:bogus) { create(:credit_card_payment_method) }
+    let(:bogus) { create(:credit_card_payment_method) }
     let(:user) { create(:user) }
 
     let!(:credit_card) do
@@ -325,6 +324,7 @@ describe "Checkout", type: :feature, inaccessible: true do
     before do
       user.wallet.add(credit_card)
       order = OrderWalkthrough.up_to(:delivery)
+      allow(order).to receive_messages(available_payment_methods: [bogus])
 
       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/checkout_unshippable_spec.rb

@@ -15,7 +15,7 @@ describe "checkout with unshippable items", type: :feature, inaccessible: true d
 
     user = create(:user)
     order.user = user
-    order.update!
+    order.recalculate
 
     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/helpers/order_helper_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+module Spree
+  describe Spree::OrdersHelper, type: :helper do
+    # Regression test for https://github.com/spree/spree/issues/2518 and https://github.com/spree/spree/issues/2323
+    it "truncates HTML correctly in product description" do
+      product = double(description: "<strong>" + ("a" * 95) + "</strong> This content is invisible.")
+      expected = "<strong>" + ("a" * 95) + "</strong>..."
+      expect(truncated_product_description(product)).to eq(expected)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -45,8 +45,6 @@ require 'spree/testing_support/url_helpers'
 require 'spree/testing_support/order_walkthrough'
 require 'spree/testing_support/caching'
 
-require 'paperclip/matchers'
-
 require 'capybara-screenshot/rspec'
 Capybara.save_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
 
@@ -118,8 +116,6 @@ RSpec.configure do |config|
   config.include Spree::TestingSupport::ControllerRequests, type: :controller
   config.include Spree::TestingSupport::Flash
 
-  config.include Paperclip::Shoulda::Matchers
-
   config.fail_fast = ENV['FAIL_FAST'] || false
 
   config.example_status_persistence_file_path = "./spec/examples.txt"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2017-10-03 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.3.1
+        version: 2.4.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.4.0.beta1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.4.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.4.0.beta1
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,46 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: truncate_html
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: capybara-accessible
   requirement: !ruby/object:Gem::Requirement
@@ -181,6 +221,7 @@ files:
 - app/controllers/spree/products_controller.rb
 - app/controllers/spree/store_controller.rb
 - app/controllers/spree/taxons_controller.rb
+- app/helpers/spree/orders_helper.rb
 - app/models/spree/frontend_configuration.rb
 - app/views/spree/address/_form.html.erb
 - app/views/spree/address/_form_hidden.html.erb
@@ -243,7 +284,6 @@ files:
 - lib/tasks/taxon.rake
 - script/rails
 - solidus_frontend.gemspec
-- spec/controllers/controller_extension_spec.rb
 - spec/controllers/controller_helpers_spec.rb
 - spec/controllers/spree/checkout_controller_spec.rb
 - spec/controllers/spree/checkout_controller_with_views_spec.rb
@@ -275,6 +315,7 @@ files:
 - spec/fixtures/thinking-cat.jpg
 - spec/generators/solidus/views/override_generator_spec.rb
 - spec/helpers/base_helper_spec.rb
+- spec/helpers/order_helper_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_contexts/checkout_setup.rb
 - spec/support/shared_contexts/custom_products.rb

data/spec/controllers/controller_extension_spec.rb

@@ -1,126 +0,0 @@
-require 'spec_helper'
-
-# This test tests the functionality within
-# spree/core/controller_helpers/respond_with.rb
-# Rather than duck-punching the existing controllers, let's define a custom one:
-class Spree::CustomController < Spree::BaseController
-  def index
-    respond_with(Spree::Address.new) do |format|
-      format.html { render plain: "neutral" }
-    end
-  end
-
-  def create
-    # Just need a model with validations
-    # Address is good enough, so let's go with that
-    address = Spree::Address.new(params[:address])
-    respond_with(address)
-  end
-end
-
-describe Spree::CustomController, type: :controller do
-  after do
-    Spree::CustomController.clear_overrides!
-  end
-
-  before do
-    @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
-      r.draw {
-        get 'index', to: 'spree/custom#index'
-        post 'create', to: 'spree/custom#create'
-      }
-    end
-  end
-
-  context "extension testing" do
-    context "index" do
-      context "specify symbol for handler instead of Proc" do
-        before do
-          Spree::CustomController.class_eval do
-            respond_override({ index: { html: { success: :success_method } } })
-
-            private
-
-            def success_method
-              render plain: 'success!!!'
-            end
-          end
-        end
-
-        describe "GET" do
-          it "has value success" do
-            get :index
-            expect(response).to be_success
-            expect(response.body).to match(/success!!!/)
-          end
-        end
-      end
-
-      context "render" do
-        before do
-          Spree::CustomController.instance_eval do
-            respond_override({ index: { html: { success: lambda { render(plain: 'success!!!') } } } })
-            respond_override({ index: { html: { failure: lambda { render(plain: 'failure!!!') } } } })
-          end
-        end
-
-        describe "GET" do
-          it "has value success" do
-            get :index
-            expect(response).to be_success
-            expect(response.body).to match(/success!!!/)
-          end
-        end
-      end
-
-      context "redirect" do
-        before do
-          Spree::CustomController.instance_eval do
-            respond_override({ index: { html: { success: lambda { redirect_to('/cart') } } } })
-            respond_override({ index: { html: { failure: lambda { render(plain: 'failure!!!') } } } })
-          end
-        end
-
-        describe "GET" do
-          it "has value success" do
-            get :index
-            expect(response).to be_redirect
-          end
-        end
-      end
-
-      context "validation error" do
-        before do
-          Spree::CustomController.instance_eval do
-            respond_to :html
-            respond_override({ create: { html: { success: lambda { render(plain: 'success!!!') } } } })
-            respond_override({ create: { html: { failure: lambda { render(plain: 'failure!!!') } } } })
-          end
-        end
-
-        describe "POST" do
-          it "has value success" do
-            post :create
-            expect(response).to be_success
-            expect(response.body).to match(/success!/)
-          end
-        end
-      end
-
-      context 'A different controllers respond_override. Regression test for #1301' do
-        before do
-          Spree::CheckoutController.instance_eval do
-            respond_override({ index: { html: { success: lambda { render(plain: 'success!!!') } } } })
-          end
-        end
-
-        describe "POST" do
-          it "should not effect the wrong controller" do
-            get :index
-            expect(response.body).to match(/neutral/)
-          end
-        end
-      end
-    end
-  end
-end