solidus_backend 2.1.1 → 2.2.0.beta1

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

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe "New Order", type: :feature do
+  include OrderFeatureHelper
+
   let!(:product) { create(:product_in_stock) }
   let!(:state) { create(:state) }
   let!(:store) { create(:store) }
@@ -24,18 +26,15 @@ describe "New Order", type: :feature do
 
   it "completes new order succesfully without using the cart", js: true do
     click_on 'Cart'
-    select2_search product.name, from: Spree.t(:name_or_sku)
-
-    fill_in_quantity("table.stock-levels", "quantity_0", 2)
+    add_line_item product.name
 
-    click_button 'Add'
     click_on "Customer"
 
     within "#select-customer" do
       targetted_select2_search user.email, from: "#s2id_customer_search"
     end
 
-    check "order_use_billing"
+    expect(page).to have_checked_field('order_use_billing')
     fill_in_address
     click_on "Update"
 
@@ -45,7 +44,7 @@ describe "New Order", type: :feature do
     expect(current_path).to eql(spree.admin_order_payments_path(Spree::Order.last))
 
     click_on "Confirm"
-    click_on "Complete"
+    click_on "Complete Order"
 
     expect(current_path).to eql(spree.edit_admin_order_path(Spree::Order.last))
 
@@ -53,7 +52,7 @@ describe "New Order", type: :feature do
     click_icon "capture"
 
     click_on "Shipments"
-    click_on "ship"
+    click_on "Ship"
 
     within '.carton-state' do
       expect(page).to have_content('shipped')
@@ -62,18 +61,15 @@ describe "New Order", type: :feature do
 
   it 'can create split payments', js: true do
     click_on 'Cart'
-    select2_search product.name, from: Spree.t(:name_or_sku)
+    add_line_item product.name
 
-    fill_in_quantity("table.stock-levels", "quantity_0", 2)
-
-    click_button 'Add'
     click_on "Customer"
 
     within "#select-customer" do
       targetted_select2_search user.email, from: "#s2id_customer_search"
     end
 
-    check "order_use_billing"
+    expect(page).to have_checked_field('order_use_billing')
     fill_in_address
     click_on "Update"
 
@@ -92,11 +88,7 @@ describe "New Order", type: :feature do
   context "adding new item to the order", js: true do
     it "inventory items show up just fine and are also registered as shipments" do
       click_on 'Cart'
-      select2_search product.name, from: Spree.t(:name_or_sku)
-
-      fill_in_quantity('table.stock-levels', 'quantity_0', 2)
-
-      click_button 'Add'
+      add_line_item product.name
 
       within(".line-items") do
         expect(page).to have_content(product.name)
@@ -108,7 +100,7 @@ describe "New Order", type: :feature do
         targetted_select2_search user.email, from: "#s2id_customer_search"
       end
 
-      check "order_use_billing"
+      expect(page).to have_checked_field('order_use_billing')
       fill_in_address
       click_on "Update"
 
@@ -128,11 +120,7 @@ describe "New Order", type: :feature do
 
     it "can still see line items" do
       click_on 'Cart'
-      select2_search product.name, from: Spree.t(:name_or_sku)
-
-      fill_in_quantity('table.stock-levels', 'quantity_0', 1)
-
-      click_button 'Add'
+      add_line_item product.name
 
       within(".line-items") do
         within(".line-item-name") do
@@ -157,7 +145,7 @@ describe "New Order", type: :feature do
         targetted_select2_search user.email, from: "#s2id_customer_search"
       end
 
-      check "order_use_billing"
+      expect(page).to have_checked_field('order_use_billing')
       fill_in_address
       click_on "Update"
 
@@ -180,17 +168,16 @@ describe "New Order", type: :feature do
 
   # Regression test for https://github.com/spree/spree/issues/5327
   context "customer with default credit card", js: true do
+    let!(:credit_card) { create(:credit_card, user: user) }
+
     before do
-      create(:credit_card, default: true, user: user)
+      user.wallet.add(credit_card)
     end
+
     it "transitions to delivery not to complete" do
       click_on 'Cart'
-      select2_search product.name, from: Spree.t(:name_or_sku)
-      within("table.stock-levels") do
-        find('.variant_quantity').set(1)
-      end
 
-      click_button 'Add'
+      add_line_item product.name
 
       expect(page).to have_css('.line-item')
 
@@ -219,7 +206,7 @@ describe "New Order", type: :feature do
     fill_in "Street Address",            with: "100 first lane"
     fill_in "Street Address (cont'd)",   with: "#101"
     fill_in "City",                      with: "Bethesda"
-    fill_in "Zip",                       with: "20170"
+    fill_in "Zip Code",                  with: "20170"
     targetted_select2_search state.name, from: "#s2id_order_#{kind}_address_attributes_state_id"
     fill_in "Phone",                     with: "123-456-7890"
   end

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

@@ -9,7 +9,7 @@ describe "Order Details", type: :feature, js: true do
   let!(:tote) { create(:product, name: "Tote", price: 15.00) }
   let(:order) { create(:order, state: 'complete', completed_at: "2011-02-01 12:36:15", number: "R100") }
   let(:state) { create(:state) }
-  # let(:shipment) { create(:shipment, :order => order, :stock_location => stock_location) }
+  # let(:shipment) { create(:shipment, order: order, stock_location: stock_location) }
   let!(:shipping_method) { create(:shipping_method, name: "Default") }
 
   before do
@@ -45,13 +45,8 @@ describe "Order Details", type: :feature, js: true do
         end
       end
 
-      it "can add an item to a shipment" do
-        select2_search "spree t-shirt", from: Spree.t(:name_or_sku)
-        within("table.stock-levels") do
-          fill_in "quantity_0", with: 2
-        end
-
-        click_button "Add"
+      it "can add an item" do
+        add_line_item "spree t-shirt", quantity: 2
 
         within("#order_total") do
           expect(page).to have_content("$80.00")
@@ -67,8 +62,10 @@ describe "Order Details", type: :feature, js: true do
           end
         end
 
-        expect(page).to have_content("Your order is empty") # wait for page refresh
         expect(page).not_to have_content("spree t-shirt")
+
+        # Should have a new item row
+        expect(page).to have_field('quantity')
       end
 
       # Regression test for https://github.com/spree/spree/issues/3862
@@ -111,11 +108,14 @@ describe "Order Details", type: :feature, js: true do
         expect(page).to have_content("Default")
       end
 
-      it "will show the variant sku" do
-        order = create(:completed_order_with_totals)
-        visit spree.edit_admin_order_path(order)
-        sku = order.line_items.first.variant.sku
-        expect(page).to have_content("SKU: #{sku}")
+      context "with a completed order" do
+        let!(:order) { create(:completed_order_with_totals) }
+
+        it "will show the variant sku" do
+          visit spree.edit_admin_order_path(order)
+          sku = order.line_items.first.variant.sku
+          expect(page).to have_content("SKU: #{sku}")
+        end
       end
 
       context "with special_instructions present" do
@@ -134,12 +134,7 @@ describe "Order Details", type: :feature, js: true do
         end
 
         it "adds variant to order just fine" do
-          select2_search tote.name, from: Spree.t(:name_or_sku)
-          within("table.stock-levels") do
-            fill_in "variant_quantity", with: 1
-          end
-
-          click_button 'Add'
+          add_line_item tote.name
 
           within(".line-items") do
             expect(page).to have_content(tote.name)
@@ -154,7 +149,8 @@ describe "Order Details", type: :feature, js: true do
         end
 
         it "doesn't display the out of stock variant in the search results" do
-          select2_search_without_selection product.name, from: ".variant_autocomplete"
+          click_on 'Add Item'
+          select2_search_without_selection product.name, from: ".select-variant"
 
           expect(page).to have_selector('.select2-no-results')
           within(".select2-no-results") do
@@ -229,7 +225,7 @@ describe "Order Details", type: :feature, js: true do
             within_row(1) { click_icon 'arrows-h' }
             complete_split_to(stock_location2, quantity: 'ff')
 
-            wait_for_ajax
+            accept_alert "undefined"
 
             expect(order.shipments.count).to eq(1)
             expect(order.shipments.first.inventory_units_for(product.master).count).to eq(2)
@@ -242,7 +238,7 @@ describe "Order Details", type: :feature, js: true do
             within_row(1) { click_icon 'arrows-h' }
             complete_split_to(stock_location2, quantity: 0)
 
-            wait_for_ajax
+            accept_alert "undefined"
 
             expect(order.shipments.count).to eq(1)
             expect(order.shipments.first.inventory_units_for(product.master).count).to eq(2)
@@ -251,7 +247,7 @@ describe "Order Details", type: :feature, js: true do
             fill_in 'item_quantity', with: -1
             click_icon :ok
 
-            wait_for_ajax
+            accept_alert "undefined"
 
             expect(order.shipments.count).to eq(1)
             expect(order.shipments.first.inventory_units_for(product.master).count).to eq(2)
@@ -282,7 +278,7 @@ describe "Order Details", type: :feature, js: true do
               within_row(1) { click_icon 'arrows-h' }
               complete_split_to(stock_location2, quantity: 2)
 
-              wait_for_ajax
+              accept_alert "undefined"
 
               expect(order.shipments.count).to eq(1)
               expect(order.shipments.first.inventory_units_for(product.master).count).to eq(2)
@@ -381,7 +377,7 @@ describe "Order Details", type: :feature, js: true do
               complete_split_to(@shipment2, quantity: 200)
             end
 
-            wait_for_ajax
+            accept_alert "undefined"
 
             expect(order.shipments.count).to eq(2)
             expect(order.shipments.first.inventory_units_for(product.master).count).to eq(1)
@@ -537,7 +533,6 @@ describe "Order Details", type: :feature, js: true do
       visit spree.edit_admin_order_path(order)
 
       find(".ship-shipment-button").click
-      wait_for_ajax
 
       within '.carton-state' do
         expect(page).to have_content('shipped')

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

@@ -113,16 +113,6 @@ describe 'Payments', type: :feature do
         end
       end
 
-      it 'allows the amount to be edited by clicking on the amount then saving' 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
-      end
-
       it 'allows the amount change to be cancelled by clicking on the cancel button' do
         within_row(1) do
           click_icon(:edit)
@@ -195,10 +185,13 @@ describe 'Payments', type: :feature do
 
     context "user existing card" do
       let!(:cc) do
-        create(:credit_card, user_id: order.user_id, payment_method: payment_method, gateway_customer_profile_id: "BGS-RFRE")
+        create(:credit_card, payment_method: payment_method, gateway_customer_profile_id: "BGS-RFRE")
       end
 
-      before { visit spree.admin_order_payments_path(order) }
+      before do
+        order.user.wallet.add(cc)
+        visit spree.admin_order_payments_path(order)
+      end
 
       it "is able to reuse customer payment source" do
         expect(find("#card_#{cc.id}")).to be_checked

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

@@ -30,13 +30,26 @@ describe "Shipments", type: :feature do
       end
     end
 
-    it "can ship a completed order" do
+    def ship_shipment
       find(".ship-shipment-button").click
-      wait_for_ajax
 
       expect(page).to have_content("shipped package")
       expect(order.reload.shipment_state).to eq("shipped")
     end
+
+    it "can ship a completed order" do
+      expect {
+        ship_shipment
+      }.to change{ ActionMailer::Base.deliveries.count }.by(1)
+    end
+
+    it "doesn't send a shipping confirmation email when ask to suppress the mailer" do
+      uncheck 'Send Mailer'
+
+      expect {
+        ship_shipment
+      }.not_to change{ ActionMailer::Base.deliveries.count }
+    end
   end
 
   context "moving variants between shipments", js: true do
@@ -66,5 +79,26 @@ describe "Shipments", type: :feature do
       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
+
+    context "with a ready-to-ship order" do
+      let(:variant) { create(:variant) }
+      let!(:order) do
+        create(
+          :order_ready_to_ship,
+          number: "R100",
+          line_items_attributes: [{ variant: variant, quantity: 5 }]
+        )
+      end
+
+      it "can transfer all items to a new location" do
+        expect(order.shipments.count).to eq(1)
+
+        within_row(1) { click_icon 'arrows-h' }
+        complete_split_to('LA', quantity: 5)
+
+        expect(page).to_not have_content("package from 'NY Warehouse'")
+        expect(page).to have_content("package from 'LA'")
+      end
+    end
   end
 end

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

@@ -50,7 +50,7 @@ describe "Product Images", type: :feature do
       visit spree.admin_product_images_path(product)
       expect(page).to have_content("No images found")
 
-      within_fieldset 'Upload Image' do
+      within_fieldset 'Upload Images' do
         # Can also pass multiple files in the array, but SQLite gives a deadlock on insert
         attach_file('image_attachment', [file_path], visible: false)
       end

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

@@ -41,9 +41,9 @@ describe 'Product Details', type: :feature do
 
       fill_in "product_slug", with: ''
       click_button "Update"
-      within('#product_slug_field') { expect(page).to have_content("is too short") }
+      within('#product_slug_field') { expect(page).to have_content("can't be blank") }
 
-      fill_in "product_slug", with: 'another-random-slug-value'
+      fill_in "product_slug", with: 'x'
       click_button "Update"
       expect(page).to have_content("successfully updated!")
     end
@@ -60,7 +60,7 @@ describe 'Product Details', type: :feature do
           click_icon :trash
         end
       end
-      wait_for_ajax
+      expect(page).to have_content('Product has been deleted')
     end
   end
 end

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

@@ -55,7 +55,7 @@ describe 'Pricing' do
             expect(page).to have_content("Search")
           end
         end
-        select variant.options_text, from: "q_variant_id_eq"
+        select variant.options_text, from: "q_variant_id_eq", exact: false
         click_button "Filter Results"
         expect(page).to have_content("20")
         expect(page).to_not have_content("49.99")

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, js: true do
   stub_authorization!
 
-  context "coupon promotions", js: true do
+  context "creating a new promotion", js: true do
     before(:each) do
       visit spree.admin_path
       click_link "Promotions"
@@ -12,8 +12,8 @@ describe "Promotion Adjustments", type: :feature do
 
     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 "Promotion Code", with: "order"
+
       click_button "Create"
       expect(page).to have_content("PromotionsPromotion")
 
@@ -48,8 +48,8 @@ describe "Promotion Adjustments", type: :feature do
     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 "Promotion Code", with: "single_use"
+
       click_button "Create"
       expect(page).to have_content("PromotionsPromotion")
 
@@ -73,6 +73,7 @@ describe "Promotion Adjustments", type: :feature do
 
     it "should allow an admin to create an automatic promo with flat percent discount" do
       fill_in "Name", with: "Promotion"
+      choose "Apply to all orders"
       click_button "Create"
       expect(page).to have_content("PromotionsPromotion")
 
@@ -107,6 +108,7 @@ describe "Promotion Adjustments", type: :feature do
       create(:product, name: "RoR Mug")
 
       fill_in "Name", with: "Promotion"
+      choose "Apply to all orders"
       click_button "Create"
       expect(page).to have_content("PromotionsPromotion")
 
@@ -138,6 +140,7 @@ describe "Promotion Adjustments", type: :feature do
 
     it "should allow an admin to create an automatic promotion with free shipping (no code)" do
       fill_in "Name", with: "Promotion"
+      choose "Apply to all orders"
       click_button "Create"
       expect(page).to have_content("PromotionsPromotion")
 
@@ -156,33 +159,52 @@ describe "Promotion Adjustments", type: :feature do
       expect(promotion.actions.first).to be_a(Spree::Promotion::Actions::FreeShipping)
     end
 
-    it "should allow an admin to create an automatic promo requiring a landing page to be visited" do
+    it "should allow an admin to create an automatic promotion" do
       fill_in "Name", with: "Promotion"
-      fill_in "Path", with: "content/cvv"
+      choose "Apply to all orders"
       click_button "Create"
       expect(page).to have_content("PromotionsPromotion")
 
-      select2 "Create whole-order adjustment", from: "Add action of type"
-      within('#action_fields') { click_button "Add" }
-      select2 "Flat Rate", from: "Calculator"
-      within('#actions_container') { click_button "Update" }
-      within('.calculator-fields') { fill_in "Amount", with: "4" }
-      within('#actions_container') { click_button "Update" }
+      promotion = Spree::Promotion.find_by_name("Promotion")
+      expect(promotion).to be_apply_automatically
+      expect(promotion.path).to be_nil
+      expect(promotion.codes).to be_empty
+      expect(promotion.rules).to be_blank
+    end
+
+    it "should allow an admin to create a promo requiring a landing page to be visited" do
+      fill_in "Name", with: "Promotion"
+      choose "URL Path"
+      fill_in "Path", with: "content/cvv"
+      click_button "Create"
+      expect(page).to have_content("PromotionsPromotion")
 
       promotion = Spree::Promotion.find_by_name("Promotion")
       expect(promotion.path).to eq("content/cvv")
-      expect(promotion.codes.first).to be_nil
+      expect(promotion).not_to be_apply_automatically
+      expect(promotion.codes).to be_empty
       expect(promotion.rules).to be_blank
+    end
 
-      first_action = promotion.actions.first
-      expect(first_action.class).to eq(Spree::Promotion::Actions::CreateAdjustment)
-      first_action_calculator = first_action.calculator
-      expect(first_action_calculator.class).to eq(Spree::Calculator::FlatRate)
-      expect(first_action_calculator.preferred_amount).to eq(4)
+    it "should allow an admin to create a promo with generated codes" do
+      fill_in "Name", with: "Promotion"
+      choose "Multiple promotion codes"
+      fill_in "Base code", with: "testing"
+      fill_in "Number of codes", with: "10"
+      click_button "Create"
+      expect(page).to have_content("PromotionsPromotion")
+
+      promotion = Spree::Promotion.find_by_name("Promotion")
+      expect(promotion.path).to be_nil
+      expect(promotion).not_to be_apply_automatically
+      expect(promotion.rules).to be_blank
+
+      expect(promotion.codes.count).to eq(10)
     end
 
     it "ceasing to be eligible for a promotion with item total rule then becoming eligible again" do
       fill_in "Name", with: "Promotion"
+      choose "Apply to all orders"
       click_button "Create"
       expect(page).to have_content("PromotionsPromotion")