solidus_backend 1.2.3 → 1.3.0.beta1

data/spec/features/admin/configuration/shipping_methods_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe "Shipping Methods", :type => :feature do
+describe "Shipping Methods", type: :feature do
   stub_authorization!
   let!(:zone) { create(:global_zone) }
-  let!(:shipping_method) { create(:shipping_method, :zones => [zone]) }
+  let!(:shipping_method) { create(:shipping_method, zones: [zone]) }
 
   after do
     Capybara.ignore_hidden_elements = true
@@ -12,12 +12,12 @@ describe "Shipping Methods", :type => :feature do
   before do
     Capybara.ignore_hidden_elements = false
     # HACK: To work around no email prompting on check out
-    allow_any_instance_of(Spree::Order).to receive_messages(:require_email => false)
+    allow_any_instance_of(Spree::Order).to receive_messages(require_email: false)
     create(:check_payment_method)
 
     visit spree.admin_path
     click_link "Settings"
-    click_link "Shipping Methods"
+    click_link "Shipping"
   end
 
   context "show" do
@@ -35,7 +35,7 @@ describe "Shipping Methods", :type => :feature do
     it "should be able to create a new shipping method" do
       click_link "New Shipping Method"
 
-      fill_in "shipping_method_name", :with => "bullock cart"
+      fill_in "shipping_method_name", with: "bullock cart"
 
       within("#shipping_method_categories_field") do
         check first("input[type='checkbox']")["name"]
@@ -48,13 +48,13 @@ describe "Shipping Methods", :type => :feature do
 
   # Regression test for https://github.com/spree/spree/issues/1331
   context "update" do
-    it "can change the calculator", :js => true do
+    it "can change the calculator", js: true do
       within("#listing_shipping_methods") do
         click_icon :edit
       end
 
       expect(find(:css, ".calculator-settings-warning")).not_to be_visible
-      select2_search('Flexible Rate', :from => 'Calculator')
+      select2_search('Flexible Rate', from: 'Calculator')
       expect(find(:css, ".calculator-settings-warning")).to be_visible
 
       click_button "Update"

data/spec/features/admin/configuration/states_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe "States", :type => :feature do
+describe "States", type: :feature do
   stub_authorization!
 
   let!(:country) { create(:country) }
 
   let!(:hungary) do
-    Spree::Country.create!(:name => "Hungary", :iso_name => "Hungary")
+    Spree::Country.create!(name: "Hungary", iso_name: "Hungary")
   end
 
   def go_to_states_page
@@ -15,7 +15,7 @@ describe "States", :type => :feature do
   end
 
   context "admin visiting states listing" do
-    let!(:state) { create(:state, :country => country) }
+    let!(:state) { create(:state, country: country) }
 
     it "should correctly display the states" do
       visit spree.admin_country_states_path(country)
@@ -24,39 +24,39 @@ describe "States", :type => :feature do
   end
 
   context "creating and editing states" do
-    it "should allow an admin to edit existing states", :js => true do
+    it "should allow an admin to edit existing states", js: true do
       go_to_states_page
       select2 country.name, from: 'Country'
 
       click_link "new_state_link"
-      fill_in "state_name", :with => "Calgary"
-      fill_in "Abbreviation", :with => "CL"
+      fill_in "state_name", with: "Calgary"
+      fill_in "Abbreviation", with: "CL"
       click_button "Create"
       expect(page).to have_content("successfully created!")
       expect(page).to have_content("Calgary")
     end
 
-    it "should allow an admin to create states for non default countries", :js => true do
+    it "should allow an admin to create states for non default countries", js: true do
       go_to_states_page
       select2 hungary.name, from: 'Country'
 
       click_link "new_state_link"
-      fill_in "state_name", :with => "Pest megye"
-      fill_in "Abbreviation", :with => "PE"
+      fill_in "state_name", with: "Pest megye"
+      fill_in "Abbreviation", with: "PE"
       click_button "Create"
       expect(page).to have_content("successfully created!")
       expect(page).to have_content("Pest megye")
       expect(find("#s2id_country")).to have_content("Hungary")
     end
 
-    it "should show validation errors", :js => true do
+    it "should show validation errors", js: true do
       go_to_states_page
       select2 country.name, from: 'Country'
 
       click_link "new_state_link"
 
-      fill_in "state_name", :with => ""
-      fill_in "Abbreviation", :with => ""
+      fill_in "state_name", with: ""
+      fill_in "Abbreviation", with: ""
       click_button "Create"
       expect(page).to have_content("Name can't be blank")
     end

data/spec/features/admin/configuration/stock_locations_spec.rb

@@ -1,12 +1,13 @@
 require 'spec_helper'
 
-describe "Stock Locations", :type => :feature do
+describe "Stock Locations", type: :feature do
   stub_authorization!
 
   before(:each) do
-    country = create(:country)
+    create(:country)
     visit spree.admin_path
     click_link "Settings"
+    click_link "Shipping"
     click_link "Stock Locations"
   end
 
@@ -21,7 +22,7 @@ describe "Stock Locations", :type => :feature do
   end
 
   it "can delete an existing stock location", js: true do
-    location = create(:stock_location)
+    create(:stock_location)
     visit current_path
 
     expect(find('#listing_stock_locations')).to have_content("NY Warehouse")
@@ -30,7 +31,7 @@ describe "Stock Locations", :type => :feature do
     end
     # Wait for API request to complete.
     wait_for_ajax
-    visit current_path 
+    visit current_path
     expect(page).to have_content("NO STOCK LOCATIONS FOUND")
   end
 

data/spec/features/admin/configuration/tax_categories_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
-describe "Tax Categories", :type => :feature do
+describe "Tax Categories", type: :feature do
   stub_authorization!
 
   before(:each) do
     visit spree.admin_path
-    click_link "Settings"
+    click_link "Taxes"
   end
 
   context "admin visiting tax categories list" do
     it "should display the existing tax categories" do
-      create(:tax_category, :name => "Clothing", :tax_code => "CL001", :description => "For Clothing")
+      create(:tax_category, name: "Clothing", tax_code: "CL001", description: "For Clothing")
       click_link "Tax Categories"
       expect(page).to have_content("Listing Tax Categories")
       within_row(1) do
@@ -30,8 +30,8 @@ describe "Tax Categories", :type => :feature do
 
     it "should be able to create new tax category" do
       expect(page).to have_content("New Tax Category")
-      fill_in "tax_category_name", :with => "sports goods"
-      fill_in "tax_category_description", :with => "sports goods desc"
+      fill_in "tax_category_name", with: "sports goods"
+      fill_in "tax_category_description", with: "sports goods desc"
       click_button "Create"
       expect(page).to have_content("successfully created!")
     end
@@ -47,7 +47,7 @@ describe "Tax Categories", :type => :feature do
       create(:tax_category)
       click_link "Tax Categories"
       within_row(1) { click_icon :edit }
-      fill_in "tax_category_description", :with => "desc 99"
+      fill_in "tax_category_description", with: "desc 99"
       click_button "Update"
       expect(page).to have_content("successfully updated!")
       expect(page).to have_content("desc 99")

data/spec/features/admin/configuration/tax_rates_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe "Tax Rates", :type => :feature do
+describe "Tax Rates", type: :feature do
   stub_authorization!
 
-  let!(:tax_rate) { create(:tax_rate, :calculator => stub_model(Spree::Calculator)) }
+  let!(:tax_rate) { create(:tax_rate, calculator: stub_model(Spree::Calculator)) }
 
   before do
     visit spree.admin_path
-    click_link "Settings"
+    click_link "Taxes"
   end
 
   # Regression test for https://github.com/spree/spree/issues/535
@@ -22,7 +22,7 @@ describe "Tax Rates", :type => :feature do
   it "can create a new tax rate" do
     click_link "Tax Rates"
     click_link "New Tax Rate"
-    fill_in "Rate", :with => "0.05"
+    fill_in "Rate", with: "0.05"
     click_button "Create"
     expect(page).to have_content("Tax Rate has been successfully created!")
   end

data/spec/features/admin/configuration/taxonomies_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Taxonomies", :type => :feature do
+describe "Taxonomies", type: :feature do
   stub_authorization!
 
   before(:each) do
@@ -10,8 +10,8 @@ describe "Taxonomies", :type => :feature do
 
   context "show" do
     it "should display existing taxonomies" do
-      create(:taxonomy, :name => 'Brand')
-      create(:taxonomy, :name => 'Categories')
+      create(:taxonomy, name: 'Brand')
+      create(:taxonomy, name: 'Categories')
       click_nav "Products", "Taxonomies"
       within_row(1) { expect(page).to have_content("Brand") }
       within_row(2) { expect(page).to have_content("Categories") }
@@ -26,13 +26,13 @@ describe "Taxonomies", :type => :feature do
 
     it "should allow an admin to create a new taxonomy" do
       expect(page).to have_content("New Taxonomy")
-      fill_in "taxonomy_name", :with => "sports"
+      fill_in "taxonomy_name", with: "sports"
       click_button "Create"
       expect(page).to have_content("successfully created!")
     end
 
     it "should display validation errors" do
-      fill_in "taxonomy_name", :with => ""
+      fill_in "taxonomy_name", with: ""
       click_button "Create"
       expect(page).to have_content("can't be blank")
     end
@@ -43,7 +43,7 @@ describe "Taxonomies", :type => :feature do
       create(:taxonomy)
       click_nav "Products", "Taxonomies"
       within_row(1) { click_icon :edit }
-      fill_in "taxonomy_name", :with => "sports 99"
+      fill_in "taxonomy_name", with: "sports 99"
       click_button "Update"
       expect(page).to have_content("successfully updated!")
       expect(page).to have_content("sports 99")

data/spec/features/admin/configuration/zones_spec.rb

@@ -1,18 +1,18 @@
 require 'spec_helper'
 
-describe "Zones", :type => :feature do
+describe "Zones", type: :feature do
   stub_authorization!
 
   before(:each) do
     Spree::Zone.delete_all
     visit spree.admin_path
-    click_link "Settings"
+    click_link "Areas"
   end
 
   context "show" do
     it "should display existing zones" do
-      create(:zone, :name => "eastern", :description => "zone is eastern")
-      create(:zone, :name => "western", :description => "cool san fran")
+      create(:zone, name: "eastern", description: "zone is eastern")
+      create(:zone, name: "western", description: "cool san fran")
       click_link "Zones"
 
       within_row(1) { expect(page).to have_content("eastern") }
@@ -30,8 +30,8 @@ describe "Zones", :type => :feature do
       click_link "Zones"
       click_link "admin_new_zone_link"
       expect(page).to have_content("New Zone")
-      fill_in "zone_name", :with => "japan"
-      fill_in "zone_description", :with => "japanese time zone"
+      fill_in "zone_name", with: "japan"
+      fill_in "zone_description", with: "japanese time zone"
       click_button "Create"
       expect(page).to have_content("successfully created!")
     end

data/spec/features/admin/homepage_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-describe "Homepage", :type => :feature do
-
+describe "Homepage", type: :feature do
   context 'as admin user' do
     stub_authorization!
 
@@ -55,12 +54,11 @@ describe "Homepage", :type => :feature do
   end
 
   context 'as fakedispatch user' do
-
     before do
       allow_any_instance_of(Spree::Admin::BaseController).to receive(:spree_current_user).and_return(nil)
     end
 
-    custom_authorization! do |user|
+    custom_authorization! do |_user|
       can [:admin, :home], :dashboards
       can [:admin, :edit, :index, :read], Spree::Order
     end
@@ -74,5 +72,4 @@ describe "Homepage", :type => :feature do
       expect(page).not_to have_link('Settings')
     end
   end
-
 end

data/spec/features/admin/locale_spec.rb

@@ -1,19 +1,20 @@
 require 'spec_helper'
 
-describe "setting locale", :type => :feature do
+describe "setting locale", type: :feature do
   stub_authorization!
 
   before do
+    ActionView::Base.raise_on_missing_translations = false
     I18n.locale = I18n.default_locale
     I18n.backend.store_translations(:fr,
-      :date => {
-        :month_names => [],
+      date: {
+        month_names: []
       },
-      :spree => {
-        :admin => {
-          :tab => { :orders => "Ordres" }
+      spree: {
+        admin: {
+          tab: { orders: "Ordres" }
         },
-        :listing_orders => "Ordres",
+        listing_orders: "Ordres"
       })
     Spree::Backend::Config[:locale] = "fr"
   end
@@ -21,6 +22,7 @@ describe "setting locale", :type => :feature do
   after do
     I18n.locale = I18n.default_locale
     Spree::Backend::Config[:locale] = "en"
+    ActionView::Base.raise_on_missing_translations = true
   end
 
   it "should be in french" do

data/spec/features/admin/orders/adjustments_promotions_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
-describe "Adjustments Promotions", :type => :feature do
+describe "Adjustments Promotions", type: :feature do
   stub_authorization!
 
   before(:each) do
-    promotion = create(:promotion_with_item_adjustment,
-                         :name       => "$10 off",
-                         :path       => 'test',
-                         :code       => "10_off",
-                         :starts_at  => 1.day.ago,
-                         :expires_at => 1.day.from_now,
-                         :adjustment_rate => 10)
+    create(:promotion_with_item_adjustment,
+           name: "$10 off",
+           path: 'test',
+           code: "10_off",
+           starts_at: 1.day.ago,
+           expires_at: 1.day.from_now,
+           adjustment_rate: 10)
 
     order = create(:order_with_totals)
     line_item = order.line_items.first
@@ -22,8 +22,8 @@ describe "Adjustments Promotions", :type => :feature do
 
   context "admin adding a promotion" do
     context "successfully" do
-      it "should create a new adjustment", :js => true do
-        fill_in "coupon_code", :with => "10_off"
+      it "should create a new adjustment", js: true do
+        fill_in "coupon_code", with: "10_off"
         click_button "Add Coupon Code"
         expect(page).to have_content("$10 off")
         expect(page).to have_content("-$10.00")
@@ -31,20 +31,20 @@ describe "Adjustments Promotions", :type => :feature do
     end
 
     context "for non-existing promotion" do
-      it "should show an error message", :js => true do
-        fill_in "coupon_code", :with => "does_not_exist"
+      it "should show an error message", js: true do
+        fill_in "coupon_code", with: "does_not_exist"
         click_button "Add Coupon Code"
         expect(page).to have_content("doesn't exist.")
       end
     end
 
     context "for already applied promotion" do
-      it "should show an error message", :js => true do
-        fill_in "coupon_code", :with => "10_off"
+      it "should show an error message", js: true do
+        fill_in "coupon_code", with: "10_off"
         click_button "Add Coupon Code"
         expect(page).to have_content('-$10.00')
 
-        fill_in "coupon_code", :with => "10_off"
+        fill_in "coupon_code", with: "10_off"
         click_button "Add Coupon Code"
         expect(page).to have_content("already been applied")
       end

data/spec/features/admin/orders/adjustments_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Adjustments", :type => :feature do
+describe "Adjustments", type: :feature do
   stub_authorization!
 
   let!(:order) { create(:completed_order_with_totals, line_items_count: 5) }
@@ -13,11 +13,11 @@ describe "Adjustments", :type => :feature do
 
   let!(:tax_adjustment) do
     create(:tax_adjustment,
-      :adjustable => line_item,
-      :finalized => true,
-      :order => order,
-      :label => "VAT 5%",
-      :amount => 10)
+      adjustable: line_item,
+      finalized: true,
+      order: order,
+      label: "VAT 5%",
+      amount: 10)
   end
 
   let!(:adjustment) { order.adjustments.create!(order: order, label: 'Rebate', amount: 10) }
@@ -53,8 +53,8 @@ describe "Adjustments", :type => :feature do
 
     context "successfully" do
       it "should create a new adjustment" do
-        fill_in "adjustment_amount", :with => "10"
-        fill_in "adjustment_label", :with => "rebate"
+        fill_in "adjustment_amount", with: "10"
+        fill_in "adjustment_label", with: "rebate"
         click_button "Continue"
 
         order.reload.all_adjustments.each do |adjustment|
@@ -65,25 +65,24 @@ describe "Adjustments", :type => :feature do
 
     context "with validation errors" do
       it "should not create a new adjustment" do
-        fill_in "adjustment_amount", :with => ""
-        fill_in "adjustment_label", :with => ""
+        fill_in "adjustment_amount", with: ""
+        fill_in "adjustment_label", with: ""
         click_button "Continue"
-        expect(page).to have_content("Label can't be blank")
+        expect(page).to have_content("Description can't be blank")
         expect(page).to have_content("Amount is not a number")
       end
     end
   end
 
   context "admin editing an adjustment" do
-
     before(:each) do
       within_row(2) { click_icon :edit }
     end
 
     context "successfully" do
       it "should update the adjustment" do
-        fill_in "adjustment_amount", :with => "99"
-        fill_in "adjustment_label", :with => "rebate 99"
+        fill_in "adjustment_amount", with: "99"
+        fill_in "adjustment_label", with: "rebate 99"
         click_button "Continue"
         expect(page).to have_content("successfully updated!")
         expect(page).to have_content("rebate 99")
@@ -97,10 +96,10 @@ describe "Adjustments", :type => :feature do
 
     context "with validation errors" do
       it "should not update the adjustment" do
-        fill_in "adjustment_amount", :with => ""
-        fill_in "adjustment_label", :with => ""
+        fill_in "adjustment_amount", with: ""
+        fill_in "adjustment_label", with: ""
         click_button "Continue"
-        expect(page).to have_content("Label can't be blank")
+        expect(page).to have_content("Description can't be blank")
         expect(page).to have_content("Amount is not a number")
       end
     end
@@ -113,7 +112,7 @@ describe "Adjustments", :type => :feature do
       end
     end
 
-    it "should update the total", :js => true do
+    it "should update the total", js: true do
       accept_alert do
         within_row(2) do
           click_icon(:trash)