solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe "Products", :type => :feature do
+describe "Products", type: :feature do
   context "as admin user" do
     stub_authorization!
 
@@ -10,9 +10,9 @@ describe "Products", :type => :feature do
     end
 
     def build_option_type_with_values(name, values)
-      ot = FactoryGirl.create(:option_type, :name => name)
+      ot = FactoryGirl.create(:option_type, name: name)
       values.each do |val|
-        ot.option_values.create(:name => val.downcase, :presentation => val)
+        ot.option_values.create(name: val.downcase, presentation: val)
       end
       ot
     end
@@ -20,8 +20,8 @@ describe "Products", :type => :feature do
     context "listing products" do
       context "sorting" do
         before do
-          create(:product, :name => 'apache baseball cap', :price => 10)
-          create(:product, :name => 'zomg shirt', :price => 5)
+          create(:product, name: 'apache baseball cap', price: 10)
+          create(:product, name: 'zomg shirt', price: 5)
         end
 
         it "should list existing products with correct sorting by name" do
@@ -32,7 +32,7 @@ describe "Products", :type => :feature do
 
           # Name DESC
           click_link "admin_products_listing_name_title"
-          within_row(1) { expect(page).to have_content("zomg shirt")  }
+          within_row(1) { expect(page).to have_content("zomg shirt") }
           within_row(2) { expect(page).to have_content('apache baseball cap') }
         end
 
@@ -57,7 +57,7 @@ describe "Products", :type => :feature do
           end
 
           let!(:product) do
-            create(:product, :name => "Just a product", :price => 19.99)
+            create(:product, name: "Just a product", price: 19.99)
           end
 
           # Regression test for https://github.com/spree/spree/issues/2737
@@ -72,9 +72,9 @@ describe "Products", :type => :feature do
     end
 
     context "searching products" do
-      it "should be able to search deleted products", :js => true do
-        create(:product, :name => 'apache baseball cap', :deleted_at => "2011-01-06 18:21:13")
-        create(:product, :name => 'zomg shirt')
+      it "should be able to search deleted products", js: true do
+        create(:product, name: 'apache baseball cap', deleted_at: "2011-01-06 18:21:13")
+        create(:product, name: 'zomg shirt')
 
         click_nav "Products"
         expect(page).to have_content("zomg shirt")
@@ -90,18 +90,18 @@ describe "Products", :type => :feature do
       end
 
       it "should be able to search products by their properties" do
-        create(:product, :name => 'apache baseball cap', :sku => "A100")
-        create(:product, :name => 'apache baseball cap2', :sku => "B100")
-        create(:product, :name => 'zomg shirt')
+        create(:product, name: 'apache baseball cap', sku: "A100")
+        create(:product, name: 'apache baseball cap2', sku: "B100")
+        create(:product, name: 'zomg shirt')
 
         click_nav "Products"
-        fill_in "q_name_cont", :with => "ap"
+        fill_in "q_name_cont", with: "ap"
         click_icon :search
         expect(page).to have_content("apache baseball cap")
         expect(page).to have_content("apache baseball cap2")
         expect(page).not_to have_content("zomg shirt")
 
-        fill_in "q_variants_including_master_sku_cont", :with => "A1"
+        fill_in "q_variants_including_master_sku_cont", with: "A1"
         click_icon :search
         expect(page).to have_content("apache baseball cap")
         expect(page).not_to have_content("apache baseball cap2")
@@ -111,9 +111,9 @@ describe "Products", :type => :feature do
 
     context "creating a new product from a prototype" do
       def build_option_type_with_values(name, values)
-        ot = FactoryGirl.create(:option_type, :name => name)
+        ot = FactoryGirl.create(:option_type, name: name)
         values.each do |val|
-          ot.option_values.create(:name => val.downcase, :presentation => val)
+          ot.option_values.create(name: val.downcase, presentation: val)
         end
         ot
       end
@@ -126,7 +126,7 @@ describe "Products", :type => :feature do
 
       let(:prototype) do
         size = build_option_type_with_values("size", %w(Small Medium Large))
-        FactoryGirl.create(:prototype, :name => "Size", :option_types => [ size ])
+        FactoryGirl.create(:prototype, name: "Size", option_types: [size])
       end
 
       let(:option_values_hash) do
@@ -139,7 +139,7 @@ describe "Products", :type => :feature do
 
       before(:each) do
         @option_type_prototype = prototype
-        @property_prototype = create(:prototype, :name => "Random")
+        @property_prototype = create(:prototype, name: "Random")
         @shipping_category = create(:shipping_category)
         click_nav "Products"
         click_link "admin_new_product"
@@ -148,12 +148,12 @@ describe "Products", :type => :feature do
         end
       end
 
-      it "should allow an admin to create a new product and variants from a prototype", :js => true do
-        fill_in "product_name", :with => "Baseball Cap"
-        fill_in "product_sku", :with => "B100"
-        fill_in "product_price", :with => "100"
-        fill_in "product_available_on", :with => "2012/01/24"
-        select "Size", :from => "Prototype"
+      it "should allow an admin to create a new product and variants from a prototype", js: true do
+        fill_in "product_name", with: "Baseball Cap"
+        fill_in "product_sku", with: "B100"
+        fill_in "product_price", with: "100"
+        fill_in "product_available_on", with: "2012/01/24"
+        select "Size", from: "Prototype"
         check "Large"
         select @shipping_category.name, from: "product_shipping_category_id"
         click_button "Create"
@@ -161,19 +161,19 @@ describe "Products", :type => :feature do
         expect(Spree::Product.last.variants.length).to eq(1)
       end
 
-      it "should not display variants when prototype does not contain option types", :js => true do
-        select "Random", :from => "Prototype"
+      it "should not display variants when prototype does not contain option types", js: true do
+        select "Random", from: "Prototype"
 
-        fill_in "product_name", :with => "Baseball Cap"
+        fill_in "product_name", with: "Baseball Cap"
 
         expect(page).not_to have_content("Variants")
       end
 
-      it "should keep option values selected if validation fails", :js => true do
-        fill_in "product_name", :with => "Baseball Cap"
-        fill_in "product_sku", :with => "B100"
-        fill_in "product_price", :with => "100"
-        select "Size", :from => "Prototype"
+      it "should keep option values selected if validation fails", js: true do
+        fill_in "product_name", with: "Baseball Cap"
+        fill_in "product_sku", with: "B100"
+        fill_in "product_price", with: "100"
+        select "Size", from: "Prototype"
         check "Large"
         click_button "Create"
         expect(page).to have_content("Shipping category can't be blank")
@@ -193,11 +193,11 @@ describe "Products", :type => :feature do
         end
       end
 
-      it "should allow an admin to create a new product", :js => true do
-        fill_in "product_name", :with => "Baseball Cap"
-        fill_in "product_sku", :with => "B100"
-        fill_in "product_price", :with => "100"
-        fill_in "product_available_on", :with => "2012/01/24"
+      it "should allow an admin to create a new product", js: true do
+        fill_in "product_name", with: "Baseball Cap"
+        fill_in "product_sku", with: "B100"
+        fill_in "product_price", with: "100"
+        fill_in "product_available_on", with: "2012/01/24"
         select @shipping_category.name, from: "product_shipping_category_id"
         click_button "Create"
         expect(page).to have_content("successfully created!")
@@ -205,10 +205,10 @@ describe "Products", :type => :feature do
         expect(page).to have_content("successfully updated!")
       end
 
-      it "should show validation errors", :js => true do
-        fill_in "product_name", :with => "Baseball Cap"
-        fill_in "product_sku", :with => "B100"
-        fill_in "product_price", :with => "100"
+      it "should show validation errors", js: true do
+        fill_in "product_name", with: "Baseball Cap"
+        fill_in "product_sku", with: "B100"
+        fill_in "product_price", with: "100"
         click_button "Create"
         expect(page).to have_content("Shipping category can't be blank")
       end
@@ -217,11 +217,11 @@ describe "Products", :type => :feature do
         before do
           # change English locale’s separator and delimiter to match 19,99 format
           I18n.backend.store_translations(:en,
-            :number => {
-              :currency => {
-                :format => {
-                  :separator => ",",
-                  :delimiter => "."
+            number: {
+              currency: {
+                format: {
+                  separator: ",",
+                  delimiter: "."
                 }
               }
             })
@@ -230,20 +230,20 @@ describe "Products", :type => :feature do
         after do
           # revert changes to English locale
           I18n.backend.store_translations(:en,
-            :number => {
-              :currency => {
-                :format => {
-                  :separator => ".",
-                  :delimiter => ","
+            number: {
+              currency: {
+                format: {
+                  separator: ".",
+                  delimiter: ","
                 }
               }
             })
         end
 
-        it "should show localized price value on validation errors", :js => true do
-          fill_in "Name", :with => " "
+        it "should show localized price value on validation errors", js: true do
+          fill_in "Name", with: " "
           select @shipping_category.name, from: "product_shipping_category_id"
-          fill_in "product_price", :with => "19,99"
+          fill_in "product_price", with: "19,99"
           click_button "Create"
           expect(page).to have_content("Name can't be blank")
           expect(page).to have_field('product_price', with: '19,99')
@@ -251,9 +251,9 @@ describe "Products", :type => :feature do
       end
 
       # Regression test for https://github.com/spree/spree/issues/2097
-      it "can set the count on hand to a null value", :js => true do
-        fill_in "product_name", :with => "Baseball Cap"
-        fill_in "product_price", :with => "100"
+      it "can set the count on hand to a null value", js: true do
+        fill_in "product_name", with: "Baseball Cap"
+        fill_in "product_price", with: "100"
         select @shipping_category.name, from: "product_shipping_category_id"
         click_button "Create"
         expect(page).to have_content("successfully created!")
@@ -262,8 +262,7 @@ describe "Products", :type => :feature do
       end
     end
 
-
-    context "cloning a product", :js => true do
+    context "cloning a product", js: true do
       it "should allow an admin to clone a product" do
         create(:product)
 
@@ -277,7 +276,7 @@ describe "Products", :type => :feature do
 
       context "cloning a deleted product" do
         it "should allow an admin to clone a deleted product" do
-          create(:product, :name => "apache baseball cap")
+          create(:product, name: "apache baseball cap")
 
           click_nav "Products"
           check "Show Deleted"
@@ -294,22 +293,22 @@ describe "Products", :type => :feature do
       end
     end
 
-    context 'updating a product', :js => true do
+    context 'updating a product', js: true do
       let(:product) { create(:product) }
 
       let(:prototype) do
         size = build_option_type_with_values("size", %w(Small Medium Large))
-        FactoryGirl.create(:prototype, :name => "Size", :option_types => [ size ])
+        FactoryGirl.create(:prototype, name: "Size", option_types: [size])
       end
 
       before(:each) do
         @option_type_prototype = prototype
-        @property_prototype = create(:prototype, :name => "Random")
+        @property_prototype = create(:prototype, name: "Random")
       end
 
       it 'should parse correctly available_on' do
         visit spree.admin_product_path(product)
-        fill_in "product_available_on", :with => "2012/12/25"
+        fill_in "product_available_on", with: "2012/12/25"
         click_button "Update"
         expect(page).to have_content("successfully updated!")
         expect(Spree::Product.last.available_on).to eq('Tue, 25 Dec 2012 00:00:00 UTC +00:00')
@@ -335,7 +334,7 @@ describe "Products", :type => :feature do
       end
     end
 
-    context 'deleting a product', :js => true do
+    context 'deleting a product', js: true do
       let!(:product) { create(:product) }
 
       it "is still viewable" do
@@ -358,12 +357,11 @@ describe "Products", :type => :feature do
   end
 
   context 'with only product permissions' 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, :update, :index, :read], Spree::Product
     end
     let!(:product) { create(:product) }

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Properties", :type => :feature do
+describe "Properties", type: :feature do
   stub_authorization!
 
   before(:each) do
@@ -10,8 +10,8 @@ describe "Properties", :type => :feature do
 
   context "Property index" do
     before do
-      create(:property, :name => 'shirt size', :presentation => 'size')
-      create(:property, :name => 'shirt fit', :presentation => 'fit')
+      create(:property, name: 'shirt size', presentation: 'size')
+      create(:property, name: 'shirt fit', presentation: 'fit')
       click_link "Properties"
     end
 
@@ -30,8 +30,8 @@ describe "Properties", :type => :feature do
     end
 
     context "searching properties" do
-      it 'should list properties matching search query', :js => true do
-        fill_in "q_name_cont", :with => "size"
+      it 'should list properties matching search query', js: true do
+        fill_in "q_name_cont", with: "size"
         click_icon :search
 
         expect(page).to have_content("shirt size")
@@ -41,13 +41,13 @@ describe "Properties", :type => :feature do
   end
 
   context "creating a property" do
-    it "should allow an admin to create a new product property", :js => true do
+    it "should allow an admin to create a new product property", js: true do
       click_link "Properties"
       click_link "new_property_link"
       within('#new_property') { expect(page).to have_content("NEW PROPERTY") }
 
-      fill_in "property_name", :with => "color of band"
-      fill_in "property_presentation", :with => "color"
+      fill_in "property_name", with: "color of band"
+      fill_in "property_presentation", with: "color"
       click_button "Create"
       expect(page).to have_content("successfully created!")
     end
@@ -61,20 +61,20 @@ describe "Properties", :type => :feature do
     end
 
     it "should allow an admin to edit an existing product property" do
-      fill_in "property_name", :with => "model 99"
+      fill_in "property_name", with: "model 99"
       click_button "Update"
       expect(page).to have_content("successfully updated!")
       expect(page).to have_content("model 99")
     end
 
     it "should show validation errors" do
-      fill_in "property_name", :with => ""
+      fill_in "property_name", with: ""
       click_button "Update"
       expect(page).to have_content("Name can't be blank")
     end
   end
 
-  context "linking a property to a product", :js => true do
+  context "linking a property to a product", js: true do
     before do
       create(:product)
       visit spree.admin_products_path
@@ -117,9 +117,9 @@ describe "Properties", :type => :feature do
     end
 
     def fill_in_property
-      expect(page).to have_content('Editing Product')
-      fill_in "product_product_properties_attributes_0_property_name", :with => "A Property"
-      fill_in "product_product_properties_attributes_0_value", :with => "A Value"
+      expect(page).to have_content('Products')
+      fill_in "product_product_properties_attributes_0_property_name", with: "A Property"
+      fill_in "product_product_properties_attributes_0_value", with: "A Value"
       click_button "Update"
       click_link "Product Properties"
     end

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Prototypes", :type => :feature do
+describe "Prototypes", type: :feature do
   stub_authorization!
 
   context "listing prototypes" do
@@ -18,7 +18,7 @@ describe "Prototypes", :type => :feature do
       create(:property, name: "shirt_fit", presentation: "Fit")
       create(:property, name: "bag_material", presentation: "Material")
       create(:property, name: "shirt_type", presentation: "Type")
-      p = create(:prototype, :name => "Shirt")
+      p = create(:prototype, name: "Shirt")
       %w( brand gender manufacturer model shirt_fabric shirt_fit shirt_sleeve_length shirt_type ).each do |prop|
         p.properties << Spree::Property.find_by_name(prop)
       end
@@ -42,7 +42,7 @@ describe "Prototypes", :type => :feature do
   end
 
   context "creating a prototype" do
-    it "should allow an admin to create a new product prototype", :js => true do
+    it "should allow an admin to create a new product prototype", js: true do
       visit spree.admin_path
       click_nav "Products"
       click_link "Prototypes"

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Stock Management", :type => :feature do
+describe "Stock Management", type: :feature do
   stub_authorization!
 
   before(:each) do
@@ -26,7 +26,7 @@ describe "Stock Management", :type => :feature do
     context "with no stock location" do
       before do
         @product = create(:product, name: 'apache baseball cap', price: 10)
-        v = @product.variants.create!(sku: 'FOOBAR')
+        @product.variants.create!(sku: 'FOOBAR')
         Spree::StockLocation.destroy_all
         click_link "Back To Products List"
         within_row(1) do
@@ -36,7 +36,7 @@ describe "Stock Management", :type => :feature do
       end
 
       it "renders" do
-        expect(page).to have_content(Spree.t(:editing_product))
+        expect(page).to have_content('Products / apache baseball cap')
         expect(page.current_url).to match("admin/products/apache-baseball-cap/stock")
       end
     end
@@ -54,13 +54,17 @@ describe "Stock Management", :type => :feature do
       stock_item.reload
       expect(stock_item.count_on_hand).to eq 4
       expect(stock_item.stock_movements.count).to eq 1
-      expect(stock_item.stock_movements.first.quantity).to eq -6
+      expect(stock_item.stock_movements.first.quantity).to eq(-6)
     end
 
     def adjust_count_on_hand(count_on_hand)
-      find(:css, ".fa-edit[data-id='#{stock_item.id}']").trigger('click')
-      find(:css, "[data-variant-id='#{variant.id}'] input[type='number']").set(count_on_hand)
-      find(:css, ".fa-check[data-id='#{stock_item.id}']").trigger('click')
+      within('.variant-stock-items', text: variant.sku) do
+        within('tr', text: stock_item.stock_location.name) do
+          click_icon :edit
+          find(:css, "input[type='number']").set(count_on_hand)
+          click_icon :check
+        end
+      end
       expect(page).to have_content('Updated successfully')
     end
 
@@ -71,10 +75,11 @@ describe "Stock Management", :type => :feature do
 
       it "can add stock items to other stock locations", js: true do
         visit current_url
-        fill_in "variant-count-on-hand-#{variant.id}", with: '3'
-        targetted_select2_search "Other location", from: "#s2id_variant-stock-location-#{variant.id}"
-        find(:css, ".fa-plus[data-variant-id='#{variant.id}']").click
-        wait_for_ajax
+        within('.variant-stock-items', text: variant.sku) do
+          fill_in "variant-count-on-hand-#{variant.id}", with: '3'
+          targetted_select2_search "Other location", from: "#s2id_variant-stock-location-#{variant.id}"
+          click_icon(:plus)
+        end
         expect(page).to have_content('Created successfully')
       end
     end