solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -1,10 +1,9 @@
 require 'spec_helper'
 
-describe 'Payments', :type => :feature do
+describe 'Payments', type: :feature do
   stub_authorization!
 
   context "with a pre-existing payment" do
-
     let!(:payment) do
       create(:payment,
         order:          order,
@@ -14,20 +13,11 @@ describe 'Payments', :type => :feature do
       )
     end
 
-    let(:order) { create(:completed_order_with_totals, number: 'R100', line_items_count: 5) }
+    let(:order) { create(:completed_order_with_totals, number: 'R100', line_items_price: 50) }
     let(:state) { 'checkout' }
 
     before do
-      visit spree.admin_path
-      click_link 'Orders'
-      within_row(1) do
-        click_link order.number
-      end
-      click_link 'Payments'
-    end
-
-    def refresh_page
-      visit current_path
+      visit "/admin/orders/#{order.number}/payments"
     end
 
     # Regression tests for https://github.com/spree/spree/issues/1453
@@ -37,7 +27,7 @@ describe 'Payments', :type => :feature do
         create(:payment,
           order:          order,
           amount:         order.outstanding_balance,
-          payment_method: create(:check_payment_method)  # Check
+          payment_method: create(:check_payment_method) # Check
         )
       end
 
@@ -54,15 +44,15 @@ describe 'Payments', :type => :feature do
     end
 
     it 'should list all captures for a payment' do
-      capture_amount = order.outstanding_balance/2 * 100
+      capture_amount = order.outstanding_balance / 2 * 100
       payment.capture!(capture_amount)
 
       visit spree.admin_order_payment_path(order, payment)
-      expect(page).to have_content 'Capture events'
+      expect(page).to have_content 'Capture Events'
       # within '#capture_events' do
-        within_row(1) do
-          expect(page).to have_content(capture_amount / 100)
-        end
+      within_row(1) do
+        expect(page).to have_content(capture_amount / 100)
+      end
       # end
     end
 
@@ -117,6 +107,7 @@ describe 'Payments', :type => :feature do
         within_row(1) do
           click_icon(:edit)
           fill_in('amount', with: '$1')
+          click_icon(:save)
           expect(page).to have_selector('td.amount span', text: '$1.00')
           expect(payment.reload.amount).to eq(1.00)
         end
@@ -126,6 +117,7 @@ describe 'Payments', :type => :feature do
         within_row(1) do
           find('td.amount span').click
           fill_in('amount', with: '$1.01')
+          click_icon(:save)
           expect(page).to have_selector('td.amount span', text: '$1.01')
           expect(payment.reload.amount).to eq(1.01)
         end
@@ -150,6 +142,7 @@ describe 'Payments', :type => :feature do
         within_row(1) do
           click_icon(:edit)
           fill_in('amount', with: 'invalid')
+          click_icon(:save)
         end
         expect(page).to have_selector('.flash.error', text: 'Invalid resource. Please fix errors and try again.')
         expect(page).to have_field('amount', with: 'invalid')
@@ -163,15 +156,14 @@ describe 'Payments', :type => :feature do
       it 'does not allow the amount to be edited' do
         within_row(1) do
           expect(page).not_to have_selector('.fa-edit')
-          expect(page).not_to have_selector('td.amount span')
         end
       end
     end
   end
 
   context "with no prior payments" do
-    let(:order) { create(:order_with_line_items, :line_items_count => 1) }
-    let!(:payment_method) { create(:credit_card_payment_method)}
+    let(:order) { create(:order_with_line_items, line_items_count: 1) }
+    let!(:payment_method) { create(:credit_card_payment_method) }
 
     # Regression tests for https://github.com/spree/spree/issues/4129
     context "with a credit card payment method" do
@@ -179,11 +171,11 @@ describe 'Payments', :type => :feature do
         visit spree.admin_order_payments_path(order)
       end
 
-      it "is able to create a new credit card payment with valid information", :js => true do
-        fill_in "Card Number", :with => "4111 1111 1111 1111"
-        fill_in "Name *", :with => "Test User"
-        fill_in "Expiration", :with => "09 / #{Time.current.year + 1}"
-        fill_in "Card Code", :with => "007"
+      it "is able to create a new credit card payment with valid information", js: true do
+        fill_in "Card Number", with: "4111 1111 1111 1111"
+        fill_in "Name", with: "Test User"
+        fill_in "Expiration", with: "09 / #{Time.current.year + 1}"
+        fill_in "Card Code", with: "007"
         # Regression test for https://github.com/spree/spree/issues/4277
         expect(page).to have_css('.ccType[value="visa"]', visible: false)
         click_button "Continue"
@@ -216,7 +208,7 @@ describe 'Payments', :type => :feature do
     end
 
     context "with a check" do
-      let(:order) { create(:completed_order_with_totals, :line_items_count => 1) }
+      let(:order) { create(:completed_order_with_totals, line_items_count: 1) }
       let!(:payment_method) { create(:check_payment_method) }
 
       before do

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Order Risk Analysis', :type => :feature do
+describe 'Order Risk Analysis', type: :feature do
   stub_authorization!
 
   let!(:order) do
@@ -17,7 +17,7 @@ describe 'Order Risk Analysis', :type => :feature do
 
   context "the order is considered risky" do
     before do
-      allow_any_instance_of(Spree::Admin::BaseController).to receive_messages :try_spree_current_user => create(:user)
+      allow_any_instance_of(Spree::Admin::BaseController).to receive_messages try_spree_current_user: create(:user)
 
       order.payments.first.update_column(:avs_response, 'N')
       visit_order

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

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe "Shipments", :type => :feature do
+describe "Shipments", type: :feature do
   stub_authorization!
 
-  let!(:order) { create(:order_ready_to_ship, :number => "R100", :state => "complete", :line_items_count => 5) }
+  let!(:order) { create(:order_ready_to_ship, number: "R100", state: "complete", line_items_count: 5) }
 
   # Regression test for https://github.com/spree/spree/issues/4025
   context "a shipment without a shipping method" do
@@ -38,7 +38,7 @@ describe "Shipments", :type => :feature do
   end
 
   context "moving variants between shipments", js: true do
-    let!(:order) { create(:completed_order_with_pending_payment, :number => "R100", :state => "complete", :line_items_count => 5) }
+    let!(:order) { create(:completed_order_with_pending_payment, number: "R100", state: "complete", line_items_count: 5) }
     let!(:la) { create(:stock_location, name: "LA") }
     before(:each) do
       visit spree.admin_path
@@ -50,16 +50,21 @@ describe "Shipments", :type => :feature do
 
     it "can move a variant to a new and to an existing shipment" do
       expect(order.shipments.count).to eq(1)
+      shipment1 = order.shipments[0]
 
       within_row(1) { click_icon 'arrows-h' }
       targetted_select2 'LA', from: '#s2id_item_stock_location'
       click_icon :ok
-      expect(page).to have_css("#shipment_#{order.shipments.first.id}")
+
+      expect(page).to have_css("#shipment_#{shipment1.id} tr.stock-item", count: 4)
+      shipment2 = (order.reload.shipments.to_a - [shipment1]).first
+      expect(page).to have_css("#shipment_#{shipment2.id} tr.stock-item", count: 1)
 
       within_row(2) { click_icon 'arrows-h' }
-      targetted_select2 "LA(#{order.reload.shipments.last.number})", from: '#s2id_item_stock_location'
+      targetted_select2 "LA(#{shipment2.number})", from: '#s2id_item_stock_location'
       click_icon :ok
-      expect(page).to have_css("#shipment_#{order.reload.shipments.last.id}")
+      expect(page).to have_css("#shipment_#{shipment2.id} tr.stock-item", count: 2)
+      expect(page).to have_css("#shipment_#{shipment1.id} tr.stock-item", count: 3)
     end
   end
 end

data/spec/features/admin/products/edit/images_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Product Images", :type => :feature do
+describe "Product Images", type: :feature do
   stub_authorization!
 
   let(:file_path) { Rails.root + "../../spec/support/ror_ringer.jpeg" }
@@ -12,7 +12,7 @@ describe "Product Images", :type => :feature do
     Spree::Image.attachment_definitions[:attachment][:styles].symbolize_keys!
   end
 
-  context "uploading, editing, and deleting an image", :js => true do
+  context "uploading, editing, and deleting an image", js: true do
     it "should allow an admin to upload and edit an image for a product" do
       Spree::Image.attachment_definitions[:attachment].delete :storage
 
@@ -30,7 +30,7 @@ describe "Product Images", :type => :feature do
       within_row(1) do
         click_icon(:edit)
       end
-      fill_in "image_alt", :with => "ruby on rails t-shirt"
+      fill_in "image_alt", with: "ruby on rails t-shirt"
       click_button "Update"
       expect(page).to have_content("successfully updated!")
       expect(page).to have_content("ruby on rails t-shirt")
@@ -45,22 +45,22 @@ describe "Product Images", :type => :feature do
   # Regression test for https://github.com/spree/spree/issues/2228
   it "should see variant images" do
     variant = create(:variant)
-    variant.images.create!(:attachment => File.open(file_path))
+    variant.images.create!(attachment: File.open(file_path))
     visit spree.admin_product_images_path(variant.product)
 
     expect(page).not_to have_content("No Images Found.")
     within("table.index") do
       expect(page).to have_content(variant.options_text)
 
-      #ensure no duplicate images are displayed
-      expect(page).to have_css("tbody tr", :count => 1)
+      # ensure no duplicate images are displayed
+      expect(page).to have_css("tbody tr", count: 1)
 
-      #ensure variant header is displayed
+      # ensure variant header is displayed
       within("thead") do
         expect(page).to have_content("Variant")
       end
 
-      #ensure variant header is displayed
+      # ensure variant header is displayed
       within("tbody") do
         expect(page).to have_content("Size: S")
       end
@@ -69,21 +69,21 @@ describe "Product Images", :type => :feature do
 
   it "should not see variant column when product has no variants" do
     product = create(:product)
-    product.images.create!(:attachment => File.open(file_path))
+    product.images.create!(attachment: File.open(file_path))
     visit spree.admin_product_images_path(product)
 
     expect(page).not_to have_content("No Images Found.")
     within("table.index") do
-      #ensure no duplicate images are displayed
-      expect(page).to have_css("tbody tr", :count => 1)
+      # ensure no duplicate images are displayed
+      expect(page).to have_css("tbody tr", count: 1)
 
-      #ensure variant header is not displayed
+      # ensure variant header is not displayed
       within("thead") do
         expect(page).not_to have_content("Variant")
       end
 
-      #ensure correct cell count
-      expect(page).to have_css("thead th", :count => 3)
+      # ensure correct cell count
+      expect(page).to have_css("thead th", count: 3)
     end
   end
 end

data/spec/features/admin/products/edit/products_spec.rb

@@ -1,13 +1,13 @@
 # encoding: UTF-8
 require 'spec_helper'
 
-describe 'Product Details', :type => :feature do
+describe 'Product Details', type: :feature do
   stub_authorization!
 
   context 'editing a product' do
     it 'should list the product details' do
-      create(:product, :name => 'Bún thịt nướng', :sku => 'A100',
-              :description => 'lorem ipsum', :available_on => '2013-08-14 01:02:03')
+      create(:product, name: 'Bún thịt nướng', sku: 'A100',
+              description: 'lorem ipsum', available_on: '2013-08-14 01:02:03')
 
       visit spree.admin_path
       click_nav "Products"
@@ -15,7 +15,7 @@ describe 'Product Details', :type => :feature do
 
       click_link 'Product Details'
 
-      expect(page).to have_css('.page-title', text: 'Editing Product “Bún thịt nướng”')
+      expect(page).to have_css('.page-title', text: 'Products / Bún thịt nướng')
       expect(page).to have_field('product_name', with: 'Bún thịt nướng')
       expect(page).to have_field('product_slug', with: 'bun-th-t-n-ng')
       expect(page).to have_field('product_description', with: 'lorem ipsum')
@@ -26,8 +26,8 @@ describe 'Product Details', :type => :feature do
     end
 
     it "should handle slug changes" do
-      create(:product, :name => 'Bún thịt nướng', :sku => 'A100',
-              :description => 'lorem ipsum', :available_on => '2011-01-01 01:01:01')
+      create(:product, name: 'Bún thịt nướng', sku: 'A100',
+              description: 'lorem ipsum', available_on: '2011-01-01 01:01:01')
 
       visit spree.admin_path
       click_nav "Products"
@@ -35,22 +35,22 @@ describe 'Product Details', :type => :feature do
         click_icon(:edit)
       end
 
-      fill_in "product_slug", :with => 'random-slug-value'
+      fill_in "product_slug", with: 'random-slug-value'
       click_button "Update"
       expect(page).to have_content("successfully updated!")
 
-      fill_in "product_slug", :with => ''
+      fill_in "product_slug", with: ''
       click_button "Update"
       within('#product_slug_field') { expect(page).to have_content("is too short") }
 
-      fill_in "product_slug", :with => 'another-random-slug-value'
+      fill_in "product_slug", with: 'another-random-slug-value'
       click_button "Update"
       expect(page).to have_content("successfully updated!")
     end
   end
 
   # Regression test for https://github.com/spree/spree/issues/3385
-  context "deleting a product", :js => true do
+  context "deleting a product", js: true do
     it "is still able to find the master variant" do
       create(:product)
 

data/spec/features/admin/products/edit/taxons_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Product Taxons", :type => :feature do
+describe "Product Taxons", type: :feature do
   stub_authorization!
 
   context "managing taxons", js: true do
@@ -25,7 +25,7 @@ describe "Product Taxons", :type => :feature do
 
       assert_selected_taxons([taxon_1])
 
-      select2_search "Clothing", :from => "Taxons"
+      select2_search "Clothing", from: "Taxons"
       click_button "Update"
       assert_selected_taxons([taxon_1, taxon_2])
     end

data/spec/features/admin/products/edit/variants_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe "Product Variants", :type => :feature do
+describe "Product Variants", type: :feature do
   stub_authorization!
 
   before(:each) do
     visit spree.admin_path
   end
 
-  context "editing variant option types", :js => true do
+  context "editing variant option types", js: true do
     let!(:product) { create(:product) }
 
     it "should allow an admin to create option types for a variant" do
@@ -15,7 +15,7 @@ describe "Product Variants", :type => :feature do
 
       within_row(1) { click_icon :edit }
 
-      within('#sidebar') { click_link "Variants" }
+      within('nav > ul.tabs') { click_link "Variants" }
       expect(page).to have_content("TO ADD VARIANTS, YOU MUST FIRST DEFINE")
     end
 
@@ -23,8 +23,8 @@ describe "Product Variants", :type => :feature do
       click_nav "Products"
       click_link "Option Types"
       click_link "new_option_type_link"
-      fill_in "option_type_name", :with => "shirt colors"
-      fill_in "option_type_presentation", :with => "colors"
+      fill_in "option_type_name", with: "shirt colors"
+      fill_in "option_type_presentation", with: "colors"
       click_button "Create"
       expect(page).to have_content("successfully created!")
 
@@ -39,15 +39,15 @@ describe "Product Variants", :type => :feature do
         click_icon :edit
       end
 
-      select2_search "shirt", :from => "Option Types"
+      select2_search "shirt", from: "Option Types"
       click_button "Update"
       expect(page).to have_content("successfully updated!")
 
-      within('#sidebar') { click_link "Variants" }
+      within('nav > ul.tabs') { click_link "Variants" }
       click_link "New Variant"
 
-      targetted_select2 "black", :from => "#s2id_variant_option_value_ids"
-      fill_in "variant_sku", :with => "A100"
+      targetted_select2 "black", from: "#s2id_variant_option_value_ids"
+      fill_in "variant_sku", with: "A100"
       click_button "Create"
       expect(page).to have_content("successfully created!")
 

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Option Types", :type => :feature do
+describe "Option Types", type: :feature do
   stub_authorization!
 
   before(:each) do
@@ -10,8 +10,8 @@ describe "Option Types", :type => :feature do
 
   context "listing option types" do
     it "should list existing option types" do
-      create(:option_type, :name => "tshirt-color", :presentation => "Color")
-      create(:option_type, :name => "tshirt-size", :presentation => "Size")
+      create(:option_type, name: "tshirt-color", presentation: "Color")
+      create(:option_type, name: "tshirt-size", presentation: "Size")
 
       click_link "Option Types"
       within("table#listing_option_types") do
@@ -24,12 +24,12 @@ describe "Option Types", :type => :feature do
   end
 
   context "creating a new option type" do
-    it "should allow an admin to create a new option type", :js => true do
+    it "should allow an admin to create a new option type", js: true do
       click_link "Option Types"
       click_link "new_option_type_link"
       expect(page).to have_content("NEW OPTION TYPE")
-      fill_in "option_type_name", :with => "shirt colors"
-      fill_in "option_type_presentation", :with => "colors"
+      fill_in "option_type_name", with: "shirt colors"
+      fill_in "option_type_presentation", with: "colors"
       click_button "Create"
       expect(page).to have_content("successfully created!")
 
@@ -43,13 +43,13 @@ describe "Option Types", :type => :feature do
 
   context "editing an existing option type" do
     it "should allow an admin to update an existing option type" do
-      create(:option_type, :name => "tshirt-color", :presentation => "Color")
-      create(:option_type, :name => "tshirt-size", :presentation => "Size")
+      create(:option_type, name: "tshirt-color", presentation: "Color")
+      create(:option_type, name: "tshirt-size", presentation: "Size")
       click_link "Option Types"
       within('table#listing_option_types') do
         find('tr', text: 'Size').click_link "Edit"
       end
-      fill_in "option_type_name", :with => "foo-size 99"
+      fill_in "option_type_name", with: "foo-size 99"
       click_button "Update"
       expect(page).to have_content("successfully updated!")
       expect(page).to have_content("foo-size 99")
@@ -57,7 +57,7 @@ describe "Option Types", :type => :feature do
   end
 
   # Regression test for https://github.com/spree/spree/issues/2277
-  it "can remove an option value from an option type", :js => true do
+  it "can remove an option value from an option type", js: true do
     create(:option_value)
     click_link "Option Types"
     within('table#listing_option_types') { click_icon :edit }
@@ -84,7 +84,7 @@ describe "Option Types", :type => :feature do
   end
 
   # Regression test for https://github.com/spree/spree/issues/3204
-  it "can remove a non-persisted option value from an option type", :js => true do
+  it "can remove a non-persisted option value from an option type", js: true do
     create(:option_type)
     click_link "Option Types"
     within('table#listing_option_types') { click_icon :edit }
@@ -111,5 +111,4 @@ describe "Option Types", :type => :feature do
     # Assert that the field is hidden automatically
     expect(page).to have_css("tbody#option_values tr", count: 0)
   end
-
 end