solidus_frontend 2.5.2 → 2.6.0.rc1

data/lib/spree_frontend.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'spree/frontend'

data/lib/tasks/rake_util.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RakeUtil
   def self.add_marker(msg)
     puts "#" * 30 + " #{msg} " + '#' * 30

data/lib/tasks/taxon.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :spree do
   desc "Resets all taxon permalinks"
   task reset_taxon_permalinks: :environment do

data/script/rails

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/spree/frontend/engine', __FILE__)
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/spree/frontend/engine', __dir__)
 
 require 'rails/all'
 require 'rails/engine/commands'

data/solidus_frontend.gemspec

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 require_relative '../core/lib/spree/core/version.rb'
 
 Gem::Specification.new do |s|
@@ -24,11 +25,11 @@ Gem::Specification.new do |s|
   s.add_dependency 'solidus_core', s.version
 
   s.add_dependency 'canonical-rails', '~> 0.2.0'
+  s.add_dependency 'font-awesome-rails', '~> 4.0'
   s.add_dependency 'jquery-rails'
+  s.add_dependency 'kaminari', '~> 1.1'
   s.add_dependency 'sass-rails'
-  s.add_dependency 'font-awesome-rails', '~> 4.0'
   s.add_dependency 'truncate_html', '~> 0.9', '>= 0.9.2'
-  s.add_dependency 'kaminari', '~> 1.1'
 
   s.add_development_dependency 'capybara-accessible'
 end

data/spec/controllers/controller_helpers_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 # In this file, we want to test that the controller helpers function correctly
@@ -7,9 +9,13 @@ describe Spree::ProductsController, type: :controller do
   before do
     I18n.enforce_available_locales = false
     Spree::Frontend::Config[:locale] = :de
+    I18n.backend.store_translations(:de, spree: {
+      i18n: { this_file_language: "Deutsch (DE)" }
+    })
   end
 
   after do
+    I18n.reload!
     Spree::Frontend::Config[:locale] = :en
     I18n.locale = :en
     I18n.enforce_available_locales = true

data/spec/controllers/locale_controller_spec.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Spree::LocaleController, type: :controller do
+  include_context "fr locale"
+
+  context 'switch_to_locale specified' do
+    context "available locale" do
+      it 'sets locale and redirects' do
+        get :set, params: { switch_to_locale: 'fr' }
+        expect(I18n.locale).to eq :fr
+        expect(response).to redirect_to('/')
+        expect(session[:locale]).to eq('fr')
+        expect(flash[:notice]).to eq(I18n.t("spree.locale_changed"))
+      end
+    end
+
+    context "unavailable locale" do
+      it 'does not change locale and redirects' do
+        get :set, params: { switch_to_locale: 'klingon' }
+        expect(I18n.locale).to eq :en
+        expect(response).to redirect_to('/')
+        expect(flash[:error]).to eq(I18n.t("spree.locale_not_changed"))
+      end
+    end
+  end
+
+  context 'locale specified' do
+    context "available locale" do
+      it 'sets locale and redirects' do
+        get :set, params: { locale: 'fr' }
+        expect(I18n.locale).to eq :fr
+        expect(response).to redirect_to('/')
+        expect(flash[:notice]).to eq(I18n.t("spree.locale_changed"))
+      end
+    end
+
+    context "unavailable locale" do
+      it 'does not change locale and redirects' do
+        get :set, params: { locale: 'klingon' }
+        expect(I18n.locale).to eq :en
+        expect(response).to redirect_to('/')
+        expect(flash[:error]).to eq(I18n.t("spree.locale_not_changed"))
+      end
+    end
+  end
+
+  context 'both locale and switch_to_locale specified' do
+    it 'uses switch_to_locale value' do
+      get :set, params: { locale: 'en', switch_to_locale: 'fr' }
+      expect(I18n.locale).to eq :fr
+      expect(response).to redirect_to('/')
+      expect(flash[:notice]).to eq(I18n.t("spree.locale_changed"))
+    end
+  end
+end

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Spree::CheckoutController, type: :controller do

data/spec/controllers/spree/checkout_controller_with_views_spec.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 # This spec is useful for when we just want to make sure a view is rendering correctly
@@ -22,7 +23,7 @@ describe Spree::CheckoutController, type: :controller do
       before do
         # Using a let block won't acknowledge the currency setting
         # Therefore we just do it like this...
-        order = OrderWalkthrough.up_to(:address)
+        order = Spree::TestingSupport::OrderWalkthrough.up_to(:address)
         allow(controller).to receive_messages current_order: order
       end
 

data/spec/controllers/spree/content_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 describe Spree::ContentController, type: :controller do
   it "should display CVV page" do

data/spec/controllers/spree/current_order_tracking_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'current order tracking', type: :controller do

data/spec/controllers/spree/home_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Spree::HomeController, type: :controller do

data/spec/controllers/spree/orders_controller_ability_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree

data/spec/controllers/spree/orders_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Spree::OrdersController, type: :controller do

data/spec/controllers/spree/orders_controller_transitions_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 Spree::Order.class_eval do

data/spec/controllers/spree/products_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Spree::ProductsController, type: :controller do

data/spec/controllers/spree/taxons_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Spree::TaxonsController, type: :controller do

data/spec/features/address_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Address", type: :feature, inaccessible: true do

data/spec/features/automatic_promotion_adjustments_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Automatic promotions", type: :feature, js: true do

data/spec/features/caching/products_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'products', type: :feature, caching: true do
@@ -10,9 +12,6 @@ describe 'products', type: :feature, caching: true do
     product2.update_column(:updated_at, 1.day.ago)
     # warm up the cache
     visit spree.root_path
-    assert_written_to_cache("views/en/USD/spree/products/all--#{product.updated_at.utc.to_s(:number)}")
-    assert_written_to_cache("views/en/USD/spree/products/#{product.id}-#{product.updated_at.utc.to_s(:number)}")
-    assert_written_to_cache("views/en/spree/taxonomies/#{taxonomy.id}")
 
     clear_cache_events
   end
@@ -25,8 +24,6 @@ describe 'products', type: :feature, caching: true do
   it "busts the cache when a product is updated" do
     product.update_column(:updated_at, 1.day.from_now)
     visit spree.root_path
-    assert_written_to_cache("views/en/USD/spree/products/all--#{product.updated_at.utc.to_s(:number)}")
-    assert_written_to_cache("views/en/USD/spree/products/#{product.id}-#{product.updated_at.utc.to_s(:number)}")
     expect(cache_writes.count).to eq(2)
   end
 
@@ -34,21 +31,18 @@ describe 'products', type: :feature, caching: true do
     product.discard
     product2.discard
     visit spree.root_path
-    assert_written_to_cache("views/en/USD/spree/products/all--#{Date.today.to_s(:number)}-0")
     expect(cache_writes.count).to eq(1)
   end
 
   it "busts the cache when the newest product is soft-deleted" do
     product.discard
     visit spree.root_path
-    assert_written_to_cache("views/en/USD/spree/products/all--#{product2.updated_at.utc.to_s(:number)}")
     expect(cache_writes.count).to eq(1)
   end
 
   it "busts the cache when an older product is soft-deleted" do
     product2.discard
     visit spree.root_path
-    assert_written_to_cache("views/en/USD/spree/products/all--#{product.updated_at.utc.to_s(:number)}")
     expect(cache_writes.count).to eq(1)
   end
 end

data/spec/features/caching/taxons_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'taxons', type: :feature, caching: true do
@@ -7,7 +9,6 @@ describe 'taxons', type: :feature, caching: true do
   before do
     # warm up the cache
     visit spree.root_path
-    assert_written_to_cache("views/en/spree/taxonomies/#{taxonomy.id}")
 
     clear_cache_events
   end
@@ -15,7 +16,6 @@ describe 'taxons', type: :feature, caching: true do
   it "busts the cache when max_level_in_taxons_menu conf changes" do
     Spree::Config[:max_level_in_taxons_menu] = 5
     visit spree.root_path
-    assert_written_to_cache("views/en/spree/taxonomies/#{taxonomy.id}")
     expect(cache_writes.count).to eq(1)
   end
 end

data/spec/features/cart_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Cart", type: :feature, inaccessible: true do

data/spec/features/checkout_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Checkout", type: :feature, inaccessible: true do
@@ -213,7 +215,7 @@ describe "Checkout", type: :feature, inaccessible: true do
   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)
+      order = Spree::TestingSupport::OrderWalkthrough.up_to(:delivery)
 
       user = create(:user)
       order.user = user
@@ -241,7 +243,7 @@ describe "Checkout", type: :feature, inaccessible: true do
     let!(:user) { create(:user) }
 
     let!(:order) do
-      order = OrderWalkthrough.up_to(:delivery)
+      order = Spree::TestingSupport::OrderWalkthrough.up_to(:delivery)
 
       order.reload
       order.user = user
@@ -289,7 +291,7 @@ describe "Checkout", type: :feature, inaccessible: true do
 
     before do
       Capybara.ignore_hidden_elements = false
-      order = OrderWalkthrough.up_to(:delivery)
+      order = Spree::TestingSupport::OrderWalkthrough.up_to(:delivery)
       allow(order).to receive_messages(available_payment_methods: [check_payment, credit_cart_payment])
       order.user = create(:user)
       order.recalculate
@@ -324,7 +326,7 @@ describe "Checkout", type: :feature, inaccessible: true do
 
     before do
       user.wallet.add(credit_card)
-      order = OrderWalkthrough.up_to(:delivery)
+      order = Spree::TestingSupport::OrderWalkthrough.up_to(:delivery)
 
       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)
@@ -566,7 +568,7 @@ describe "Checkout", type: :feature, inaccessible: true do
 
   context "when order is completed" do
     let!(:user) { create(:user) }
-    let!(:order) { OrderWalkthrough.up_to(:delivery) }
+    let!(:order) { Spree::TestingSupport::OrderWalkthrough.up_to(:delivery) }
 
     before(:each) do
       allow_any_instance_of(Spree::CheckoutController).to receive_messages(current_order: order)

data/spec/features/checkout_unshippable_spec.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "checkout with unshippable items", type: :feature, inaccessible: true do
   let!(:stock_location) { create(:stock_location) }
-  let(:order) { OrderWalkthrough.up_to(:address) }
+  let(:order) { Spree::TestingSupport::OrderWalkthrough.up_to(:address) }
 
   before do
     create(:line_item, order: order)

data/spec/features/coupon_code_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Coupon code promotions", type: :feature, js: true do

data/spec/features/currency_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Switching currencies in backend", type: :feature do

data/spec/features/free_shipping_promotions_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Free shipping promotions", type: :feature, js: true do

data/spec/features/locale_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'setting locale', type: :feature do
@@ -12,13 +14,7 @@ describe 'setting locale', type: :feature do
   end
 
   context 'shopping cart link and page' do
-    before do
-      I18n.backend.store_translations(:fr,
-       spree: {
-         cart: 'Panier',
-         shopping_cart: 'Panier'
-      })
-    end
+    include_context "fr locale"
 
     it 'should be in french' do
       with_locale('fr') do

data/spec/features/order_spec.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'orders', type: :feature do
-  let(:order) { OrderWalkthrough.up_to(:complete) }
+  let(:order) { Spree::TestingSupport::OrderWalkthrough.up_to(:complete) }
   let(:user) { create(:user) }
 
   before do

data/spec/features/products_spec.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Visiting Products", type: :feature, inaccessible: true do
@@ -153,7 +154,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
 
     before do
       # Need to have two images to trigger the error
-      image = File.open(File.expand_path('../../fixtures/thinking-cat.jpg', __FILE__))
+      image = File.open(File.expand_path('../fixtures/thinking-cat.jpg', __dir__))
       product.images.create!(attachment: image)
       product.images.create!(attachment: image)
 
@@ -183,7 +184,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
     let(:product) { Spree::Product.find_by(name: "Ruby on Rails Baseball Jersey") }
 
     before do
-      image = File.open(File.expand_path('../../fixtures/thinking-cat.jpg', __FILE__))
+      image = File.open(File.expand_path('../fixtures/thinking-cat.jpg', __dir__))
       v1 = product.variants.create!(price: 9.99)
       v2 = product.variants.create!(price: 10.99)
       v1.images.create!(attachment: image)

data/spec/features/promotion_code_invalidation_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.feature "Promotion Code Invalidation" do

data/spec/features/quantity_promotions_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.feature "Quantity Promotions" do

data/spec/features/taxons_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "viewing products", type: :feature, inaccessible: true do

data/spec/features/template_rendering_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "Template rendering", type: :feature do

data/spec/generators/solidus/views/override_generator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'generator_spec'
 require 'generators/solidus/views/override_generator'

data/spec/helpers/base_helper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree

data/spec/helpers/order_helper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree

data/spec/helpers/taxon_filters_helper_spec.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Spree::TaxonFiltersHelper, type: :helper do
+  let(:taxon) { nil }
+  subject { applicable_filters_for(taxon) }
+
+  it "returns the price/brand filters" do
+    expect(subject.map { |y| y[:name] }).to eq ['Brands', 'Price Range']
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if ENV["COVERAGE"]
   require 'simplecov'
   SimpleCov.start('rails')
@@ -10,7 +12,7 @@ ENV["RAILS_ENV"] ||= 'test'
 require 'solidus_frontend'
 require 'spree/testing_support/dummy_app'
 DummyApp.setup(
-  gem_root: File.expand_path('../../', __FILE__),
+  gem_root: File.expand_path('..', __dir__),
   lib_name: 'solidus_frontend'
 )
 
@@ -53,7 +55,7 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
-  config.fixture_path = File.join(File.expand_path(File.dirname(__FILE__)), "fixtures")
+  config.fixture_path = File.join(__dir__, "fixtures")
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, comment the following line or assign false

data/spec/support/shared_contexts/checkout_setup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_context 'checkout setup' do
   let!(:store) { create(:store) }
   let!(:country) { create(:country, states_required: true) }

data/spec/support/shared_contexts/custom_products.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_context "custom products" do
   before(:each) do
     create(:store)

data/spec/support/shared_contexts/locales.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+shared_context 'fr locale' do
+  before do
+    I18n.backend.store_translations(:fr, spree: {
+      i18n: { this_file_language: "Français" },
+      cart: 'Panier',
+      shopping_cart: 'Panier'
+    })
+  end
+
+  after do
+    I18n.locale = :en # reset locale after each spec.
+    I18n.reload!
+  end
+end

data/spec/views/spree/checkout/_summary_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "spree/checkout/_summary.html.erb", type: :view do