solidus_frontend 2.4.2 → 2.5.0.beta1

data/app/views/spree/shared/_products.html.erb

@@ -12,11 +12,11 @@
 <div data-hook="products_search_results_heading">
   <% if products.empty? %>
     <div data-hook="products_search_results_heading_no_results_found">
-      <%= Spree.t(:no_products_found) %>
+      <%= t('spree.no_products_found') %>
     </div>
   <% elsif params.key?(:keywords) %>
     <div data-hook="products_search_results_heading_results_found">
-      <h6 class="search-results-title"><%= Spree.t(:search_results, keywords: h(params[:keywords])) %></h6>
+      <h6 class="search-results-title"><%= t('spree.search_results', keywords: h(params[:keywords])) %></h6>
     </div>
   <% end %>
 </div>
@@ -28,7 +28,7 @@
       <li id="product_<%= product.id %>" class="columns three <%= cycle("alpha", "secondary", "", "omega secondary", name: "classes") %>" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
         <% cache(@taxon.present? ? [I18n.locale, current_pricing_options, @taxon, product] : [I18n.locale, current_pricing_options, product]) do %>
           <div class="product-image">
-            <%= link_to image_tag(product.display_image.attachment(:small), itemprop: "image"), url, itemprop: 'url' %>
+            <%= link_to(render('spree/shared/image', image: product.display_image, size: :small, itemprop: "image"), url, itemprop: 'url') %>
           </div>
           <%= link_to truncate(product.name, length: 50), url, class: 'info', itemprop: "name", title: product.name %>
           <span itemprop="offers" itemscope itemtype="http://schema.org/Offer">

data/app/views/spree/shared/_search.html.erb

@@ -2,10 +2,10 @@
 <%= form_tag spree.products_path, method: :get do %>
   <% cache [I18n.locale, @taxons] do %>
     <%= select_tag :taxon,
-          options_for_select([[Spree.t(:all_departments), '']] +
+          options_for_select([[t('spree.all_departments'), '']] +
                                 @taxons.map {|t| [t.name, t.id]},
                                 @taxon ? @taxon.id : params[:taxon]), 'aria-label' => 'Taxon' %>
   <% end %>
-  <%= search_field_tag :keywords, params[:keywords], placeholder: Spree.t(:search) %>
-  <%= submit_tag Spree.t(:search), name: nil %>
+  <%= search_field_tag :keywords, params[:keywords], placeholder: t('spree.search') %>
+  <%= submit_tag t('spree.search'), name: nil %>
 <% end %>

data/app/views/spree/shared/_shipment_tracking.html.erb

@@ -1,6 +1,6 @@
 <% shipments = order.shipments.trackable %>
 <% if shipments.any? %>
-  <h6><%= Spree.t(:tracking) %></h6>
+  <h6><%= t('spree.tracking') %></h6>
   <div class="tracking">
     <% shipments.each do |shipment| %>
       <%= link_to_tracking(shipment) %>

data/app/views/spree/shared/_taxonomies.html.erb

@@ -1,8 +1,8 @@
 <% max_level = Spree::Config[:max_level_in_taxons_menu] || 1 %>
 <nav id="taxonomies" class="sidebar-item" data-hook>
   <% @taxonomies.each do |taxonomy| %>
-    <% cache [I18n.locale, taxonomy, max_level] do %>
-      <h6 class='taxonomy-root'><%= Spree.t(:shop_by_taxonomy, taxonomy: taxonomy.name) %></h6>
+    <% cache [I18n.locale, taxonomy, @taxon, max_level] do %>
+      <h6 class='taxonomy-root'><%= t('spree.shop_by_taxonomy', taxonomy: taxonomy.name) %></h6>
       <%= taxons_tree(taxonomy.root, @taxon, max_level) %>
     <% end %>
   <% end %>

data/lib/generators/solidus/views/override_generator.rb

@@ -1,4 +1,5 @@
 require 'rails'
+require 'rails/generators'
 
 module Solidus
   module Views

data/lib/spree/frontend.rb

@@ -1,11 +1,13 @@
 require 'rails/all'
 require 'jquery-rails'
 require 'canonical-rails'
-require 'coffee-rails'
 require 'sass-rails'
 require 'font-awesome-rails'
+require 'responders'
+require 'kaminari'
 
-require 'spree/core'
+require 'solidus_core'
+require 'solidus_api'
 
 require 'spree/frontend/middleware/seo_assist'
 require 'spree/frontend/engine'

data/solidus_frontend.gemspec

@@ -26,10 +26,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'canonical-rails', '~> 0.2.0'
   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_dependency 'truncate_html', '~> 0.9', '>= 0.9.2'
-  s.add_dependency 'kaminari', '>= 0.17', '< 2.0'
+  s.add_dependency 'kaminari', '~> 1.1'
 
   s.add_development_dependency 'capybara-accessible'
 end

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -3,10 +3,10 @@ require 'spec_helper'
 describe Spree::CheckoutController, type: :controller do
   let(:token) { 'some_token' }
   let(:user) { create(:user) }
-  let(:order) { FactoryGirl.create(:order_with_totals) }
+  let(:order) { FactoryBot.create(:order_with_totals) }
 
   let(:address_params) do
-    address = FactoryGirl.build(:address)
+    address = FactoryBot.build(:address)
     address.attributes.except("created_at", "updated_at")
   end
 
@@ -85,7 +85,7 @@ describe Spree::CheckoutController, type: :controller do
       before do
         # Must have *a* shipping method and a payment method so updating from address works
         allow(order).to receive_messages ensure_available_shipping_rates: true
-        order.line_items << FactoryGirl.create(:line_item)
+        order.line_items << FactoryBot.create(:line_item)
       end
 
       context "with the order in the cart state" do
@@ -291,7 +291,7 @@ describe Spree::CheckoutController, type: :controller do
 
         it "should populate the flash message" do
           post :update, params: { state: "confirm" }
-          expect(flash.notice).to eq(Spree.t(:order_processed_successfully))
+          expect(flash.notice).to eq(I18n.t('spree.order_processed_successfully'))
         end
 
         it "should remove completed order from current_order" do
@@ -346,14 +346,14 @@ describe Spree::CheckoutController, type: :controller do
 
       it "should render the edit template and display exception message" do
         expect(response).to render_template :edit
-        expect(flash.now[:error]).to eq(Spree.t(:spree_gateway_error_flash_for_checkout))
+        expect(flash.now[:error]).to eq(I18n.t('spree.spree_gateway_error_flash_for_checkout'))
         expect(assigns(:order).errors[:base]).to include("Invalid something or other.")
       end
     end
 
     context "fails to transition from address" do
       let(:order) do
-        FactoryGirl.create(:order_with_line_items).tap do |order|
+        FactoryBot.create(:order_with_line_items).tap do |order|
           order.next!
           expect(order.state).to eq('address')
         end
@@ -387,7 +387,7 @@ describe Spree::CheckoutController, type: :controller do
 
         it "due to no available shipping rates for any of the shipments" do
           put :update, params: { state: "address", order: {} }
-          expect(flash[:error]).to eq(Spree.t(:items_cannot_be_shipped))
+          expect(flash[:error]).to eq(I18n.t('spree.items_cannot_be_shipped'))
           expect(response).to redirect_to(spree.checkout_state_path('address'))
         end
       end
@@ -395,13 +395,13 @@ describe Spree::CheckoutController, type: :controller do
 
     context "when GatewayError is raised" do
       let(:order) do
-        FactoryGirl.create(:order_with_line_items).tap do |order|
+        FactoryBot.create(:order_with_line_items).tap do |order|
           until order.state == 'payment'
             order.next!
           end
           # So that the confirmation step is skipped and we get straight to the action.
-          payment_method = FactoryGirl.create(:simple_credit_card_payment_method)
-          payment = FactoryGirl.create(:payment, payment_method: payment_method, amount: order.total)
+          payment_method = FactoryBot.create(:simple_credit_card_payment_method)
+          payment = FactoryBot.create(:payment, payment_method: payment_method, amount: order.total)
           order.payments << payment
           order.next!
         end
@@ -413,9 +413,9 @@ describe Spree::CheckoutController, type: :controller do
       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)))
+        allow_any_instance_of(Spree::Payment).to receive(:process!).and_raise(Spree::Core::GatewayError.new(I18n.t('spree.payment_processing_failed')))
         put :update, params: { state: order.state, order: {} }
-        expect(flash[:error]).to eq(Spree.t(:payment_processing_failed))
+        expect(flash[:error]).to eq(I18n.t('spree.payment_processing_failed'))
       end
     end
   end

data/spec/controllers/spree/current_order_tracking_spec.rb

@@ -10,7 +10,7 @@ describe 'current order tracking', type: :controller do
     end
   end
 
-  let(:order) { FactoryGirl.create(:order) }
+  let(:order) { FactoryBot.create(:order) }
 
   it 'automatically tracks who the order was created by & IP address' do
     allow(controller).to receive_messages(try_spree_current_user: user)

data/spec/controllers/spree/orders_controller_ability_spec.rb

@@ -8,6 +8,7 @@ module Spree
     let(:user) { create(:user) }
     let(:guest_user) { create(:user) }
     let(:order) { Spree::Order.create }
+    let(:variant) { create(:variant) }
 
     it 'should understand order routes with token' do
       expect(spree.token_order_path('R123456', 'ABCDEF')).to eq('/orders/R123456/token/ABCDEF')
@@ -25,11 +26,11 @@ module Spree
       context '#populate' do
         it 'should check if user is authorized for :edit' do
           expect(controller).to receive(:authorize!).with(:edit, order, token)
-          post :populate, params: { token: token }
+          post :populate, params: { variant_id: variant.id, token: token }
         end
         it "should check against the specified order" do
           expect(controller).to receive(:authorize!).with(:edit, specified_order, token)
-          post :populate, params: { id: specified_order.number, token: token }
+          post :populate, params: { id: specified_order.number, variant_id: variant.id, token: token }
         end
       end
 
@@ -95,8 +96,9 @@ module Spree
 
         context 'when no token present' do
           it 'should respond with 404' do
-            get :show, params: { id: 'R123' }
-            expect(response.code).to eq('404')
+            expect {
+              get :show, params: { id: 'R123' }
+            }.to raise_error(ActiveRecord::RecordNotFound)
           end
         end
       end

data/spec/controllers/spree/orders_controller_spec.rb

@@ -16,7 +16,8 @@ describe Spree::OrdersController, type: :controller do
 
     context "#populate" do
       it "should create a new order when none specified" do
-        post :populate
+        post :populate, params: { variant_id: variant.id }
+        expect(response).to be_redirect
         expect(cookies.signed[:guest_token]).not_to be_blank
 
         order_by_token = Spree::Order.find_by(guest_token: cookies.signed[:guest_token])
@@ -65,7 +66,7 @@ describe Spree::OrdersController, type: :controller do
 
           expect(response).to redirect_to(spree.root_path)
           expect(flash[:error]).to eq(
-            Spree.t(:please_enter_reasonable_quantity)
+            I18n.t('spree.please_enter_reasonable_quantity')
           )
         end
 
@@ -150,7 +151,7 @@ describe Spree::OrdersController, type: :controller do
 
       it "cannot update a blank order" do
         put :update, params: { order: { email: "foo" } }
-        expect(flash[:error]).to eq(Spree.t(:order_not_found))
+        expect(flash[:error]).to eq(I18n.t('spree.order_not_found'))
         expect(response).to redirect_to(spree.root_path)
       end
     end

data/spec/controllers/spree/orders_controller_transitions_spec.rb

@@ -22,7 +22,7 @@ module Spree
 
       it "correctly calls the transition callback" do
         expect(order.did_transition).to be_nil
-        order.line_items << FactoryGirl.create(:line_item)
+        order.line_items << FactoryBot.create(:line_item)
         put :update, params: { checkout: "checkout" }
         expect(order.did_transition).to be true
       end

data/spec/controllers/spree/products_controller_spec.rb

@@ -11,8 +11,9 @@ describe Spree::ProductsController, type: :controller do
   end
 
   it "cannot view non-active products" do
-    get :show, params: { id: product.to_param }
-    expect(response.status).to eq(404)
+    expect {
+      get :show, params: { id: product.to_param }
+    }.to raise_error(ActiveRecord::RecordNotFound)
   end
 
   it "should provide the current user to the searcher class" do

data/spec/features/caching/products_spec.rb

@@ -30,23 +30,23 @@ describe 'products', type: :feature, caching: true do
     expect(cache_writes.count).to eq(2)
   end
 
-  it "busts the cache when all products are deleted" do
-    product.destroy
-    product2.destroy
+  it "busts the cache when all products are soft-deleted" 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 deleted" do
-    product.destroy
+  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 deleted" do
-    product2.destroy
+  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)

data/spec/features/cart_spec.rb

@@ -27,7 +27,7 @@ describe "Cart", type: :feature, inaccessible: true do
   it "does not error out with a 404 when GET'ing to /orders/populate" do
     visit '/orders/populate'
     within(".error") do
-      expect(page).to have_content(Spree.t(:populate_get_error))
+      expect(page).to have_content(I18n.t('spree.populate_get_error'))
     end
   end
 

data/spec/features/checkout_spec.rb

@@ -88,7 +88,7 @@ describe "Checkout", type: :feature, inaccessible: true do
       let!(:order) do
         order = Spree::Order.create!(
           email: "spree@example.com",
-          store: Spree::Store.first || FactoryGirl.create(:store)
+          store: Spree::Store.first || FactoryBot.create(:store)
         )
 
         order.reload
@@ -348,7 +348,7 @@ describe "Checkout", type: :feature, inaccessible: true do
       choose "use_existing_card_no"
 
       fill_in "Name on card", with: 'Spree Commerce'
-      fill_in "Card Number", with: '4111111111111111'
+      fill_in "Card Number", with: '4111 1111 1111 1111'
       fill_in "card_expiry", with: '04 / 20'
       fill_in "Card Code", with: '123'
 
@@ -365,7 +365,7 @@ describe "Checkout", type: :feature, inaccessible: true do
 
   # regression for https://github.com/spree/spree/issues/2921
   context "goes back from payment to add another item", js: true do
-    let!(:store) { FactoryGirl.create(:store) }
+    let!(:store) { FactoryBot.create(:store) }
     let!(:bag) { create(:product, name: "RoR Bag") }
 
     it "transit nicely through checkout steps again" do
@@ -484,7 +484,7 @@ describe "Checkout", type: :feature, inaccessible: true do
         fill_in "Coupon Code", with: 'invalid'
         click_on "Apply Code"
 
-        expect(page).to have_content(Spree.t(:coupon_code_not_found))
+        expect(page).to have_content(I18n.t('spree.coupon_code_not_found'))
       end
     end
 
@@ -522,7 +522,7 @@ describe "Checkout", type: :feature, inaccessible: true do
 
       choose "Credit Card"
       fill_in "Name on card", with: 'Spree Commerce'
-      fill_in "Card Number", with: '4111111111111111'
+      fill_in "Card Number", with: '4111 1111 1111 1111'
       fill_in "card_expiry", with: '04 / 20'
       fill_in "Card Code", with: '123'
       click_button "Save and Continue"
@@ -580,12 +580,12 @@ describe "Checkout", type: :feature, inaccessible: true do
     end
 
     it "displays a thank you message" do
-      expect(page).to have_content(Spree.t(:thank_you_for_your_order))
+      expect(page).to have_content(I18n.t('spree.thank_you_for_your_order'))
     end
 
     it "does not display a thank you message on that order future visits" do
       visit spree.order_path(order)
-      expect(page).to_not have_content(Spree.t(:thank_you_for_your_order))
+      expect(page).to_not have_content(I18n.t('spree.thank_you_for_your_order'))
     end
   end
 
@@ -607,6 +607,7 @@ describe "Checkout", type: :feature, inaccessible: true do
         state_name_css = "order_bill_address_attributes_state_name"
 
         select "Canada", from: "order_bill_address_attributes_country_id"
+        fill_in 'Customer E-Mail', with: 'test@example.com'
         fill_in state_name_css, with: xss_string
         fill_in "Zip", with: "H0H0H0"
 
@@ -654,7 +655,7 @@ describe "Checkout", type: :feature, inaccessible: true do
       click_on "Save and Continue"
       click_on "Save and Continue"
 
-      fill_in_credit_card(number: "4111111111111111")
+      fill_in_credit_card(number: "4111 1111 1111 1111")
       click_on "Save and Continue"
 
       expect(page).to have_current_path("/checkout/confirm")
@@ -663,7 +664,7 @@ describe "Checkout", type: :feature, inaccessible: true do
 
   def fill_in_credit_card(number:)
     fill_in "Card Number", with: number
-    fill_in "Expiration", with: "1224"
+    fill_in "Expiration", with: "12 / 24"
     fill_in "Card Code", with: "123"
   end
 

data/spec/features/coupon_code_spec.rb

@@ -58,13 +58,13 @@ describe "Coupon code promotions", type: :feature, js: true do
       it "informs about an invalid coupon code" do
         fill_in "order_coupon_code", with: "coupon_codes_rule_man"
         click_button "Save and Continue"
-        expect(page).to have_content(Spree.t(:coupon_code_not_found))
+        expect(page).to have_content(I18n.t('spree.coupon_code_not_found'))
       end
 
       it "can enter an invalid coupon code, then a real one" do
         fill_in "order_coupon_code", with: "coupon_codes_rule_man"
         click_button "Save and Continue"
-        expect(page).to have_content(Spree.t(:coupon_code_not_found))
+        expect(page).to have_content(I18n.t('spree.coupon_code_not_found'))
         fill_in "order_coupon_code", with: "onetwo"
         click_button "Save and Continue"
         expect(page).to have_content("Promotion (Onetwo)   -$10.00")
@@ -90,13 +90,13 @@ describe "Coupon code promotions", type: :feature, js: true do
       it "can enter a coupon code and receives success notification" do
         fill_in "order_coupon_code", with: "onetwo"
         click_button "Update"
-        expect(page).to have_content(Spree.t(:coupon_code_applied))
+        expect(page).to have_content(I18n.t('spree.coupon_code_applied'))
       end
 
       it "can enter a promotion code with both upper and lower case letters" do
         fill_in "order_coupon_code", with: "ONETwO"
         click_button "Update"
-        expect(page).to have_content(Spree.t(:coupon_code_applied))
+        expect(page).to have_content(I18n.t('spree.coupon_code_applied'))
       end
 
       it "informs the user about a coupon code which has exceeded its usage" do
@@ -104,7 +104,7 @@ describe "Coupon code promotions", type: :feature, js: true do
 
         fill_in "order_coupon_code", with: "onetwo"
         click_button "Update"
-        expect(page).to have_content(Spree.t(:coupon_code_max_usage))
+        expect(page).to have_content(I18n.t('spree.coupon_code_max_usage'))
       end
 
       context "informs the user if the coupon code is not eligible" do
@@ -120,7 +120,7 @@ describe "Coupon code promotions", type: :feature, js: true do
 
           fill_in "order_coupon_code", with: "onetwo"
           click_button "Update"
-          expect(page).to have_content(Spree.t(:item_total_less_than_or_equal, scope: [:eligibility_errors, :messages], amount: "$100.00"))
+          expect(page).to have_content(I18n.t(:item_total_less_than_or_equal, scope: [:spree, :eligibility_errors, :messages], amount: "$100.00"))
         end
       end
 
@@ -130,7 +130,7 @@ describe "Coupon code promotions", type: :feature, js: true do
         promotion.save!
         fill_in "order_coupon_code", with: "onetwo"
         click_button "Update"
-        expect(page).to have_content(Spree.t(:coupon_code_expired))
+        expect(page).to have_content(I18n.t('spree.coupon_code_expired'))
       end
 
       context "calculates the correct amount of money saved with flat percent promotions" do
@@ -174,13 +174,12 @@ describe "Coupon code promotions", type: :feature, js: true do
           calculator = Spree::Calculator::FlatPercentItemTotal.new
           calculator.preferred_flat_percent = 100
 
-          action = Spree::Promotion::Actions::CreateAdjustment.new
-          action.calculator = calculator
-          action.promotion = promotion
-          action.save
+          promotion.promotion_actions.first.discard
 
-          promotion.promotion_actions = [action]
-          promotion.save
+          Spree::Promotion::Actions::CreateAdjustment.create!(
+            calculator: calculator,
+            promotion: promotion
+          )
 
           create(:product, name: "Spree Mug", price: 10)
         end