solidus_frontend 2.6.5 → 2.9.0

data/spec/features/currency_spec.rb

@@ -14,7 +14,7 @@ describe "Switching currencies in backend", type: :feature do
     click_link "RoR Mug"
     click_button "Add To Cart"
     # Now that we have an order...
-    Spree::Config[:currency] = "AUD"
+    stub_spree_preferences(currency: "AUD")
     visit spree.root_path
   end
 end

data/spec/features/first_order_promotion_spec.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.feature "First Order promotion" do
+  given!(:promotion) do
+    FactoryBot.create(
+      :promotion_with_first_order_rule,
+      :with_order_adjustment,
+      code: "FIRSTONEFREE",
+      per_code_usage_limit: 10
+    )
+  end
+
+  background do
+    create(:store)
+    product = FactoryBot.create(:product)
+    visit spree.root_path
+    click_link product.name
+    click_button "Add To Cart"
+  end
+
+  scenario "Adding first order promotion to cart and checking out as guest" do
+    fill_in "Coupon code", with: "FIRSTONEFREE"
+    click_button "Apply Code"
+    expect(page).to have_content("The coupon code was successfully applied to your order")
+
+    within("#cart_adjustments") do
+      expect(page).to have_content("-$10.00")
+    end
+  end
+
+  scenario "Trying to reuse first order promotion" do
+    previous_user = FactoryBot.create(
+      :user,
+      email: "sam@tom.com"
+    )
+    _previous_order = create(:completed_order_with_totals, user: previous_user)
+    fill_in "Coupon code", with: "FIRSTONEFREE"
+    click_button "Apply Code"
+    expect(page).to have_content("The coupon code was successfully applied to your order")
+    click_on "Checkout"
+    fill_in "Customer E-Mail", with: "sam@tom.com"
+    fill_in_address
+    click_on "Save and Continue"
+    expect(page).to_not have_content("#summary-order-charges")
+  end
+
+  def fill_in_address
+    address = "order_bill_address_attributes"
+    fill_in "#{address}_firstname", with: "Ryan"
+    fill_in "#{address}_lastname", with: "Bigg"
+    fill_in "#{address}_address1", with: "143 Swan Street"
+    fill_in "#{address}_city", with: "Richmond"
+    select "United States of America", from: "#{address}_country_id"
+    fill_in "#{address}_zipcode", with: "12345"
+    fill_in "#{address}_phone", with: "(555) 555-5555"
+  end
+end

data/spec/features/free_shipping_promotions_spec.rb

@@ -52,8 +52,8 @@ describe "Free shipping promotions", type: :feature, js: true do
     # Regression test for https://github.com/spree/spree/issues/4428
     it "applies the free shipping promotion" do
       within("#checkout-summary") do
-        expect(page).to have_content("Shipping total:  $10.00")
-        expect(page).to have_content("Promotion (Free Shipping): -$10.00")
+        expect(page).to have_content("Shipping total: $10.00", normalize_ws: true)
+        expect(page).to have_content("Promotion (Free Shipping): -$10.00", normalize_ws: true)
       end
     end
   end

data/spec/features/products_spec.rb

@@ -93,7 +93,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
 
   context "using Russian Rubles as a currency" do
     before do
-      Spree::Config[:currency] = "RUB"
+      stub_spree_preferences(currency: "RUB")
     end
 
     let!(:product) do
@@ -199,8 +199,8 @@ describe "Visiting Products", type: :feature, inaccessible: true do
 
   it "should be able to hide products without price" do
     expect(page.all('ul.product-listing li').size).to eq(9)
-    Spree::Config.show_products_without_price = false
-    Spree::Config.currency = "CAN"
+    stub_spree_preferences(show_products_without_price: false)
+    stub_spree_preferences(currency: "CAN")
     visit spree.root_path
     expect(page.all('ul.product-listing li').size).to eq(0)
   end
@@ -224,7 +224,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
   end
 
   it "should be able to display products priced between 15 and 18 dollars across multiple pages" do
-    Spree::Config.products_per_page = 2
+    stub_spree_preferences(products_per_page: 2)
     within(:css, '#taxonomies') { click_link "Ruby on Rails" }
     check "Price_Range_$15.00_-_$18.00"
     within(:css, '#sidebar_products_search') { click_button "Search" }
@@ -263,8 +263,8 @@ describe "Visiting Products", type: :feature, inaccessible: true do
 
   it "shouldn't be able to put a product without a current price in the cart" do
     product = FactoryBot.create(:base_product, description: nil, name: 'Sample', price: '19.99')
-    Spree::Config.currency = "CAN"
-    Spree::Config.show_products_without_price = true
+    stub_spree_preferences(currency: "CAN")
+    stub_spree_preferences(show_products_without_price: true)
     visit spree.product_path(product)
     expect(page).to have_content "This product is not available in the selected currency."
     expect(page).not_to have_content "add-to-cart-button"
@@ -272,8 +272,8 @@ describe "Visiting Products", type: :feature, inaccessible: true do
 
   it "should be able to list products without a price" do
     product = FactoryBot.create(:base_product, description: nil, name: 'Sample', price: '19.99')
-    Spree::Config.currency = "CAN"
-    Spree::Config.show_products_without_price = true
+    stub_spree_preferences(currency: "CAN")
+    stub_spree_preferences(show_products_without_price: true)
     visit spree.products_path
     expect(page).to have_content(product.name)
   end

data/spec/features/promotion_code_invalidation_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.feature "Promotion Code Invalidation" do
+RSpec.feature "Promotion Code Invalidation", js: true do
   given!(:promotion) do
     FactoryBot.create(
       :promotion_with_item_adjustment,
@@ -28,7 +28,7 @@ RSpec.feature "Promotion Code Invalidation" do
 
   scenario "adding the promotion to a cart with two applicable items" do
     fill_in "Coupon code", with: "PROMO"
-    click_button "Update"
+    click_button "Apply Code"
 
     expect(page).to have_content("The coupon code was successfully applied to your order")
 

data/spec/features/quantity_promotions_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.feature "Quantity Promotions" do
+RSpec.feature "Quantity Promotions", js: true do
   given(:action) do
     Spree::Promotion::Actions::CreateQuantityAdjustments.create(
       calculator: calculator,
@@ -26,8 +26,8 @@ RSpec.feature "Quantity Promotions" do
 
   scenario "adding and removing items from the cart" do
     # Attempt to use the code with too few items.
-    fill_in "Coupon code", with: "PROMO"
-    click_button "Update"
+    fill_in "coupon_code", with: "PROMO"
+    click_button "Apply Code"
     expect(page).to have_content("This coupon code could not be applied to the cart at this time")
 
     # Add another item to our cart.
@@ -36,8 +36,8 @@ RSpec.feature "Quantity Promotions" do
     click_button "Add To Cart"
 
     # Using the code should now succeed.
-    fill_in "Coupon code", with: "PROMO"
-    click_button "Update"
+    fill_in "coupon_code", with: "PROMO"
+    click_button "Apply Code"
     expect(page).to have_content("The coupon code was successfully applied to your order")
     within("#cart_adjustments") do
       expect(page).to have_content("-$10.00")
@@ -70,8 +70,8 @@ RSpec.feature "Quantity Promotions" do
     click_button "Update"
 
     # Apply the promo code and see a $10 discount (for 2 of the 3 items)
-    fill_in "Coupon code", with: "PROMO"
-    click_button "Update"
+    fill_in "coupon_code", with: "PROMO"
+    click_button "Apply Code"
     expect(page).to have_content("The coupon code was successfully applied to your order")
     within("#cart_adjustments") do
       expect(page).to have_content("-$10.00")
@@ -104,8 +104,8 @@ RSpec.feature "Quantity Promotions" do
       click_button "Update"
 
       # Apply the promo code and see a $15 discount
-      fill_in "Coupon code", with: "PROMO"
-      click_button "Update"
+      fill_in "coupon_code", with: "PROMO"
+      click_button "Apply Code"
       expect(page).to have_content("The coupon code was successfully applied to your order")
       within("#cart_adjustments") do
         expect(page).to have_content("-$15.00")

data/spec/spec_helper.rb

@@ -26,6 +26,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 require 'database_cleaner'
 
+require 'spree/testing_support/partial_double_verification'
 require 'spree/testing_support/authorization_helpers'
 require 'spree/testing_support/capybara_ext'
 require 'spree/testing_support/factories'
@@ -74,7 +75,6 @@ RSpec.configure do |config|
 
   config.before(:each) do
     Rails.cache.clear
-    reset_spree_preferences
   end
 
   config.before(:each, type: :feature) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.9.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2019-07-16 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.6.5
+        version: 2.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.5
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.5
+        version: 2.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.5
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -195,6 +195,7 @@ files:
 - app/assets/stylesheets/spree/frontend/screen.css.scss
 - app/controllers/spree/checkout_controller.rb
 - app/controllers/spree/content_controller.rb
+- app/controllers/spree/coupon_codes_controller.rb
 - app/controllers/spree/home_controller.rb
 - app/controllers/spree/locale_controller.rb
 - app/controllers/spree/orders_controller.rb
@@ -208,6 +209,7 @@ files:
 - app/views/spree/address/_form_hidden.html.erb
 - app/views/spree/checkout/_address.html.erb
 - app/views/spree/checkout/_confirm.html.erb
+- app/views/spree/checkout/_coupon_code.html.erb
 - app/views/spree/checkout/_delivery.html.erb
 - app/views/spree/checkout/_payment.html.erb
 - app/views/spree/checkout/_summary.html.erb
@@ -217,6 +219,7 @@ files:
 - app/views/spree/checkout/payment/_check.html.erb
 - app/views/spree/checkout/payment/_gateway.html.erb
 - app/views/spree/content/cvv.html.erb
+- app/views/spree/coupon_codes/new.html.erb
 - app/views/spree/home/index.html.erb
 - app/views/spree/layouts/spree_application.html.erb
 - app/views/spree/orders/_adjustment_row.html.erb
@@ -285,10 +288,12 @@ files:
 - spec/features/caching/products_spec.rb
 - spec/features/caching/taxons_spec.rb
 - spec/features/cart_spec.rb
+- spec/features/checkout_confirm_insufficient_stock_spec.rb
 - spec/features/checkout_spec.rb
 - spec/features/checkout_unshippable_spec.rb
 - spec/features/coupon_code_spec.rb
 - spec/features/currency_spec.rb
+- spec/features/first_order_promotion_spec.rb
 - spec/features/free_shipping_promotions_spec.rb
 - spec/features/locale_spec.rb
 - spec/features/order_spec.rb
@@ -303,7 +308,6 @@ files:
 - spec/helpers/order_helper_spec.rb
 - spec/helpers/taxon_filters_helper_spec.rb
 - spec/spec_helper.rb
-- spec/support/features/fill_in_with_force.rb
 - spec/support/shared_contexts/checkout_setup.rb
 - spec/support/shared_contexts/custom_products.rb
 - spec/support/shared_contexts/locales.rb
@@ -328,7 +332,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements:
 - none
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Cart and storefront for the Solidus e-commerce project.

data/spec/support/features/fill_in_with_force.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module FillInWithForce
-  def fill_in_with_force(locator, with:)
-    field_id = find_field(locator)[:id]
-    page.execute_script "document.getElementById('#{field_id}').value = '#{with}';"
-  end
-end
-
-RSpec.configure do |config|
-  config.include FillInWithForce, type: :feature
-end