solidus_frontend 2.4.2 → 2.5.0.beta1

data/spec/features/locale_spec.rb

@@ -28,42 +28,4 @@ describe 'setting locale', type: :feature do
       end
     end
   end
-
-  shared_examples "localized error message" do
-    include_context 'checkout setup'
-
-    it 'shows translated jquery.validate error messages', js: true do
-      visit spree.root_path
-      click_link mug.name
-      click_button 'add-to-cart-button'
-      with_locale(locale) do
-        visit '/checkout/address'
-        find('.form-buttons input[type=submit]').click
-
-        %w(firstname address1 city).each do |attr|
-          expect(find(".field#b#{attr} label.error")).to have_text(message)
-        end
-      end
-    end
-  end
-
-  context 'checkout form validation messages' do
-    context 'en' do
-      let(:locale) { 'en' }
-      let(:message) { 'This field is required.' }
-      it_behaves_like "localized error message"
-    end
-
-    context 'fr' do
-      let(:locale) { 'fr' }
-      let(:message) { 'Ce champ est obligatoire.' }
-      it_behaves_like "localized error message"
-    end
-
-    context 'de' do
-      let(:locale) { 'de' }
-      let(:message) { 'Dieses Feld ist ein Pflichtfeld.' }
-      it_behaves_like "localized error message"
-    end
-  end
 end

data/spec/features/order_spec.rb

@@ -65,7 +65,7 @@ describe 'orders', type: :feature do
     visit spree.order_path(order)
 
     within '#order_summary' do
-      expect(page).to have_content("#{Spree.t(:order)} #{order.number}")
+      expect(page).to have_content("#{I18n.t('spree.order')} #{order.number}")
     end
   end
 end

data/spec/features/products_spec.rb

@@ -165,7 +165,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
       click_link product.name
       within("#product-price") do
         expect(page).to have_content variant.price
-        expect(page).not_to have_content Spree.t(:out_of_stock)
+        expect(page).not_to have_content I18n.t('spree.out_of_stock')
       end
     end
 
@@ -174,7 +174,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
 
       click_link product.name
       within("#product-price") do
-        expect(page).not_to have_content Spree.t(:out_of_stock)
+        expect(page).not_to have_content I18n.t('spree.out_of_stock')
       end
     end
   end
@@ -253,7 +253,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
   end
 
   it "should be able to put a product without a description in the cart" do
-    product = FactoryGirl.create(:base_product, description: nil, name: 'Sample', price: '19.99')
+    product = FactoryBot.create(:base_product, description: nil, name: 'Sample', price: '19.99')
     visit spree.product_path(product)
     expect(page).to have_content "This product has no description"
     click_button 'add-to-cart-button'
@@ -261,7 +261,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
   end
 
   it "shouldn't be able to put a product without a current price in the cart" do
-    product = FactoryGirl.create(:base_product, description: nil, name: 'Sample', price: '19.99')
+    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.product_path(product)

data/spec/features/promotion_code_invalidation_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.feature "Promotion Code Invalidation" do
   given!(:promotion) do
-    FactoryGirl.create(
+    FactoryBot.create(
       :promotion_with_item_adjustment,
       code: "PROMO",
       per_code_usage_limit: 1,
@@ -12,8 +12,8 @@ RSpec.feature "Promotion Code Invalidation" do
 
   background do
     create(:store)
-    FactoryGirl.create(:product, name: "DL-44")
-    FactoryGirl.create(:product, name: "E-11")
+    FactoryBot.create(:product, name: "DL-44")
+    FactoryBot.create(:product, name: "E-11")
 
     visit spree.root_path
     click_link "DL-44"

data/spec/features/quantity_promotions_spec.rb

@@ -8,13 +8,13 @@ RSpec.feature "Quantity Promotions" do
     )
   end
 
-  given(:promotion) { FactoryGirl.create(:promotion, code: "PROMO") }
-  given(:calculator) { FactoryGirl.create(:calculator, preferred_amount: 5) }
+  given(:promotion) { FactoryBot.create(:promotion, code: "PROMO") }
+  given(:calculator) { FactoryBot.create(:calculator, preferred_amount: 5) }
 
   background do
     create(:store)
-    FactoryGirl.create(:product, name: "DL-44")
-    FactoryGirl.create(:product, name: "E-11")
+    FactoryBot.create(:product, name: "DL-44")
+    FactoryBot.create(:product, name: "E-11")
     promotion.actions << action
 
     visit spree.root_path
@@ -95,7 +95,7 @@ RSpec.feature "Quantity Promotions" do
       )
     end
 
-    background { FactoryGirl.create(:product, name: "DC-15A") }
+    background { FactoryBot.create(:product, name: "DC-15A") }
 
     scenario "odd number of changes to quantities" do
       fill_in "order_line_items_attributes_0_quantity", with: 3

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

@@ -1,5 +1,6 @@
 require 'spec_helper'
-require_relative '../../../../lib/generators/solidus/views/override_generator'
+require 'generator_spec'
+require 'generators/solidus/views/override_generator'
 
 RSpec.describe Solidus::Views::OverrideGenerator, type: :generator do
   destination Rails.root.join('app', 'views', 'spree')

data/spec/spec_helper.rb

@@ -1,29 +1,22 @@
 if ENV["COVERAGE"]
-  # Run Coverage report
   require 'simplecov'
-  SimpleCov.start do
-    add_group 'Controllers', 'app/controllers'
-    add_group 'Helpers', 'app/helpers'
-    add_group 'Mailers', 'app/mailers'
-    add_group 'Models', 'app/models'
-    add_group 'Views', 'app/views'
-    add_group 'Libraries', 'lib'
-  end
+  SimpleCov.start('rails')
 end
 
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
 # from the project root directory.
 ENV["RAILS_ENV"] ||= 'test'
 
-begin
-  require File.expand_path("../dummy/config/environment", __FILE__)
-rescue LoadError
-  $stderr.puts "Could not load dummy application. Please ensure you have run `bundle exec rake test_app`"
-  exit 1
-end
+require 'solidus_frontend'
+require 'spree/testing_support/dummy_app'
+DummyApp.setup(
+  gem_root: File.expand_path('../../', __FILE__),
+  lib_name: 'solidus_frontend'
+)
 
+require 'rails-controller-testing'
 require 'rspec/rails'
-require 'ffaker'
+require 'rspec-activemodel-mocks'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
@@ -31,10 +24,6 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 require 'database_cleaner'
 
-if ENV["CHECK_TRANSLATIONS"]
-  require "spree/testing_support/i18n"
-end
-
 require 'spree/testing_support/authorization_helpers'
 require 'spree/testing_support/capybara_ext'
 require 'spree/testing_support/factories'
@@ -47,16 +36,12 @@ require 'spree/testing_support/caching'
 
 require 'capybara-screenshot/rspec'
 Capybara.save_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
+Capybara.default_max_wait_time = ENV['DEFAULT_MAX_WAIT_TIME'].to_f if ENV['DEFAULT_MAX_WAIT_TIME'].present?
 
-if ENV['WEBDRIVER'] == 'accessible'
-  require 'capybara/accessible'
-  Capybara.javascript_driver = :accessible
-else
-  require 'capybara/poltergeist'
-  Capybara.javascript_driver = :poltergeist
-end
+require "selenium/webdriver"
+Capybara.javascript_driver = (ENV['CAPYBARA_DRIVER'] || :selenium_chrome_headless).to_sym
 
-Capybara.default_max_wait_time = ENV['DEFAULT_MAX_WAIT_TIME'].to_f if ENV['DEFAULT_MAX_WAIT_TIME'].present?
+ActiveJob::Base.queue_adapter = :test
 
 RSpec.configure do |config|
   config.color = true
@@ -73,7 +58,7 @@ RSpec.configure do |config|
   # 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
   # instead of true.
-  config.use_transactional_fixtures = false
+  config.use_transactional_fixtures = true
 
   if ENV['WEBDRIVER'] == 'accessible'
     config.around(:each, inaccessible: true) do |example|
@@ -88,17 +73,12 @@ RSpec.configure do |config|
   config.before(:each) do
     Rails.cache.clear
     reset_spree_preferences
-    if RSpec.current_example.metadata[:js]
-      page.driver.browser.url_blacklist = ['http://fonts.googleapis.com']
-      DatabaseCleaner.strategy = :truncation
-    else
-      DatabaseCleaner.strategy = :transaction
-    end
-    DatabaseCleaner.start
   end
 
-  config.after(:each) do
-    DatabaseCleaner.clean
+  config.before(:each, type: :feature) do
+    if page.driver.browser.respond_to?(:url_blacklist)
+      page.driver.browser.url_blacklist = ['http://fonts.googleapis.com']
+    end
   end
 
   config.after(:each, type: :feature) do |example|
@@ -109,15 +89,13 @@ RSpec.configure do |config|
     end
   end
 
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 
   config.include Spree::TestingSupport::Preferences
   config.include Spree::TestingSupport::UrlHelpers
   config.include Spree::TestingSupport::ControllerRequests, type: :controller
   config.include Spree::TestingSupport::Flash
 
-  config.fail_fast = ENV['FAIL_FAST'] || false
-
   config.example_status_persistence_file_path = "./spec/examples.txt"
 
   config.order = :random

data/spec/support/shared_contexts/custom_products.rb

@@ -1,26 +1,26 @@
 shared_context "custom products" do
   before(:each) do
     create(:store)
-    taxonomy = FactoryGirl.create(:taxonomy, name: 'Categories')
+    taxonomy = FactoryBot.create(:taxonomy, name: 'Categories')
     root = taxonomy.root
-    clothing_taxon = FactoryGirl.create(:taxon, name: 'Clothing', parent_id: root.id)
-    bags_taxon = FactoryGirl.create(:taxon, name: 'Bags', parent_id: root.id)
-    mugs_taxon = FactoryGirl.create(:taxon, name: 'Mugs', parent_id: root.id)
+    clothing_taxon = FactoryBot.create(:taxon, name: 'Clothing', parent_id: root.id)
+    bags_taxon = FactoryBot.create(:taxon, name: 'Bags', parent_id: root.id)
+    mugs_taxon = FactoryBot.create(:taxon, name: 'Mugs', parent_id: root.id)
 
-    taxonomy = FactoryGirl.create(:taxonomy, name: 'Brands')
+    taxonomy = FactoryBot.create(:taxonomy, name: 'Brands')
     root = taxonomy.root
-    apache_taxon = FactoryGirl.create(:taxon, name: 'Apache', parent_id: root.id)
-    rails_taxon = FactoryGirl.create(:taxon, name: 'Ruby on Rails', parent_id: root.id)
-    ruby_taxon = FactoryGirl.create(:taxon, name: 'Ruby', parent_id: root.id)
+    apache_taxon = FactoryBot.create(:taxon, name: 'Apache', parent_id: root.id)
+    rails_taxon = FactoryBot.create(:taxon, name: 'Ruby on Rails', parent_id: root.id)
+    ruby_taxon = FactoryBot.create(:taxon, name: 'Ruby', parent_id: root.id)
 
-    FactoryGirl.create(:custom_product, name: 'Ruby on Rails Ringer T-Shirt', price: '19.99', taxons: [rails_taxon, clothing_taxon])
-    FactoryGirl.create(:custom_product, name: 'Ruby on Rails Mug', price: '15.99', taxons: [rails_taxon, mugs_taxon])
-    FactoryGirl.create(:custom_product, name: 'Ruby on Rails Tote', price: '15.99', taxons: [rails_taxon, bags_taxon])
-    FactoryGirl.create(:custom_product, name: 'Ruby on Rails Bag', price: '22.99', taxons: [rails_taxon, bags_taxon])
-    FactoryGirl.create(:custom_product, name: 'Ruby on Rails Baseball Jersey', price: '19.99', taxons: [rails_taxon, clothing_taxon])
-    FactoryGirl.create(:custom_product, name: 'Ruby on Rails Stein', price: '16.99', taxons: [rails_taxon, mugs_taxon])
-    FactoryGirl.create(:custom_product, name: 'Ruby on Rails Jr. Spaghetti', price: '19.99', taxons: [rails_taxon, clothing_taxon])
-    FactoryGirl.create(:custom_product, name: 'Ruby Baseball Jersey', price: '19.99', taxons: [ruby_taxon, clothing_taxon])
-    FactoryGirl.create(:custom_product, name: 'Apache Baseball Jersey', price: '19.99', taxons: [apache_taxon, clothing_taxon])
+    FactoryBot.create(:custom_product, name: 'Ruby on Rails Ringer T-Shirt', price: '19.99', taxons: [rails_taxon, clothing_taxon])
+    FactoryBot.create(:custom_product, name: 'Ruby on Rails Mug', price: '15.99', taxons: [rails_taxon, mugs_taxon])
+    FactoryBot.create(:custom_product, name: 'Ruby on Rails Tote', price: '15.99', taxons: [rails_taxon, bags_taxon])
+    FactoryBot.create(:custom_product, name: 'Ruby on Rails Bag', price: '22.99', taxons: [rails_taxon, bags_taxon])
+    FactoryBot.create(:custom_product, name: 'Ruby on Rails Baseball Jersey', price: '19.99', taxons: [rails_taxon, clothing_taxon])
+    FactoryBot.create(:custom_product, name: 'Ruby on Rails Stein', price: '16.99', taxons: [rails_taxon, mugs_taxon])
+    FactoryBot.create(:custom_product, name: 'Ruby on Rails Jr. Spaghetti', price: '19.99', taxons: [rails_taxon, clothing_taxon])
+    FactoryBot.create(:custom_product, name: 'Ruby Baseball Jersey', price: '19.99', taxons: [ruby_taxon, clothing_taxon])
+    FactoryBot.create(:custom_product, name: 'Apache Baseball Jersey', price: '19.99', taxons: [apache_taxon, clothing_taxon])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-02-14 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.4.2
+        version: 2.5.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0.beta1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0.beta1
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -132,22 +118,16 @@ dependencies:
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.17'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.1'
   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'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: capybara-accessible
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +148,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -203,12 +182,12 @@ files:
 - app/assets/images/spinner.gif
 - app/assets/images/spree/frontend/cart.png
 - app/assets/javascripts/spree/frontend.js
-- app/assets/javascripts/spree/frontend/cart.js.coffee
-- app/assets/javascripts/spree/frontend/checkout.js.coffee
-- app/assets/javascripts/spree/frontend/checkout/address.js.coffee
-- app/assets/javascripts/spree/frontend/checkout/coupon-code.js.coffee
-- app/assets/javascripts/spree/frontend/checkout/payment.js.coffee
-- app/assets/javascripts/spree/frontend/product.js.coffee
+- app/assets/javascripts/spree/frontend/cart.js
+- app/assets/javascripts/spree/frontend/checkout.js
+- app/assets/javascripts/spree/frontend/checkout/address.js
+- app/assets/javascripts/spree/frontend/checkout/coupon-code.js
+- app/assets/javascripts/spree/frontend/checkout/payment.js
+- app/assets/javascripts/spree/frontend/product.js
 - app/assets/stylesheets/spree/frontend.css
 - app/assets/stylesheets/spree/frontend/_skeleton.scss
 - app/assets/stylesheets/spree/frontend/_variables.scss
@@ -258,7 +237,9 @@ files:
 - app/views/spree/shared/_footer.html.erb
 - app/views/spree/shared/_head.html.erb
 - app/views/spree/shared/_header.html.erb
+- app/views/spree/shared/_image.html.erb
 - app/views/spree/shared/_link_to_cart.html.erb
+- app/views/spree/shared/_login_bar_items.html.erb
 - app/views/spree/shared/_main_nav_bar.html.erb
 - app/views/spree/shared/_nav_bar.html.erb
 - app/views/spree/shared/_order_details.html.erb
@@ -320,56 +301,6 @@ files:
 - spec/support/shared_contexts/checkout_setup.rb
 - spec/support/shared_contexts/custom_products.rb
 - spec/views/spree/checkout/_summary_spec.rb
-- vendor/assets/javascripts/jquery.validate/additional-methods.min.js
-- vendor/assets/javascripts/jquery.validate/jquery.validate.min.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ar.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_bg.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ca.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_cs.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_da.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_de.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_el.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_es.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_et.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_eu.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_fa.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_fi.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_fr.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ge.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_he.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_hr.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_hu.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_it.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ja.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ka.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_kk.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ko.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_lt.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_lv.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ms.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_nl.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_no.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_pl.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ptbr.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ptpt.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ro.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ru.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_se.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_si.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_sk.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_sl.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_sr.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_sv.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_th.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_tr.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_tw.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_uk.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_vi.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_zh.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_zhtw.js
-- vendor/assets/javascripts/jquery.validate/localization/methods_de.js
-- vendor/assets/javascripts/jquery.validate/localization/methods_nl.js
-- vendor/assets/javascripts/jquery.validate/localization/methods_pt.js
 homepage: http://solidus.io/
 licenses:
 - BSD-3-Clause
@@ -391,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Cart and storefront for the Solidus e-commerce project.