solidus_frontend 1.2.3 → 1.3.0.beta1

data/lib/spree/frontend.rb

@@ -3,6 +3,7 @@ require 'jquery-rails'
 require 'canonical-rails'
 require 'coffee-rails'
 require 'sass-rails'
+require 'font-awesome-rails'
 
 require 'spree/core'
 

data/lib/spree/frontend/engine.rb

@@ -3,15 +3,7 @@ module Spree
     class Engine < ::Rails::Engine
       config.middleware.use "Spree::Frontend::Middleware::SeoAssist"
 
-      # sets the manifests / assets to be precompiled, even when initialize_on_precompile is false
-      initializer "spree.assets.precompile", :group => :all do |app|
-        app.config.assets.precompile += %w[
-          spree/frontend/all*
-          jquery.validate/localization/messages_*
-        ]
-      end
-
-      initializer "spree.frontend.environment", :before => :load_config_initializers do |app|
+      initializer "spree.frontend.environment", before: :load_config_initializers do |_app|
         Spree::Frontend::Config = Spree::FrontendConfiguration.new
       end
     end

data/lib/spree/frontend/middleware/seo_assist.rb

@@ -13,13 +13,13 @@ module Spree
 
           taxon_id = params['taxon']
 
-          #redirect requests using taxon id's to their permalinks
+          # redirect requests using taxon id's to their permalinks
           if !taxon_id.blank? && !taxon_id.is_a?(Hash) && taxon = Taxon.find(taxon_id)
             params.delete('taxon')
 
             return build_response(params, "#{request.script_name}t/#{taxon.permalink}" )
           elsif env["PATH_INFO"] =~ /^\/(t|products)(\/\S+)?\/$/
-            #ensures no trailing / for taxon and product urls
+            # ensures no trailing / for taxon and product urls
 
             return build_response(params, env["PATH_INFO"][0...-1])
           end
@@ -32,7 +32,7 @@ module Spree
         def build_response(params, location)
           query = build_query(params)
           location += '?' + query unless query.blank?
-          [301, { 'Location'=> location }, []]
+          [301, { 'Location' => location }, []]
         end
 
         def build_query(params)
@@ -44,7 +44,6 @@ module Spree
             end
           }.join("&")
         end
-
       end
     end
   end

data/lib/tasks/rake_util.rb

@@ -1,19 +1,16 @@
 class RakeUtil
-
   def self.add_marker(msg)
-    puts "#"*30 + " #{msg} " + '#'*30
+    puts "#" * 30 + " #{msg} " + '#' * 30
   end
 
   def self.warning(msg)
-    puts "#"*50
+    puts "#" * 50
     puts msg
-    puts "#"*50
+    puts "#" * 50
   end
 
   def self.execute(cmd)
     puts cmd
     system cmd
   end
-
 end
-

data/lib/tasks/taxon.rake

@@ -1,7 +1,7 @@
 namespace :spree do
   desc "Resets all taxon permalinks"
-  task :reset_taxon_permalinks => :environment do
-    Spree::Taxon.where(:parent_id => nil).each {|taxon| redo_permalinks(taxon) }
+  task reset_taxon_permalinks: :environment do
+    Spree::Taxon.where(parent_id: nil).each { |taxon| redo_permalinks(taxon) }
   end
 
   def redo_permalinks(taxon)
@@ -11,4 +11,4 @@ namespace :spree do
 
     taxon.children.each { |t| redo_permalinks(t) }
   end
-end 
+end

data/script/rails

@@ -6,4 +6,3 @@ ENGINE_PATH = File.expand_path('../../lib/spree/frontend/engine', __FILE__)
 
 require 'rails/all'
 require 'rails/engine/commands'
-

data/solidus_frontend.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'jquery-rails'
   s.add_dependency 'sass-rails'
   s.add_dependency 'coffee-rails'
+  s.add_dependency 'font-awesome-rails', '~> 4.0'
 
   s.add_development_dependency 'capybara-accessible'
 end

data/spec/controllers/controller_extension_spec.rb

@@ -6,7 +6,7 @@ require 'spec_helper'
 class Spree::CustomController < Spree::BaseController
   def index
     respond_with(Spree::Address.new) do |format|
-      format.html { render :text => "neutral" }
+      format.html { render text: "neutral" }
     end
   end
 
@@ -18,7 +18,7 @@ class Spree::CustomController < Spree::BaseController
   end
 end
 
-describe Spree::CustomController, :type => :controller do
+describe Spree::CustomController, type: :controller do
   after do
     Spree::CustomController.clear_overrides!
   end
@@ -37,12 +37,12 @@ describe Spree::CustomController, :type => :controller do
       context "specify symbol for handler instead of Proc" do
         before do
           Spree::CustomController.class_eval do
-            respond_override({:index => {:html => {:success => :success_method}}})
+            respond_override({ index: { html: { success: :success_method } } })
 
             private
 
             def success_method
-              render :text => 'success!!!'
+              render text: 'success!!!'
             end
           end
         end
@@ -51,7 +51,7 @@ describe Spree::CustomController, :type => :controller do
           it "has value success" do
             spree_get :index
             expect(response).to be_success
-            assert (response.body =~ /success!!!/)
+            expect(response.body).to match(/success!!!/)
           end
         end
       end
@@ -59,8 +59,8 @@ describe Spree::CustomController, :type => :controller do
       context "render" do
         before do
           Spree::CustomController.instance_eval do
-            respond_override({:index => {:html => {:success => lambda { render(:text => 'success!!!') }}}})
-            respond_override({:index => {:html => {:failure => lambda { render(:text => 'failure!!!') }}}})
+            respond_override({ index: { html: { success: lambda { render(text: 'success!!!') } } } })
+            respond_override({ index: { html: { failure: lambda { render(text: 'failure!!!') } } } })
           end
         end
 
@@ -68,7 +68,7 @@ describe Spree::CustomController, :type => :controller do
           it "has value success" do
             spree_get :index
             expect(response).to be_success
-            assert (response.body =~ /success!!!/)
+            expect(response.body).to match(/success!!!/)
           end
         end
       end
@@ -76,8 +76,8 @@ describe Spree::CustomController, :type => :controller do
       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(:text => 'failure!!!') }}}})
+            respond_override({ index: { html: { success: lambda { redirect_to('/cart') } } } })
+            respond_override({ index: { html: { failure: lambda { render(text: 'failure!!!') } } } })
           end
         end
 
@@ -93,8 +93,8 @@ describe Spree::CustomController, :type => :controller do
         before do
           Spree::CustomController.instance_eval do
             respond_to :html
-            respond_override({:create => {:html => {:success => lambda { render(:text => 'success!!!') }}}})
-            respond_override({:create => {:html => {:failure => lambda { render(:text => 'failure!!!') }}}})
+            respond_override({ create: { html: { success: lambda { render(text: 'success!!!') } } } })
+            respond_override({ create: { html: { failure: lambda { render(text: 'failure!!!') } } } })
           end
         end
 
@@ -102,7 +102,7 @@ describe Spree::CustomController, :type => :controller do
           it "has value success" do
             spree_post :create
             expect(response).to be_success
-            assert (response.body =~ /success!/)
+            expect(response.body).to match(/success!/)
           end
         end
       end
@@ -110,14 +110,14 @@ describe Spree::CustomController, :type => :controller do
       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(:text => 'success!!!') }}}})
+            respond_override({ index: { html: { success: lambda { render(text: 'success!!!') } } } })
           end
         end
 
         describe "POST" do
           it "should not effect the wrong controller" do
             spree_get :index
-            assert (response.body =~ /neutral/)
+            expect(response.body).to match(/neutral/)
           end
         end
       end

data/spec/controllers/controller_helpers_spec.rb

@@ -3,8 +3,7 @@ require 'spec_helper'
 # In this file, we want to test that the controller helpers function correctly
 # So we need to use one of the controllers inside Spree.
 # ProductsController is good.
-describe Spree::ProductsController, :type => :controller do
-
+describe Spree::ProductsController, type: :controller do
   before do
     I18n.enforce_available_locales = false
     Spree::Frontend::Config[:locale] = :de

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::CheckoutController, :type => :controller do
+describe Spree::CheckoutController, type: :controller do
   let(:token) { 'some_token' }
   let(:user) { stub_model(Spree::LegacyUser) }
   let(:order) { FactoryGirl.create(:order_with_totals) }
@@ -24,27 +24,27 @@ describe Spree::CheckoutController, :type => :controller do
     end
 
     it "should redirect to the cart path unless checkout_allowed?" do
-      allow(order).to receive_messages :checkout_allowed? => false
-      spree_get :edit, { :state => "delivery" }
+      allow(order).to receive_messages checkout_allowed?: false
+      spree_get :edit, { state: "delivery" }
       expect(response).to redirect_to(spree.cart_path)
     end
 
     it "should redirect to the cart path if current_order is nil" do
       allow(controller).to receive(:current_order).and_return(nil)
-      spree_get :edit, { :state => "delivery" }
+      spree_get :edit, { state: "delivery" }
       expect(response).to redirect_to(spree.cart_path)
     end
 
     it "should redirect to cart if order is completed" do
-      allow(order).to receive_messages(:completed? => true)
-      spree_get :edit, { :state => "address" }
+      allow(order).to receive_messages(completed?: true)
+      spree_get :edit, { state: "address" }
       expect(response).to redirect_to(spree.cart_path)
     end
 
     # Regression test for https://github.com/spree/spree/issues/2280
     it "should redirect to current step trying to access a future step" do
       order.update_column(:state, "address")
-      spree_get :edit, { :state => "delivery" }
+      spree_get :edit, { state: "delivery" }
       expect(response).to redirect_to spree.checkout_state_path("address")
     end
 
@@ -73,17 +73,18 @@ describe Spree::CheckoutController, :type => :controller do
     context "save successful" do
       def spree_post_address
         spree_post :update, {
-          :state => "address",
-          :order => {
-            :bill_address_attributes => address_params,
-            :use_billing => true
+          state: "address",
+          order: {
+            bill_address_attributes: address_params,
+            use_billing: true
           }
         }
       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_shipping_methods: [stub_model(Spree::ShippingMethod)]
+        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
@@ -95,7 +96,7 @@ describe Spree::CheckoutController, :type => :controller do
         end
 
         it "should assign order" do
-          spree_post :update, {:state => "address"}
+          spree_post :update, { state: "address" }
           expect(assigns[:order]).not_to be_nil
         end
 
@@ -113,12 +114,12 @@ describe Spree::CheckoutController, :type => :controller do
           it "calls persist order address on user" do
             expect(user).to receive(:persist_order_address)
             spree_post :update, {
-              :state => "address",
-              :order => {
-                :bill_address_attributes => address_params,
-                :use_billing => true
+              state: "address",
+              order: {
+                bill_address_attributes: address_params,
+                use_billing: true
               },
-              :save_user_address => "1"
+              save_user_address: "1"
             }
           end
         end
@@ -126,12 +127,12 @@ describe Spree::CheckoutController, :type => :controller do
         context "current_user doesnt respond to persist_order_address" do
           it "doesnt raise any error" do
             spree_post :update, {
-              :state => "address",
-              :order => {
-                :bill_address_attributes => address_params,
-                :use_billing => true
+              state: "address",
+              order: {
+                bill_address_attributes: address_params,
+                use_billing: true
               },
-              :save_user_address => "1"
+              save_user_address: "1"
             }
           end
         end
@@ -149,11 +150,11 @@ describe Spree::CheckoutController, :type => :controller do
             @expected_ship_address_id = order.ship_address.id
 
             spree_post :update, {
-                :state => "address",
-                :order => {
-                    :bill_address_attributes => order.bill_address.attributes.except("created_at", "updated_at"),
-                    :ship_address_attributes => order.ship_address.attributes.except("created_at", "updated_at"),
-                    :use_billing => false
+                state: "address",
+                order: {
+                    bill_address_attributes: order.bill_address.attributes.except("created_at", "updated_at"),
+                    ship_address_attributes: order.ship_address.attributes.except("created_at", "updated_at"),
+                    use_billing: false
                 }
             }
 
@@ -195,10 +196,10 @@ describe Spree::CheckoutController, :type => :controller do
               payments_attributes: [
                 {
                   payment_method_id: payment_method.id.to_s,
-                  source_attributes: attributes_for(:credit_card),
-                },
-              ],
-            },
+                  source_attributes: attributes_for(:credit_card)
+                }
+              ]
+            }
           }
         end
 
@@ -216,77 +217,30 @@ 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
-            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!(display_on: "back_end") }
-
-          it 'sets the payment amount' do
-            expect {
-              post :update, 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
           order.update_column(:state, "confirm")
           # An order requires a payment to reach the complete state
           # This is because payment_required? is true on the order
-          create(:payment, :amount => order.total, :order => order)
+          create(:payment, amount: order.total, order: order)
           order.create_proposed_shipments
           order.payments.reload
         end
 
         # This inadvertently is a regression test for https://github.com/spree/spree/issues/2694
         it "should redirect to the order view" do
-          spree_post :update, {:state => "confirm"}
+          spree_post :update, { state: "confirm" }
           expect(response).to redirect_to spree.order_path(order)
         end
 
         it "should populate the flash message" do
-          spree_post :update, {:state => "confirm"}
+          spree_post :update, { state: "confirm" }
           expect(flash.notice).to eq(Spree.t(:order_processed_successfully))
         end
 
         it "should remove completed order from current_order" do
-          spree_post :update, {:state => "confirm"}, {:order_id => "foofah"}
+          spree_post :update, { state: "confirm" }, { order_id: "foofah" }
           expect(assigns(:current_order)).to be_nil
           expect(assigns(:order)).to eql controller.current_order
         end
@@ -300,30 +254,30 @@ describe Spree::CheckoutController, :type => :controller do
       end
 
       it "should not assign order" do
-        spree_post :update, {:state => "address", email: ''}
+        spree_post :update, { state: "address", email: '' }
         expect(assigns[:order]).not_to be_nil
       end
 
       it "should not change the order state" do
-        spree_post :update, { :state => 'address' }
+        spree_post :update, { state: 'address' }
       end
 
       it "should render the edit template" do
-        spree_post :update, { :state => 'address' }
+        spree_post :update, { state: 'address' }
         expect(response).to render_template :edit
       end
     end
 
     context "when current_order is nil" do
-      before { allow(controller).to receive_messages :current_order => nil }
+      before { allow(controller).to receive_messages current_order: nil }
 
       it "should not change the state if order is completed" do
         expect(order).not_to receive(:update_attribute)
-        spree_post :update, {:state => "confirm"}
+        spree_post :update, { state: "confirm" }
       end
 
       it "should redirect to the cart_path" do
-        spree_post :update, {:state => "confirm"}
+        spree_post :update, { state: "confirm" }
         expect(response).to redirect_to spree.cart_path
       end
     end
@@ -332,7 +286,7 @@ describe Spree::CheckoutController, :type => :controller do
       before do
         order.update_attributes! user: user
         allow(order).to receive(:next).and_raise(Spree::Core::GatewayError.new("Invalid something or other."))
-        spree_post :update, {:state => "address"}
+        spree_post :update, { state: "address" }
       end
 
       it "should render the edit template and display exception message" do
@@ -351,19 +305,19 @@ describe Spree::CheckoutController, :type => :controller do
       end
 
       before do
-        allow(controller).to receive_messages :current_order => order
-        allow(controller).to receive_messages :check_authorization => true
+        allow(controller).to receive_messages current_order: order
+        allow(controller).to receive_messages check_authorization: true
       end
 
       context "when the order is invalid" do
         before do
-          allow(order).to receive_messages :valid? => true, :next => nil
+          allow(order).to receive_messages valid?: true, next: nil
           order.errors.add :base, 'Base error'
           order.errors.add :adjustments, 'error'
         end
 
         it "due to the order having errors" do
-          spree_put :update, :state => order.state, :order => {}
+          spree_put :update, state: order.state, order: {}
           expect(flash[:error]).to eq("Base error\nAdjustments error")
           expect(response).to redirect_to(spree.checkout_state_path('address'))
         end
@@ -372,14 +326,12 @@ describe Spree::CheckoutController, :type => :controller do
 
     context "fails to transition to complete from confirm" do
       let(:order) do
-        FactoryGirl.create(:order_with_line_items).tap do |order|
-          order.next!
-        end
+        FactoryGirl.create(:order_with_line_items).tap(&:next!)
       end
 
       before do
-        allow(controller).to receive_messages :current_order => order
-        allow(controller).to receive_messages :check_authorization => true
+        allow(controller).to receive_messages current_order: order
+        allow(controller).to receive_messages check_authorization: true
       end
 
       context "when the country is not a shippable country" do
@@ -392,7 +344,7 @@ describe Spree::CheckoutController, :type => :controller do
           end
 
           payment_method = FactoryGirl.create(:simple_credit_card_payment_method)
-          payment = FactoryGirl.create(:payment, :payment_method => payment_method)
+          payment = FactoryGirl.create(:payment, payment_method: payment_method)
           order.payments << payment
         end
 
@@ -400,7 +352,7 @@ describe Spree::CheckoutController, :type => :controller do
           expect(order.shipments.count).to eq(1)
           order.shipments.first.shipping_rates.delete_all
           order.update_attributes(state: 'confirm')
-          spree_put :update, state: order.state, :order => {}
+          spree_put :update, state: order.state, order: {}
           expect(flash[:error]).to eq(Spree.t(:items_cannot_be_shipped))
           expect(response).to redirect_to(spree.checkout_state_path('confirm'))
         end
@@ -422,26 +374,26 @@ describe Spree::CheckoutController, :type => :controller do
       end
 
       before do
-        allow(controller).to receive_messages :current_order => order
-        allow(controller).to receive_messages :check_authorization => true
+        allow(controller).to receive_messages current_order: order
+        allow(controller).to receive_messages check_authorization: true
       end
 
       it "fails to transition from payment to complete" do
         allow_any_instance_of(Spree::Payment).to receive(:process!).and_raise(Spree::Core::GatewayError.new(Spree.t(:payment_processing_failed)))
-        spree_put :update, state: order.state, :order => {}
+        spree_put :update, state: order.state, order: {}
         expect(flash[:error]).to eq(Spree.t(:payment_processing_failed))
       end
     end
   end
 
   context "When last inventory item has been purchased" do
-    let(:product) { mock_model(Spree::Product, :name => "Amazing Object") }
+    let(:product) { mock_model(Spree::Product, name: "Amazing Object") }
     let(:variant) { mock_model(Spree::Variant) }
-    let(:line_item) { mock_model Spree::LineItem, :insufficient_stock? => true, :amount => 0 }
+    let(:line_item) { mock_model Spree::LineItem, insufficient_stock?: true, amount: 0 }
     let(:order) { create(:order) }
 
     before do
-      allow(order).to receive_messages(:line_items => [line_item], :state => "payment")
+      allow(order).to receive_messages(line_items: [line_item], state: "payment")
 
       configure_spree_preferences do |config|
         config.track_inventory_levels = true
@@ -450,7 +402,7 @@ describe Spree::CheckoutController, :type => :controller do
 
     context "and back orders are not allowed" do
       before do
-        spree_post :update, { :state => "payment" }
+        spree_post :update, { state: "payment" }
       end
 
       it "should redirect to cart" do
@@ -458,16 +410,16 @@ describe Spree::CheckoutController, :type => :controller do
       end
 
       it "should set flash message for no inventory" do
-        expect(flash[:error]).to eq(Spree.t(:inventory_error_flash_for_insufficient_quantity , :names => "'#{product.name}'" ))
+        expect(flash[:error]).to eq(Spree.t(:inventory_error_flash_for_insufficient_quantity, names: "'#{product.name}'" ))
       end
     end
   end
 
   context "order doesn't have a delivery step" do
     before do
-      allow(order).to receive_messages(:checkout_steps => ["cart", "address", "payment"])
+      allow(order).to receive_messages(checkout_steps: ["cart", "address", "payment"])
       allow(order).to receive_messages state: "address"
-      allow(controller).to receive_messages :check_authorization => true
+      allow(controller).to receive_messages check_authorization: true
     end
 
     it "doesn't set shipping address on the order" do
@@ -477,17 +429,17 @@ describe Spree::CheckoutController, :type => :controller do
 
     it "doesn't remove unshippable items before payment" do
       expect {
-        spree_post :update, { :state => "payment" }
+        spree_post :update, { state: "payment" }
       }.to_not change { order.line_items }
     end
   end
 
   it "does remove unshippable items before payment" do
-    allow(order).to receive_messages :payment_required? => true
-    allow(controller).to receive_messages :check_authorization => true
+    allow(order).to receive_messages payment_required?: true
+    allow(controller).to receive_messages check_authorization: true
 
     expect {
-      spree_post :update, { :state => "payment" }
+      spree_post :update, { state: "payment" }
     }.to change { order.line_items }
   end
 end