solidus_frontend 1.2.3 → 1.3.0.beta1

data/spec/features/currency_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
 
-describe "Switching currencies in backend", :type => :feature do
+describe "Switching currencies in backend", type: :feature do
   before do
-    create(:base_product, :name => "RoR Mug")
+    create(:store)
+    create(:base_product, name: "RoR Mug")
   end
 
   # Regression test for https://github.com/spree/spree/issues/2340
@@ -14,5 +15,4 @@ describe "Switching currencies in backend", :type => :feature do
     Spree::Config[:currency] = "AUD"
     visit spree.root_path
   end
-
 end

data/spec/features/free_shipping_promotions_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
 
-describe "Free shipping promotions", :type => :feature, :js => true do
-  let!(:country) { create(:country, :name => "United States of America", :states_required => true) }
-  let!(:state) { create(:state, :name => "Alabama", :country => country) }
+describe "Free shipping promotions", type: :feature, js: true do
+  let!(:store) { create(:store) }
+  let!(:country) { create(:country, name: "United States of America", states_required: true) }
+  let!(:state) { create(:state, name: "Alabama", country: country) }
   let!(:zone) { create(:zone) }
   let!(:shipping_method) do
     sm = create(:shipping_method)
@@ -12,11 +13,11 @@ describe "Free shipping promotions", :type => :feature, :js => true do
   end
 
   let!(:payment_method) { create(:check_payment_method) }
-  let!(:product) { create(:product, :name => "RoR Mug", :price => 20) }
+  let!(:product) { create(:product, name: "RoR Mug", price: 20) }
   let!(:promotion) do
-    promotion = Spree::Promotion.create!(:name       => "Free Shipping",
-                                         :starts_at  => 1.day.ago,
-                                         :expires_at => 1.day.from_now)
+    promotion = Spree::Promotion.create!(name: "Free Shipping",
+                                         starts_at: 1.day.ago,
+                                         expires_at: 1.day.from_now)
 
     action = Spree::Promotion::Actions::FreeShipping.new
     action.promotion = promotion
@@ -27,20 +28,19 @@ describe "Free shipping promotions", :type => :feature, :js => true do
 
   context "free shipping promotion automatically applied" do
     before do
-
       visit spree.root_path
       click_link "RoR Mug"
       click_button "add-to-cart-button"
       click_button "Checkout"
-      fill_in "order_email", :with => "spree@example.com"
-      fill_in "First Name", :with => "John"
-      fill_in "Last Name", :with => "Smith"
-      fill_in "Street Address", :with => "1 John Street"
-      fill_in "City", :with => "City of John"
-      fill_in "Zip", :with => "01337"
-      select country.name, :from => "Country"
-      select state.name, :from => "order[bill_address_attributes][state_id]"
-      fill_in "Phone", :with => "555-555-5555"
+      fill_in "order_email", with: "spree@example.com"
+      fill_in "First Name", with: "John"
+      fill_in "Last Name", with: "Smith"
+      fill_in "Street Address", with: "1 John Street"
+      fill_in "City", with: "City of John"
+      fill_in "Zip", with: "01337"
+      select country.name, from: "Country"
+      select state.name, from: "order[bill_address_attributes][state_id]"
+      fill_in "Phone", with: "555-555-5555"
 
       # To shipping method screen
       click_button "Save and Continue"

data/spec/features/locale_spec.rb

@@ -1,10 +1,12 @@
 require 'spec_helper'
 
-describe 'setting locale', :type => :feature do
+describe 'setting locale', type: :feature do
+  let!(:store) { create(:store) }
   def with_locale(locale)
     I18n.locale = locale
     Spree::Frontend::Config[:locale] = locale
     yield
+  ensure
     I18n.locale = I18n.default_locale
     Spree::Frontend::Config[:locale] = 'en'
   end
@@ -12,9 +14,9 @@ describe 'setting locale', :type => :feature do
   context 'shopping cart link and page' do
     before do
       I18n.backend.store_translations(:fr,
-       :spree => {
-         :cart => 'Panier',
-         :shopping_cart => 'Panier'
+       spree: {
+         cart: 'Panier',
+         shopping_cart: 'Panier'
       })
     end
 
@@ -27,34 +29,41 @@ describe 'setting locale', :type => :feature do
     end
   end
 
-  context 'checkout form validation messages' do
+  shared_examples "localized error message" do
     include_context 'checkout setup'
 
-    let(:error_messages) do
-      {
-        'en' => 'This field is required.',
-        'fr' => 'Ce champ est obligatoire.',
-        'de' => 'Dieses Feld ist ein Pflichtfeld.',
-      }
-    end
-
-    def check_error_text(text)
-      %w(firstname lastname address1 city).each do |attr|
-        expect(find(".field#b#{attr} label.error").text).to eq(text)
-      end
-    end
-
     it 'shows translated jquery.validate error messages', js: true do
       visit spree.root_path
       click_link mug.name
       click_button 'add-to-cart-button'
-      error_messages.each do |locale, message|
-        with_locale(locale) do
-          visit '/checkout/address'
-          find('.form-buttons input[type=submit]').click
-          check_error_text message
+      with_locale(locale) do
+        visit '/checkout/address'
+        find('.form-buttons input[type=submit]').click
+
+        %w(firstname lastname 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

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe 'orders', :type => :feature do
+describe 'orders', type: :feature do
   let(:order) { OrderWalkthrough.up_to(:complete) }
   let(:user) { create(:user) }
 
   before do
     order.update_attribute(:user_id, user.id)
-    allow_any_instance_of(Spree::OrdersController).to receive_messages(:try_spree_current_user => user)
+    allow_any_instance_of(Spree::OrdersController).to receive_messages(try_spree_current_user: user)
   end
 
   it "can visit an order" do
@@ -30,7 +30,7 @@ describe 'orders', :type => :feature do
   end
 
   it "should have credit card info if paid with credit card" do
-    create(:payment, :order => order)
+    create(:payment, order: order)
     visit spree.order_path(order)
     within '.payment-info' do
       expect(page).to have_content "Ending in 1111"
@@ -38,7 +38,7 @@ describe 'orders', :type => :feature do
   end
 
   it "should have payment method name visible if not paid with credit card" do
-    create(:check_payment, :order => order)
+    create(:check_payment, order: order)
     visit spree.order_path(order)
     within '.payment-info' do
       expect(page).to have_content "Check"

data/spec/features/products_spec.rb

@@ -22,7 +22,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
 
   describe 'meta tags and title' do
     let(:jersey) { Spree::Product.find_by_name('Ruby on Rails Baseball Jersey') }
-    let(:metas) { { :meta_description => 'Brand new Ruby on Rails Jersey', :meta_title => 'Ruby on Rails Baseball Jersey Buy High Quality Geek Apparel', :meta_keywords => 'ror, jersey, ruby' } }
+    let(:metas) { { meta_description: 'Brand new Ruby on Rails Jersey', meta_title: 'Ruby on Rails Baseball Jersey Buy High Quality Geek Apparel', meta_keywords: 'ror, jersey, ruby' } }
 
     it 'should return the correct title when displaying a single product' do
       click_link jersey.name
@@ -66,6 +66,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
   context "using Russian Rubles as a currency" do
     before do
       Spree::Config[:currency] = "RUB"
+      Spree::Config.remove_instance_variable(:@default_pricing_options)
     end
 
     let!(:product) do
@@ -92,7 +93,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
         end
       end
 
-      it "when adding a product to the cart", :js => true do
+      it "when adding a product to the cart", js: true do
         visit spree.product_path(product)
         click_button "Add To Cart"
         click_link "Home"
@@ -113,7 +114,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
   end
 
   it "should be able to search for a product" do
-    fill_in "keywords", :with => "shirt"
+    fill_in "keywords", with: "shirt"
     click_button "Search"
 
     expect(page.all('ul.product-listing li').size).to eq(1)
@@ -122,13 +123,13 @@ describe "Visiting Products", type: :feature, inaccessible: true do
   context "a product with variants" do
     let(:product) { Spree::Product.find_by_name("Ruby on Rails Baseball Jersey") }
     let(:option_value) { create(:option_value) }
-    let!(:variant) { product.variants.create!(:price => 5.59) }
+    let!(:variant) { product.variants.create!(price: 5.59) }
 
     before do
       # Need to have two images to trigger the error
       image = File.open(File.expand_path('../../fixtures/thinking-cat.jpg', __FILE__))
-      product.images.create!(:attachment => image)
-      product.images.create!(:attachment => image)
+      product.images.create!(attachment: image)
+      product.images.create!(attachment: image)
 
       product.option_types << option_value.option_type
       variant.option_values << option_value
@@ -177,7 +178,6 @@ describe "Visiting Products", type: :feature, inaccessible: true do
     expect(page.all('ul.product-listing li').size).to eq(0)
   end
 
-
   it "should be able to display products priced under 10 dollars" do
     within(:css, '#taxonomies') { click_link "Ruby on Rails" }
     check "Price_Range_Under_$10.00"
@@ -221,13 +221,13 @@ describe "Visiting Products", type: :feature, inaccessible: true do
     tmp = page.all('ul.product-listing li a').map(&:text).flatten.compact
     tmp.delete("")
     expect(tmp.sort!).to eq(["Ruby on Rails Bag",
-                         "Ruby on Rails Baseball Jersey",
-                         "Ruby on Rails Jr. Spaghetti",
-                         "Ruby on Rails Ringer T-Shirt"])
+                             "Ruby on Rails Baseball Jersey",
+                             "Ruby on Rails Jr. Spaghetti",
+                             "Ruby on Rails Ringer T-Shirt"])
   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 = FactoryGirl.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'
@@ -235,7 +235,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 = FactoryGirl.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

@@ -11,6 +11,7 @@ RSpec.feature "Promotion Code Invalidation" do
   end
 
   background do
+    create(:store)
     FactoryGirl.create(:product, name: "DL-44")
     FactoryGirl.create(:product, name: "E-11")
 

data/spec/features/quantity_promotions_spec.rb

@@ -12,6 +12,7 @@ RSpec.feature "Quantity Promotions" do
   given(:calculator) { FactoryGirl.create(:calculator, preferred_amount: 5) }
 
   background do
+    create(:store)
     FactoryGirl.create(:product, name: "DL-44")
     FactoryGirl.create(:product, name: "E-11")
     promotion.actions << action
@@ -125,4 +126,3 @@ RSpec.feature "Quantity Promotions" do
     end
   end
 end
-

data/spec/features/taxons_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
 describe "viewing products", type: :feature, inaccessible: true do
-  let!(:taxonomy) { create(:taxonomy, :name => "Category") }
-  let!(:super_clothing) { taxonomy.root.children.create(:name => "Super Clothing") }
-  let!(:t_shirts) { super_clothing.children.create(:name => "T-Shirts") }
-  let!(:xxl) { t_shirts.children.create(:name => "XXL") }
+  let!(:taxonomy) { create(:taxonomy, name: "Category") }
+  let!(:super_clothing) { taxonomy.root.children.create(name: "Super Clothing") }
+  let!(:t_shirts) { super_clothing.children.create(name: "T-Shirts") }
+  let!(:xxl) { t_shirts.children.create(name: "XXL") }
   let!(:product) do
-    product = create(:product, :name => "Superman T-Shirt")
+    product = create(:product, name: "Superman T-Shirt")
     product.taxons << t_shirts
   end
-  let(:metas) { { :meta_description => 'Brand new Ruby on Rails TShirts', :meta_title => "Ruby On Rails TShirt", :meta_keywords => 'ror, tshirt, ruby' } }
+  let(:metas) { { meta_description: 'Brand new Ruby on Rails TShirts', meta_title: "Ruby On Rails TShirt", meta_keywords: 'ror, tshirt, ruby' } }
   let(:store_name) do
     ((first_store = Spree::Store.first) && first_store.name).to_s
   end
@@ -74,12 +74,12 @@ describe "viewing products", type: :feature, inaccessible: true do
       tmp = page.all('ul.product-listing li a').map(&:text).flatten.compact
       tmp.delete("")
       array = ["Ruby on Rails Bag",
-       "Ruby on Rails Baseball Jersey",
-       "Ruby on Rails Jr. Spaghetti",
-       "Ruby on Rails Mug",
-       "Ruby on Rails Ringer T-Shirt",
-       "Ruby on Rails Stein",
-       "Ruby on Rails Tote"]
+               "Ruby on Rails Baseball Jersey",
+               "Ruby on Rails Jr. Spaghetti",
+               "Ruby on Rails Mug",
+               "Ruby on Rails Ringer T-Shirt",
+               "Ruby on Rails Stein",
+               "Ruby on Rails Tote"]
       expect(tmp.sort!).to eq(array)
     end
 
@@ -108,10 +108,10 @@ describe "viewing products", type: :feature, inaccessible: true do
       tmp = page.all('ul.product-listing li a').map(&:text).flatten.compact
       tmp.delete("")
       expect(tmp.sort!).to eq(["Apache Baseball Jersey",
-     "Ruby Baseball Jersey",
-     "Ruby on Rails Baseball Jersey",
-     "Ruby on Rails Jr. Spaghetti",
-     "Ruby on Rails Ringer T-Shirt"])
+                               "Ruby Baseball Jersey",
+                               "Ruby on Rails Baseball Jersey",
+                               "Ruby on Rails Jr. Spaghetti",
+                               "Ruby on Rails Ringer T-Shirt"])
     end
 
     it "should be able to visit category Mugs" do

data/spec/features/template_rendering_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-describe "Template rendering", :type => :feature do
-
+describe "Template rendering", type: :feature do
   after do
     Capybara.ignore_hidden_elements = true
   end

data/spec/helpers/base_helper_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 module Spree
-  describe BaseHelper, :type => :helper do
+  describe BaseHelper, type: :helper do
     # Regression test for https://github.com/spree/spree/issues/2759
     it "nested_taxons_path works with a Taxon object" do
-      taxon = create(:taxon, :name => "iphone")
+      taxon = create(:taxon, name: "iphone")
       expect(spree.nested_taxons_path(taxon)).to eq("/t/iphone")
     end
   end

data/spec/spec_helper.rb

@@ -27,7 +27,7 @@ require 'ffaker'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 require 'database_cleaner'
 
@@ -58,6 +58,8 @@ else
   Capybara.javascript_driver = :poltergeist
 end
 
+Capybara.default_max_wait_time = ENV['DEFAULT_MAX_WAIT_TIME'].to_f if ENV['DEFAULT_MAX_WAIT_TIME'].present?
+
 RSpec.configure do |config|
   config.color = true
   config.infer_spec_type_from_file_location!
@@ -76,7 +78,7 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = false
 
   if ENV['WEBDRIVER'] == 'accessible'
-    config.around(:each, :inaccessible => true) do |example|
+    config.around(:each, inaccessible: true) do |example|
       Capybara::Accessible.skip_audit { example.run }
     end
   end
@@ -88,7 +90,6 @@ RSpec.configure do |config|
   config.before(:each) do
     Rails.cache.clear
     reset_spree_preferences
-    WebMock.disable!
     if RSpec.current_example.metadata[:js]
       page.driver.browser.url_blacklist = ['http://fonts.googleapis.com']
       DatabaseCleaner.strategy = :truncation
@@ -102,7 +103,7 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
-  config.after(:each, :type => :feature) do |example|
+  config.after(:each, type: :feature) do |example|
     missing_translations = page.body.scan(/translation missing: #{I18n.locale}\.(.*?)[\s<\"&]/)
     if missing_translations.any?
       puts "Found missing translations: #{missing_translations.inspect}"
@@ -110,7 +111,6 @@ RSpec.configure do |config|
     end
   end
 
-
   config.include FactoryGirl::Syntax::Methods
 
   config.include Spree::TestingSupport::Preferences

data/spec/support/shared_contexts/checkout_setup.rb

@@ -1,4 +1,5 @@
 shared_context 'checkout setup' do
+  let!(:store) { create(:store) }
   let!(:country) { create(:country, states_required: true) }
   let!(:state) { create(:state, country: country) }
   let!(:shipping_method) { create(:shipping_method) }

data/spec/support/shared_contexts/custom_products.rb

@@ -1,25 +1,26 @@
 shared_context "custom products" do
   before(:each) do
-    taxonomy = FactoryGirl.create(:taxonomy, :name => 'Categories')
+    create(:store)
+    taxonomy = FactoryGirl.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 = 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)
 
-    taxonomy = FactoryGirl.create(:taxonomy, :name => 'Brands')
+    taxonomy = FactoryGirl.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 = 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)
 
-    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])
+    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])
   end
 end