solidus_backend 1.2.3 → 1.3.0.beta1

data/spec/features/admin/products/variant_spec.rb

@@ -1,15 +1,15 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe "Variants", :type => :feature do
+describe "Variants", type: :feature do
   stub_authorization!
 
-  let(:product) { create(:product_with_option_types, :price => "1.99", :cost_price => "1.00", :weight => "2.5", :height => "3.0", :width => "1.0", :depth => "1.5") }
+  let(:product) { create(:product_with_option_types, price: "1.99", cost_price: "1.00", weight: "2.5", height: "3.0", width: "1.0", depth: "1.5") }
 
   context "creating a new variant" do
     it "should allow an admin to create a new variant" do
       product.options.each do |option|
-        create(:option_value, :option_type => option.option_type)
+        create(:option_value, option_type: option.option_type)
       end
 
       visit spree.admin_path
@@ -35,7 +35,7 @@ describe "Variants", :type => :feature do
         end
 
         let!(:variant) do
-          create(:variant, :product => product, :price => 19.99)
+          create(:variant, product: product, price: 19.99)
         end
 
         # Regression test for https://github.com/spree/spree/issues/2737

data/spec/features/admin/promotion_adjustments_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe "Promotion Adjustments", :type => :feature do
+describe "Promotion Adjustments", type: :feature do
   stub_authorization!
 
-  context "coupon promotions", :js => true do
+  context "coupon promotions", js: true do
     before(:each) do
       visit spree.admin_path
       click_link "Promotions"
@@ -11,24 +11,24 @@ describe "Promotion Adjustments", :type => :feature do
     end
 
     it "should allow an admin to create a flat rate discount coupon promo" do
-      fill_in "Name", :with => "Promotion"
-      fill_in "Base code", :with => "order"
-      fill_in "Number of codes", :with => "1"
+      fill_in "Name", with: "Promotion"
+      fill_in "Base code", with: "order"
+      fill_in "Number of codes", with: "1"
       click_button "Create"
       expect(page).to have_content("Editing Promotion")
 
-      select2 "Item total", :from => "Add rule of type"
+      select2 "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
 
       find('[id$=_preferred_amount]').set(30)
       within('#rule_fields') { click_button "Update" }
 
-      select2 "Create whole-order adjustment", :from => "Add action of type"
+      select2 "Create whole-order adjustment", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
-      select2 "Flat Rate", :from => "Calculator"
+      select2 "Flat Rate", from: "Calculator"
       within('#actions_container') { click_button "Update" }
 
-      within('.calculator-fields') { fill_in "Amount", :with => 5 }
+      within('.calculator-fields') { fill_in "Amount", with: 5 }
       within('#actions_container') { click_button "Update" }
 
       promotion = Spree::Promotion.find_by_name("Promotion")
@@ -46,18 +46,18 @@ describe "Promotion Adjustments", :type => :feature do
     end
 
     it "should allow an admin to create a single user coupon promo with flat rate discount" do
-      fill_in "Name", :with => "Promotion"
-      fill_in "promotion[usage_limit]", :with => "1"
-      fill_in "Base code", :with => "single_use"
-      fill_in "Number of codes", :with => "1"
+      fill_in "Name", with: "Promotion"
+      fill_in "promotion[usage_limit]", with: "1"
+      fill_in "Base code", with: "single_use"
+      fill_in "Number of codes", with: "1"
       click_button "Create"
       expect(page).to have_content("Editing Promotion")
 
-      select2 "Create whole-order adjustment", :from => "Add action of type"
+      select2 "Create whole-order adjustment", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
-      select2 "Flat Rate", :from => "Calculator"
+      select2 "Flat Rate", from: "Calculator"
       within('#actions_container') { click_button "Update" }
-      within('#action_fields') { fill_in "Amount", :with => "5" }
+      within('#action_fields') { fill_in "Amount", with: "5" }
       within('#actions_container') { click_button "Update" }
 
       promotion = Spree::Promotion.find_by_name("Promotion")
@@ -72,21 +72,21 @@ describe "Promotion Adjustments", :type => :feature do
     end
 
     it "should allow an admin to create an automatic promo with flat percent discount" do
-      fill_in "Name", :with => "Promotion"
+      fill_in "Name", with: "Promotion"
       click_button "Create"
       expect(page).to have_content("Editing Promotion")
 
-      select2 "Item total", :from => "Add rule of type"
+      select2 "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
 
       find('[id$=_preferred_amount]').set(30)
       within('#rule_fields') { click_button "Update" }
 
-      select2 "Create whole-order adjustment", :from => "Add action of type"
+      select2 "Create whole-order adjustment", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
-      select2 "Flat Percent", :from => "Calculator"
+      select2 "Flat Percent", from: "Calculator"
       within('#actions_container') { click_button "Update" }
-      within('.calculator-fields') { fill_in "Flat Percent", :with => "10" }
+      within('.calculator-fields') { fill_in "Flat Percent", with: "10" }
       within('#actions_container') { click_button "Update" }
 
       promotion = Spree::Promotion.find_by_name("Promotion")
@@ -104,22 +104,22 @@ describe "Promotion Adjustments", :type => :feature do
     end
 
     it "should allow an admin to create an product promo with percent per item discount" do
-      create(:product, :name => "RoR Mug")
+      create(:product, name: "RoR Mug")
 
-      fill_in "Name", :with => "Promotion"
+      fill_in "Name", with: "Promotion"
       click_button "Create"
       expect(page).to have_content("Editing Promotion")
 
-      select2 "Product(s)", :from => "Add rule of type"
+      select2 "Product(s)", from: "Add rule of type"
       within("#rule_fields") { click_button "Add" }
-      select2_search "RoR Mug", :from => "Choose products"
+      select2_search "RoR Mug", from: "Choose products"
       within('#rule_fields') { click_button "Update" }
 
-      select2 "Create per-line-item adjustment", :from => "Add action of type"
+      select2 "Create per-line-item adjustment", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
-      select2 "Percent Per Item", :from => "Calculator"
+      select2 "Percent Per Item", from: "Calculator"
       within('#actions_container') { click_button "Update" }
-      within('.calculator-fields') { fill_in "Percent", :with => "10" }
+      within('.calculator-fields') { fill_in "Percent", with: "10" }
       within('#actions_container') { click_button "Update" }
 
       promotion = Spree::Promotion.find_by_name("Promotion")
@@ -137,16 +137,16 @@ describe "Promotion Adjustments", :type => :feature do
     end
 
     it "should allow an admin to create an automatic promotion with free shipping (no code)" do
-      fill_in "Name", :with => "Promotion"
+      fill_in "Name", with: "Promotion"
       click_button "Create"
       expect(page).to have_content("Editing Promotion")
 
-      select2 "Item total", :from => "Add rule of type"
+      select2 "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
       find('[id$=_preferred_amount]').set(30)
       within('#rule_fields') { click_button "Update" }
 
-      select2 "Free shipping", :from => "Add action of type"
+      select2 "Free shipping", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
       expect(page).to have_content('MAKES ALL SHIPMENTS FOR THE ORDER FREE')
 
@@ -157,16 +157,16 @@ describe "Promotion Adjustments", :type => :feature do
     end
 
     it "should allow an admin to create an automatic promo requiring a landing page to be visited" do
-      fill_in "Name", :with => "Promotion"
-      fill_in "Path", :with => "content/cvv"
+      fill_in "Name", with: "Promotion"
+      fill_in "Path", with: "content/cvv"
       click_button "Create"
       expect(page).to have_content("Editing Promotion")
 
-      select2 "Create whole-order adjustment", :from => "Add action of type"
+      select2 "Create whole-order adjustment", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
-      select2 "Flat Rate", :from => "Calculator"
+      select2 "Flat Rate", from: "Calculator"
       within('#actions_container') { click_button "Update" }
-      within('.calculator-fields') { fill_in "Amount", :with => "4" }
+      within('.calculator-fields') { fill_in "Amount", with: "4" }
       within('#actions_container') { click_button "Update" }
 
       promotion = Spree::Promotion.find_by_name("Promotion")
@@ -182,20 +182,20 @@ describe "Promotion Adjustments", :type => :feature do
     end
 
     it "ceasing to be eligible for a promotion with item total rule then becoming eligible again" do
-      fill_in "Name", :with => "Promotion"
+      fill_in "Name", with: "Promotion"
       click_button "Create"
       expect(page).to have_content("Editing Promotion")
 
-      select2 "Item total", :from => "Add rule of type"
+      select2 "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
       find('[id$=_preferred_amount]').set(50)
       within('#rule_fields') { click_button "Update" }
 
-      select2 "Create whole-order adjustment", :from => "Add action of type"
+      select2 "Create whole-order adjustment", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
-      select2 "Flat Rate", :from => "Calculator"
+      select2 "Flat Rate", from: "Calculator"
       within('#actions_container') { click_button "Update" }
-      within('.calculator-fields') { fill_in "Amount", :with => "5" }
+      within('.calculator-fields') { fill_in "Amount", with: "5" }
       within('#actions_container') { click_button "Update" }
 
       promotion = Spree::Promotion.find_by_name("Promotion")

data/spec/features/admin/reports_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Reports", :type => :feature do
+describe "Reports", type: :feature do
   stub_authorization!
 
   context "visiting the admin reports page" do
@@ -19,28 +19,28 @@ describe "Reports", :type => :feature do
   context "searching the admin reports page" do
     before do
       order = create(:order)
-      order.update_columns({:adjustment_total => 100})
+      order.update_columns({ adjustment_total: 100 })
       order.completed_at = Time.current
       order.save!
 
       order = create(:order)
-      order.update_columns({:adjustment_total => 200})
+      order.update_columns({ adjustment_total: 200 })
       order.completed_at = Time.current
       order.save!
 
-      #incomplete order
+      # incomplete order
       order = create(:order)
-      order.update_columns({:adjustment_total => 50})
+      order.update_columns({ adjustment_total: 50 })
       order.save!
 
       order = create(:order)
-      order.update_columns({:adjustment_total => 200})
+      order.update_columns({ adjustment_total: 200 })
       order.completed_at = 3.years.ago
       order.created_at = 3.years.ago
       order.save!
 
       order = create(:order)
-      order.update_columns({:adjustment_total => 200})
+      order.update_columns({ adjustment_total: 200 })
       order.completed_at = 3.years.from_now
       order.created_at = 3.years.from_now
       order.save!
@@ -51,8 +51,8 @@ describe "Reports", :type => :feature do
       click_link "Reports"
       click_link "Sales Total"
 
-      fill_in "q_completed_at_gt", :with => 1.week.ago
-      fill_in "q_completed_at_lt", :with => 1.week.from_now
+      fill_in "q_completed_at_gt", with: 1.week.ago
+      fill_in "q_completed_at_lt", with: 1.week.from_now
       click_button "Search"
 
       expect(page).to have_content("$300.00")

data/spec/features/admin/stock_transfer_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Stock Transfers', :type => :feature, :js => true do
+describe 'Stock Transfers', type: :feature, js: true do
   stub_authorization!
 
   let(:admin_user) { create(:admin_user) }
@@ -12,8 +12,8 @@ describe 'Stock Transfers', :type => :feature, :js => true do
 
   describe 'create stock transfer' do
     it 'can create a stock transfer' do
-      source_location = create(:stock_location_with_items, :name => 'NY')
-      destination_location = create(:stock_location, :name => 'SF')
+      create(:stock_location_with_items, name: 'NY')
+      create(:stock_location, name: 'SF')
 
       visit spree.new_admin_stock_transfer_path
       select "SF", from: 'stock_transfer[source_location_id]'
@@ -28,20 +28,8 @@ describe 'Stock Transfers', :type => :feature, :js => true do
       end
 
       expect(page).to have_content('Stock Transfer has been successfully updated')
-      expect(page).to have_css(:div, '#finalize-stock-transfer-warning')
       expect(page).to have_content("NY")
     end
-
-    # Regression spec for Solidus issue #1087
-    it 'displays an error if no source location is selected' do
-      create(:stock_location_with_items, name: 'NY')
-      create(:stock_location, name: 'SF')
-      visit spree.new_admin_stock_transfer_path
-      fill_in 'stock_transfer_description', with: description
-      click_button 'Continue'
-
-      expect(page).to have_content("Source location can't be blank")
-    end
   end
 
   describe 'view a stock transfer' do
@@ -75,7 +63,7 @@ describe 'Stock Transfers', :type => :feature, :js => true do
       it 'adds tracking number' do
         visit spree.tracking_info_admin_stock_transfer_path(stock_transfer)
 
-        fill_in 'stock_transfer_tracking_number', :with => "12345"
+        fill_in 'stock_transfer_tracking_number', with: "12345"
         click_button 'Save'
 
         expect(page).to have_content('Stock Transfer has been successfully updated')
@@ -86,10 +74,9 @@ describe 'Stock Transfers', :type => :feature, :js => true do
     describe 'with enough stock' do
       it 'ships stock transfer' do
         visit spree.tracking_info_admin_stock_transfer_path(stock_transfer)
-        click_link 'ship'
+        click_on 'ship'
 
-        find('#confirm-ship-link', visible: false).click
-        expect(current_path).to eq spree.admin_stock_transfers_path
+        expect(page).to have_current_path(spree.admin_stock_transfers_path)
         expect(stock_transfer.reload.shipped_at).to_not be_nil
       end
     end
@@ -104,10 +91,9 @@ describe 'Stock Transfers', :type => :feature, :js => true do
       it 'does not ship stock transfer' do
         visit spree.tracking_info_admin_stock_transfer_path(stock_transfer)
 
-        click_link 'ship'
+        click_on 'ship'
 
-        find('#confirm-ship-link', visible: false).click
-        expect(current_path).to eq spree.tracking_info_admin_stock_transfer_path(stock_transfer)
+        expect(page).to have_current_path(spree.tracking_info_admin_stock_transfer_path(stock_transfer))
         expect(stock_transfer.reload.shipped_at).to be_nil
       end
     end

data/spec/features/admin/store_credits_spec.rb

@@ -78,5 +78,4 @@ describe "Store credits admin" do
       expect(store_credit.reload.amount.to_f).to eq updated_amount.to_f
     end
   end
-
 end

data/spec/features/admin/taxons_spec.rb

@@ -1,23 +1,22 @@
 require 'spec_helper'
 
-describe "Taxonomies and taxons", :type => :feature do
+describe "Taxonomies and taxons", type: :feature do
   stub_authorization!
 
   it "admin should be able to edit taxon" do
-
     visit spree.new_admin_taxonomy_path
 
-    fill_in "Name", :with => "Hello"
+    fill_in "Name", with: "Hello"
     click_button "Create"
 
     @taxonomy = Spree::Taxonomy.last
 
     visit spree.edit_admin_taxonomy_taxon_path(@taxonomy, @taxonomy.root.id)
 
-    fill_in "taxon_name", :with => "Shirt"
-    fill_in "taxon_description", :with => "Discover our new rails shirts"
+    fill_in "taxon_name", with: "Shirt"
+    fill_in "taxon_description", with: "Discover our new rails shirts"
 
-    fill_in "permalink_part", :with => "shirt-rails"
+    fill_in "permalink_part", with: "shirt-rails"
     click_button "Update"
     expect(page).to have_content("Taxon \"Shirt\" has been successfully updated!")
   end

data/spec/features/admin/users_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Users', :type => :feature do
+describe 'Users', type: :feature do
   stub_authorization!
   let!(:country) { create(:country) }
   let!(:user_a) { create(:user_with_addresses, email: 'a@example.com') }
@@ -25,9 +25,9 @@ describe 'Users', :type => :feature do
         [:total_sales, :num_orders, :average_order_value, :member_since].each do |stat_name|
           expect(page).to have_content Spree.t(stat_name)
         end
-        expect(page).to have_content (order.total + order_2.total)
+        expect(page).to have_content(order.total + order_2.total)
         expect(page).to have_content orders.count
-        expect(page).to have_content (orders.sum(&:total) / orders.count)
+        expect(page).to have_content(orders.sum(&:total) / orders.count)
         expect(page).to have_content I18n.l(user_a.created_at.to_date)
       end
     end
@@ -77,7 +77,6 @@ describe 'Users', :type => :feature do
   end
 
   context 'users index' do
-
     context "email" do
       it_behaves_like "a sortable attribute" do
         let(:text_match_1) { user_a.email }
@@ -157,7 +156,7 @@ describe 'Users', :type => :feature do
       it 'can generate a new api key' do
         within("#admin_user_edit_api_key") do
           expect(user_a.spree_api_key).to be_blank
-          click_button Spree.t('generate_key', :scope => 'api')
+          click_button Spree.t('generate_key', scope: 'api')
         end
 
         expect(user_a.reload.spree_api_key).to be_present
@@ -176,7 +175,7 @@ describe 'Users', :type => :feature do
       it 'can clear an api key' do
         expect(page).to have_css('#current-api-key')
 
-        click_button Spree.t('clear_key', :scope => 'api')
+        click_button Spree.t('clear_key', scope: 'api')
 
         expect(page).to have_no_css('#current-api-key')
 
@@ -187,7 +186,7 @@ describe 'Users', :type => :feature do
         old_key = user_a.spree_api_key
 
         within("#admin_user_edit_api_key") do
-          click_button Spree.t('regenerate_key', :scope => 'api')
+          click_button Spree.t('regenerate_key', scope: 'api')
         end
 
         expect(user_a.reload.spree_api_key).to be_present
@@ -199,7 +198,6 @@ describe 'Users', :type => :feature do
   end
 
   context 'order history with sorting' do
-
     before do
       orders
       click_link user_a.email
@@ -230,7 +228,6 @@ describe 'Users', :type => :feature do
   end
 
   context 'items purchased with sorting' do
-
     before do
       orders
       click_link user_a.email