solidus_frontend 1.2.3 → 1.3.0.beta1

data/spec/features/caching/products_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe 'products', :type => :feature, :caching => true do
+describe 'products', type: :feature, caching: true do
   let!(:product) { create(:product) }
   let!(:product2) { create(:product) }
   let!(:taxonomy) { create(:taxonomy) }
-  let!(:taxon) { create(:taxon, :taxonomy => taxonomy) }
+  let!(:taxon) { create(:taxon, taxonomy: taxonomy) }
 
   before do
     product2.update_column(:updated_at, 1.day.ago)

data/spec/features/caching/taxons_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe 'taxons', :type => :feature, :caching => true do
+describe 'taxons', type: :feature, caching: true do
   let!(:taxonomy) { create(:taxonomy) }
-  let!(:taxon) { create(:taxon, :taxonomy => taxonomy) }
+  let!(:taxon) { create(:taxon, taxonomy: taxonomy) }
 
   before do
     # warm up the cache

data/spec/features/cart_spec.rb

@@ -1,13 +1,15 @@
 require 'spec_helper'
 
 describe "Cart", type: :feature, inaccessible: true do
+  before { create(:store) }
+
   it "shows cart icon on non-cart pages" do
     visit spree.root_path
-    expect(page).to have_selector("li#link-to-cart a", :visible => true)
+    expect(page).to have_selector("li#link-to-cart a", visible: true)
   end
 
-  it "prevents double clicking the remove button on cart", :js => true do
-    @product = create(:product, :name => "RoR Mug")
+  it "prevents double clicking the remove button on cart", js: true do
+    @product = create(:product, name: "RoR Mug")
 
     visit spree.root_path
     click_link "RoR Mug"
@@ -29,8 +31,8 @@ describe "Cart", type: :feature, inaccessible: true do
     end
   end
 
-  it 'allows you to remove an item from the cart', :js => true do
-    create(:product, :name => "RoR Mug")
+  it 'allows you to remove an item from the cart', js: true do
+    create(:product, name: "RoR Mug")
     visit spree.root_path
     click_link "RoR Mug"
     click_button "add-to-cart-button"
@@ -45,7 +47,7 @@ describe "Cart", type: :feature, inaccessible: true do
   end
 
   it 'allows you to empty the cart', js: true do
-    create(:product, :name => "RoR Mug")
+    create(:product, name: "RoR Mug")
     visit spree.root_path
     click_link "RoR Mug"
     click_button "add-to-cart-button"

data/spec/features/checkout_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe "Checkout", type: :feature, inaccessible: true do
-
   include_context 'checkout setup'
 
   context "visitor makes checkout as guest without registration" do
@@ -20,7 +19,7 @@ describe "Checkout", type: :feature, inaccessible: true do
         expect(find('input#order_use_billing')).to be_checked
       end
 
-      it "should remain checked when used and visitor steps back to address step", :js => true do
+      it "should remain checked when used and visitor steps back to address step", js: true do
         fill_in_address
         expect(find('input#order_use_billing')).to be_checked
       end
@@ -47,11 +46,11 @@ describe "Checkout", type: :feature, inaccessible: true do
         mug.save!
       end
 
-      it "does not break the per-item shipping method calculator", :js => true do
+      it "does not break the per-item shipping method calculator", js: true do
         add_mug_to_cart
         click_button "Checkout"
 
-        fill_in "order_email", :with => "test@example.com"
+        fill_in "order_email", with: "test@example.com"
         fill_in_address
 
         click_button "Save and Continue"
@@ -78,25 +77,25 @@ describe "Checkout", type: :feature, inaccessible: true do
 
   # Regression test for https://github.com/spree/spree/issues/2694 and https://github.com/spree/spree/issues/4117
   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)
+      allow(order).to receive_messages(available_payment_methods: [create(:credit_card_payment_method)])
 
       user = create(:user)
       order.user = user
       order.update!
 
-      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)
+      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)
     end
 
     it "redirects to payment page", inaccessible: true do
       visit spree.checkout_state_path(:delivery)
       click_button "Save and Continue"
       choose "Credit Card"
-      fill_in "Card Number", :with => '123'
-      fill_in "card_expiry", :with => '04 / 20'
-      fill_in "Card Code", :with => '123'
+      fill_in "Card Number", with: '123'
+      fill_in "card_expiry", with: '04 / 20'
+      fill_in "Card Code", with: '123'
       click_button "Save and Continue"
       click_button "Place Order"
       expect(page).to have_content("Bogus Gateway: Forced failure")
@@ -117,12 +116,12 @@ describe "Checkout", type: :feature, inaccessible: true do
     end
 
     before(:each) do
-      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)
-      allow_any_instance_of(Spree::CheckoutController).to receive_messages(:skip_state_validation? => true)
+      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)
+      allow_any_instance_of(Spree::CheckoutController).to receive_messages(skip_state_validation?: true)
     end
 
-    it "prevents double clicking the payment button on checkout", :js => true do
+    it "prevents double clicking the payment button on checkout", js: true do
       visit spree.checkout_state_path(:payment)
 
       # prevent form submit to verify button is disabled
@@ -133,7 +132,7 @@ describe "Checkout", type: :feature, inaccessible: true do
       expect(page).to have_selector('input.button[disabled]')
     end
 
-    it "prevents double clicking the confirm button on checkout", :js => true do
+    it "prevents double clicking the confirm button on checkout", js: true do
       order.payments << create(:payment)
       visit spree.checkout_state_path(:confirm)
 
@@ -147,8 +146,8 @@ describe "Checkout", type: :feature, inaccessible: true do
   end
 
   context "when several payment methods are available" do
-    let(:credit_cart_payment) {create(:credit_card_payment_method) }
-    let(:check_payment) {create(:check_payment_method) }
+    let(:credit_cart_payment) { create(:credit_card_payment_method) }
+    let(:check_payment) { create(:check_payment_method) }
 
     after do
       Capybara.ignore_hidden_elements = true
@@ -157,7 +156,7 @@ describe "Checkout", type: :feature, inaccessible: true do
     before do
       Capybara.ignore_hidden_elements = false
       order = OrderWalkthrough.up_to(:delivery)
-      allow(order).to receive_messages(:available_payment_methods => [check_payment,credit_cart_payment])
+      allow(order).to receive_messages(available_payment_methods: [check_payment, credit_cart_payment])
       order.user = create(:user)
       order.update!
 
@@ -167,13 +166,13 @@ describe "Checkout", type: :feature, inaccessible: true do
       visit spree.checkout_state_path(:payment)
     end
 
-    it "the first payment method should be selected", :js => true do
+    it "the first payment method should be selected", js: true do
       payment_method_css = "#order_payments_attributes__payment_method_id_"
       expect(find("#{payment_method_css}#{check_payment.id}")).to be_checked
       expect(find("#{payment_method_css}#{credit_cart_payment.id}")).not_to be_checked
     end
 
-    it "the fields for the other payment methods should be hidden", :js => true do
+    it "the fields for the other payment methods should be hidden", js: true do
       payment_method_css = "#payment_method_"
       expect(find("#{payment_method_css}#{check_payment.id}")).to be_visible
       expect(find("#{payment_method_css}#{credit_cart_payment.id}")).not_to be_visible
@@ -181,8 +180,7 @@ describe "Checkout", type: :feature, inaccessible: true do
   end
 
   context "user has payment sources", js: true do
-    before { Spree::PaymentMethod.all.each(&:really_destroy!) }
-    let!(:bogus) { create(:credit_card_payment_method) }
+    let(:bogus) { create(:credit_card_payment_method) }
     let(:user) { create(:user) }
 
     let!(:credit_card) do
@@ -191,6 +189,7 @@ describe "Checkout", type: :feature, inaccessible: true do
 
     before do
       order = OrderWalkthrough.up_to(:delivery)
+      allow(order).to receive_messages(available_payment_methods: [bogus])
 
       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)
@@ -200,23 +199,23 @@ describe "Checkout", type: :feature, inaccessible: true do
     end
 
     it "selects first source available and customer moves on" do
-      expect(find "#use_existing_card_yes").to be_checked
+      expect(find("#use_existing_card_yes")).to be_checked
 
       expect {
         click_on "Save and Continue"
       }.not_to change { Spree::CreditCard.count }
 
       click_on "Place Order"
-      expect(current_path).to eql(spree.order_path(Spree::Order.last))
+      expect(page).to have_current_path(spree.order_path(Spree::Order.last))
     end
 
     it "allows user to enter a new source" do
       choose "use_existing_card_no"
 
-      fill_in "Name on card", :with => 'Spree Commerce'
-      fill_in "Card Number", :with => '4111111111111111'
-      fill_in "card_expiry", :with => '04 / 20'
-      fill_in "Card Code", :with => '123'
+      fill_in "Name on card", with: 'Spree Commerce'
+      fill_in "Card Number", with: '4111111111111111'
+      fill_in "card_expiry", with: '04 / 20'
+      fill_in "Card Code", with: '123'
 
       expect {
         click_on "Save and Continue"
@@ -225,23 +224,23 @@ describe "Checkout", type: :feature, inaccessible: true do
       expect(Spree::CreditCard.last.address).to be_present
 
       click_on "Place Order"
-      expect(current_path).to eql(spree.order_path(Spree::Order.last))
+      expect(page).to have_current_path(spree.order_path(Spree::Order.last))
     end
   end
 
   # 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!(:bag) { create(:product, :name => "RoR Bag") }
+    let!(:bag) { create(:product, name: "RoR Bag") }
 
     it "transit nicely through checkout steps again" do
       add_mug_to_cart
       click_on "Checkout"
-      fill_in "order_email", :with => "test@example.com"
+      fill_in "order_email", with: "test@example.com"
       fill_in_address
       click_on "Save and Continue"
       click_on "Save and Continue"
-      expect(current_path).to eql(spree.checkout_state_path("payment"))
+      expect(page).to have_current_path(spree.checkout_state_path("payment"))
 
       visit spree.root_path
       click_link bag.name
@@ -249,13 +248,13 @@ describe "Checkout", type: :feature, inaccessible: true do
 
       click_on "Checkout"
       # edit an address field
-      fill_in "order_bill_address_attributes_firstname", :with => "Ryann"
+      fill_in "order_bill_address_attributes_firstname", with: "Ryann"
       click_on "Save and Continue"
       click_on "Save and Continue"
       click_on "Save and Continue"
       click_on "Place Order"
 
-      expect(current_path).to eql(spree.order_path(Spree::Order.last))
+      expect(page).to have_current_path(spree.order_path(Spree::Order.last))
     end
   end
 
@@ -263,11 +262,11 @@ describe "Checkout", type: :feature, inaccessible: true do
     before do
       add_mug_to_cart
       click_on "Checkout"
-      fill_in "order_email", :with => "test@example.com"
+      fill_in "order_email", with: "test@example.com"
       fill_in_address
       click_on "Save and Continue"
       click_on "Save and Continue"
-      expect(current_path).to eql(spree.checkout_state_path("payment"))
+      expect(page).to have_current_path(spree.checkout_state_path("payment"))
     end
 
     context "and updates line item quantity and try to reach payment page" do
@@ -282,7 +281,7 @@ describe "Checkout", type: :feature, inaccessible: true do
 
       it "redirects user back to address step" do
         visit spree.checkout_state_path("payment")
-        expect(current_path).to eql(spree.checkout_state_path("address"))
+        expect(page).to have_current_path(spree.checkout_state_path("address"))
       end
 
       it "updates shipments properly through step address -> delivery transitions" do
@@ -295,7 +294,7 @@ describe "Checkout", type: :feature, inaccessible: true do
     end
 
     context "and adds new product to cart and try to reach payment page" do
-      let!(:bag) { create(:product, :name => "RoR Bag") }
+      let!(:bag) { create(:product, name: "RoR Bag") }
 
       before do
         visit spree.root_path
@@ -305,7 +304,7 @@ describe "Checkout", type: :feature, inaccessible: true do
 
       it "redirects user back to address step" do
         visit spree.checkout_state_path("payment")
-        expect(current_path).to eql(spree.checkout_state_path("address"))
+        expect(page).to have_current_path(spree.checkout_state_path("address"))
       end
 
       it "updates shipments properly through step address -> delivery transitions" do
@@ -329,12 +328,12 @@ describe "Checkout", type: :feature, inaccessible: true do
       add_mug_to_cart
       click_on "Checkout"
 
-      fill_in "order_email", :with => "test@example.com"
+      fill_in "order_email", with: "test@example.com"
       fill_in_address
       click_on "Save and Continue"
 
       click_on "Save and Continue"
-      expect(current_path).to eql(spree.checkout_state_path("payment"))
+      expect(page).to have_current_path(spree.checkout_state_path("payment"))
     end
 
     it "makes sure payment reflects order total with discounts" do
@@ -358,7 +357,7 @@ describe "Checkout", type: :feature, inaccessible: true do
     context "doesn't fill in coupon code input" do
       it "advances just fine" do
         click_on "Save and Continue"
-        expect(current_path).to eql(spree.checkout_state_path("confirm"))
+        expect(page).to have_current_path(spree.checkout_state_path("confirm"))
       end
     end
   end
@@ -385,13 +384,13 @@ describe "Checkout", type: :feature, inaccessible: true do
     end
 
     it "goes right payment step and place order just fine" do
-      expect(current_path).to eq spree.checkout_state_path('payment')
+      expect(page).to have_current_path(spree.checkout_state_path('payment'))
 
       choose "Credit Card"
-      fill_in "Name on card", :with => 'Spree Commerce'
-      fill_in "Card Number", :with => '4111111111111111'
-      fill_in "card_expiry", :with => '04 / 20'
-      fill_in "Card Code", :with => '123'
+      fill_in "Name on card", with: 'Spree Commerce'
+      fill_in "Card Number", with: '4111111111111111'
+      fill_in "card_expiry", with: '04 / 20'
+      fill_in "Card Code", with: '123'
       click_button "Save and Continue"
 
       expect(current_path).to eq spree.checkout_state_path('confirm')
@@ -399,7 +398,6 @@ describe "Checkout", type: :feature, inaccessible: true do
     end
   end
 
-
   context "save my address" do
     before do
       stock_location.stock_items.update_all(count_on_hand: 1)
@@ -437,9 +435,9 @@ describe "Checkout", type: :feature, inaccessible: true do
     let!(:order) { OrderWalkthrough.up_to(:delivery) }
 
     before(:each) do
-      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)
-      allow_any_instance_of(Spree::OrdersController).to receive_messages(:try_spree_current_user => user)
+      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)
+      allow_any_instance_of(Spree::OrdersController).to receive_messages(try_spree_current_user: user)
 
       visit spree.checkout_state_path(:delivery)
       click_button "Save and Continue"

data/spec/features/checkout_unshippable_spec.rb

@@ -17,10 +17,10 @@ describe "checkout with unshippable items", type: :feature, inaccessible: true d
     order.user = user
     order.update!
 
-    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)
-    allow_any_instance_of(Spree::CheckoutController).to receive_messages(:skip_state_validation? => true)
-    allow_any_instance_of(Spree::CheckoutController).to receive_messages(:ensure_sufficient_stock_lines => true)
+    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)
+    allow_any_instance_of(Spree::CheckoutController).to receive_messages(skip_state_validation?: true)
+    allow_any_instance_of(Spree::CheckoutController).to receive_messages(ensure_sufficient_stock_lines: true)
   end
 
   it 'displays and removes' do
@@ -33,4 +33,3 @@ describe "checkout with unshippable items", type: :feature, inaccessible: true d
     expect(order.line_items.count).to eq 1
   end
 end
-

data/spec/features/coupon_code_spec.rb

@@ -1,12 +1,13 @@
 require 'spec_helper'
 
 describe "Coupon code 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) }
+  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) { create(:shipping_method) }
   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) }
 
   context "visitor makes checkout as guest without registration" do
     def create_basic_coupon_promotion(code)
@@ -15,7 +16,7 @@ describe "Coupon code promotions", type: :feature, js: true do
         name:       code.titleize,
         code:       code,
         starts_at:  1.day.ago,
-        expires_at: 1.day.from_now,
+        expires_at: 1.day.from_now
       )
 
       calculator = Spree::Calculator::FlatRate.new
@@ -34,20 +35,19 @@ describe "Coupon code promotions", type: :feature, js: true do
     # OrdersController
     context "on the payment page" 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"
@@ -56,23 +56,23 @@ describe "Coupon code promotions", type: :feature, js: true do
       end
 
       it "informs about an invalid coupon code" do
-        fill_in "order_coupon_code", :with => "coupon_codes_rule_man"
+        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))
       end
 
       it "can enter an invalid coupon code, then a real one" do
-        fill_in "order_coupon_code", :with => "coupon_codes_rule_man"
+        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))
-        fill_in "order_coupon_code", :with => "onetwo"
+        fill_in "order_coupon_code", with: "onetwo"
         click_button "Save and Continue"
         expect(page).to have_content("Promotion (Onetwo)   -$10.00")
       end
 
       context "with a promotion" do
         it "applies a promotion to an order" do
-          fill_in "order_coupon_code", :with => "onetwo"
+          fill_in "order_coupon_code", with: "onetwo"
           click_button "Save and Continue"
           expect(page).to have_content("Promotion (Onetwo)   -$10.00")
         end
@@ -81,7 +81,6 @@ describe "Coupon code promotions", type: :feature, js: true do
 
     # CheckoutController
     context "on the cart page" do
-
       before do
         visit spree.root_path
         click_link "RoR Mug"
@@ -89,13 +88,13 @@ describe "Coupon code promotions", type: :feature, js: true do
       end
 
       it "can enter a coupon code and receives success notification" do
-        fill_in "order_coupon_code", :with => "onetwo"
+        fill_in "order_coupon_code", with: "onetwo"
         click_button "Update"
         expect(page).to have_content(Spree.t(: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"
+        fill_in "order_coupon_code", with: "ONETwO"
         click_button "Update"
         expect(page).to have_content(Spree.t(:coupon_code_applied))
       end
@@ -103,7 +102,7 @@ describe "Coupon code promotions", type: :feature, js: true do
       it "informs the user about a coupon code which has exceeded its usage" do
         expect_any_instance_of(Spree::Promotion).to receive(:usage_limit_exceeded?).and_return(true)
 
-        fill_in "order_coupon_code", :with => "onetwo"
+        fill_in "order_coupon_code", with: "onetwo"
         click_button "Update"
         expect(page).to have_content(Spree.t(:coupon_code_max_usage))
       end
@@ -119,7 +118,7 @@ describe "Coupon code promotions", type: :feature, js: true do
         specify do
           visit spree.cart_path
 
-          fill_in "order_coupon_code", :with => "onetwo"
+          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"))
         end
@@ -127,9 +126,9 @@ describe "Coupon code promotions", type: :feature, js: true do
 
       it "informs the user if the coupon is expired" do
         promotion.expires_at = Date.today.beginning_of_week
-        promotion.starts_at = Date.today.beginning_of_week.advance(:day => 3)
+        promotion.starts_at = Date.today.beginning_of_week.advance(day: 3)
         promotion.save!
-        fill_in "order_coupon_code", :with => "onetwo"
+        fill_in "order_coupon_code", with: "onetwo"
         click_button "Update"
         expect(page).to have_content(Spree.t(:coupon_code_expired))
       end
@@ -141,7 +140,7 @@ describe "Coupon code promotions", type: :feature, js: true do
           promotion.actions.first.calculator = calculator
           promotion.save
 
-          create(:product, :name => "Spree Mug", :price => 10)
+          create(:product, name: "Spree Mug", price: 10)
         end
 
         specify do
@@ -150,14 +149,13 @@ describe "Coupon code promotions", type: :feature, js: true do
           click_button "add-to-cart-button"
 
           visit spree.cart_path
-          fill_in "order_coupon_code", :with => "onetwo"
+          fill_in "order_coupon_code", with: "onetwo"
           click_button "Update"
 
-          fill_in "order_line_items_attributes_0_quantity", :with => 2
-          fill_in "order_line_items_attributes_1_quantity", :with => 2
+          fill_in "order_line_items_attributes_0_quantity", with: 2
+          fill_in "order_line_items_attributes_1_quantity", with: 2
           click_button "Update"
 
-
           within '#cart_adjustments' do
             # 20% of $40 = 8
             # 20% of $20 = 4