solidus_backend 2.8.6 → 2.9.0.rc.1

data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb

@@ -17,12 +17,12 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
           let!(:checkout_zone) { create(:zone, name: "Checkout Zone", countries: [canada]) }
 
           before do
-            Spree::Config.checkout_zone = checkout_zone.name
+            stub_spree_preferences(checkout_zone: checkout_zone.name)
           end
 
           context "and default_country_iso of the Canada" do
             before do
-              Spree::Config.default_country_iso = Spree::Country.find_by!(iso: "CA").iso
+              stub_spree_preferences(default_country_iso: Spree::Country.find_by!(iso: "CA").iso)
             end
 
             it 'defaults the shipping address country to Canada' do
@@ -38,7 +38,7 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
 
           context "and default_country_iso of the United States" do
             before do
-              Spree::Config.default_country_iso = Spree::Country.find_by!(iso: "US").iso
+              stub_spree_preferences(default_country_iso: Spree::Country.find_by!(iso: "US").iso)
             end
 
             it 'defaults the shipping address country to nil' do

data/spec/controllers/spree/admin/orders_controller_spec.rb

@@ -140,7 +140,7 @@ describe Spree::Admin::OrdersController, type: :controller do
         end
 
         context 'when order_bill_address_used is true' do
-          before { Spree::Config[:order_bill_address_used] = true }
+          before { stub_spree_preferences(order_bill_address_used: true) }
 
           it "should redirect to the customer details page" do
             get :edit, params: { id: order.number }
@@ -149,7 +149,7 @@ describe Spree::Admin::OrdersController, type: :controller do
         end
 
         context 'when order_bill_address_used is false' do
-          before { Spree::Config[:order_bill_address_used] = false }
+          before { stub_spree_preferences(order_bill_address_used: false) }
 
           it "should redirect to the customer details page" do
             get :edit, params: { id: order.number }

data/spec/controllers/spree/admin/stock_locations_controller_spec.rb

@@ -20,7 +20,7 @@ module Spree
         let(:country) { create :country, iso: "BR" }
 
         before do
-          Spree::Config[:default_country_iso] = country.iso
+          stub_spree_preferences(default_country_iso: country.iso)
         end
 
         it "can create a new stock location" do

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

@@ -124,7 +124,7 @@ describe "Adjustments", type: :feature do
         end
       end
 
-      expect(page).to have_content(/Total: ?\$170\.00/)
+      expect(page).to have_content('Total: $170.00', normalize_ws: true)
     end
   end
 end

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

@@ -70,10 +70,10 @@ describe "Customer Details", type: :feature, js: true do
 
   context "editing an order" do
     before do
-      configure_spree_preferences do |config|
-        config.default_country_iso = country.iso
-        config.company = true
-      end
+      stub_spree_preferences(
+        default_country_iso: country.iso,
+        company: true
+      )
 
       visit spree.admin_path
       click_link "Orders"
@@ -153,9 +153,7 @@ describe "Customer Details", type: :feature, js: true do
 
       before do
         order.bill_address.country.destroy
-        configure_spree_preferences do |config|
-          config.default_country_iso = brazil.iso
-        end
+        stub_spree_preferences(default_country_iso: brazil.iso)
       end
 
       it "sets default country when displaying form" do

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Customer returns', type: :feature do
+  stub_authorization!
+
+  context 'when the order has more than one line item' do
+    let(:order) { create :shipped_order, line_items_count: 2 }
+
+    context 'when creating a return with state "Received"' do
+      it 'marks the order as returned', :js do
+        visit spree.new_admin_order_customer_return_path(order)
+
+        find('#select-all').click
+        page.execute_script "$('select.add-item').val('receive')"
+        select 'NY Warehouse', from: 'Stock Location'
+        click_button 'Create'
+
+        expect(page).to have_content 'Customer Return has been successfully created'
+
+        within 'dd.order-state' do
+          expect(page).to have_content 'Returned'
+        end
+      end
+    end
+  end
+end

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

@@ -114,12 +114,7 @@ describe "Orders Listing", type: :feature, js: true do
 
       context "when pagination is really short" do
         before do
-          @old_per_page = Spree::Config[:orders_per_page]
-          Spree::Config[:orders_per_page] = 1
-        end
-
-        after do
-          Spree::Config[:orders_per_page] = @old_per_page
+          stub_spree_preferences(orders_per_page: 1)
         end
 
         # Regression test for https://github.com/spree/spree/issues/4004

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

@@ -23,7 +23,7 @@ describe "Log entries", type: :feature do
     it "shows a successful attempt" do
       visit spree.admin_order_payments_path(payment.order)
       click_on payment.number
-      click_link "Logs"
+
       within("#listing_log_entries") do
         expect(page).to have_content("Transaction successful")
       end
@@ -47,7 +47,7 @@ describe "Log entries", type: :feature do
     it "shows a failed attempt" do
       visit spree.admin_order_payments_path(payment.order)
       click_on payment.number
-      click_link "Logs"
+
       within("#listing_log_entries") do
         expect(page).to have_content("Transaction failed")
       end

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

@@ -208,12 +208,12 @@ describe "New Order", type: :feature do
 
     before do
       Spree::Country.update_all(states_required: true)
-      Spree::Config.checkout_zone = checkout_zone.name
+      stub_spree_preferences(checkout_zone: checkout_zone.name)
     end
 
     context 'and default_country_iso of the United States' do
       before do
-        Spree::Config.default_country_iso = Spree::Country.find_by!(iso: 'US').iso
+        stub_spree_preferences(default_country_iso: Spree::Country.find_by!(iso: 'US').iso)
       end
 
       it 'the shipping address country select includes only options for Canada' do
@@ -267,7 +267,7 @@ describe "New Order", type: :feature do
 
     context 'and default_country_iso of Canada' do
       before do
-        Spree::Config.default_country_iso = Spree::Country.find_by!(iso: 'CA').iso
+        stub_spree_preferences(default_country_iso: Spree::Country.find_by!(iso: 'CA').iso)
       end
 
       it 'defaults the shipping address country to Canada' do

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

@@ -191,9 +191,14 @@ describe "Order Details", type: :feature, js: true do
       end
 
       context 'splitting to location' do
-        # can not properly implement until poltergeist supports checking alert text
-        # see https://github.com/teampoltergeist/poltergeist/pull/516
-        it 'should warn you if you have not selected a location or shipment'
+        it 'should warn you if you have not selected a location or shipment' do
+          visit spree.edit_admin_order_path(order)
+
+          within('tr', text: line_item.sku) { click_icon 'arrows-h' }
+          accept_alert 'Please select the split destination.' do
+            click_icon :ok
+          end
+        end
 
         context 'there is enough stock at the other location' do
           it 'should allow me to make a split' do

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

@@ -5,17 +5,24 @@ require 'spec_helper'
 describe 'Payments', type: :feature do
   stub_authorization!
 
-  context "with a pre-existing payment" do
-    let!(:payment) do
-      create(:payment,
-        order:          order,
-        amount:         order.outstanding_balance,
+  let(:state) { 'checkout' }
+
+  def create_payment(opts = {})
+    create(
+      :payment,
+      {
+        order: order,
+        amount: order.outstanding_balance,
         payment_method: create(:credit_card_payment_method),
-        state:          state)
-    end
+        state: state
+      }.merge(opts)
+    )
+  end
+
+  context "with a pre-existing payment" do
+    let!(:payment) { create_payment }
 
     let(:order) { create(:completed_order_with_totals, number: 'R100', line_items_price: 50) }
-    let(:state) { 'checkout' }
 
     before do
       visit "/admin/orders/#{order.number}/payments"
@@ -24,12 +31,7 @@ describe 'Payments', type: :feature do
     # Regression tests for https://github.com/spree/spree/issues/1453
     context 'with a check payment', js: true do
       let(:order) { create(:completed_order_with_totals, number: 'R100') }
-      let!(:payment) do
-        create(:payment,
-          order:          order,
-          amount:         order.outstanding_balance,
-          payment_method: create(:check_payment_method, available_to_admin: true)) # Check
-      end
+      let!(:payment) { create_payment(payment_method: create(:check_payment_method, available_to_admin: true)) }
 
       it 'capturing a check payment from a new order' do
         click_icon(:capture)
@@ -49,11 +51,9 @@ describe 'Payments', type: :feature do
 
       visit spree.admin_order_payment_path(order, payment)
       expect(page).to have_content 'Capture Events'
-      # within '#capture_events' do
-      within_row(1) do
+      within '#capture_events' do
         expect(page).to have_content(capture_amount / 100)
       end
-      # end
     end
 
     it 'displays the address for a credit card when present' do
@@ -62,6 +62,57 @@ describe 'Payments', type: :feature do
       expect(page).to have_content 'my cc address'
     end
 
+    context 'when there are multiple pending payments', :js do
+      context 'while marking all payments as void' do
+        let(:card_payment_method) { create(:credit_card_payment_method) }
+
+        let!(:payment) do
+          create_payment(
+            payment_method: card_payment_method,
+            state: :pending
+          )
+        end
+
+        let!(:second_payment) do
+          create_payment(
+            payment_method: card_payment_method,
+            state: :pending
+          )
+        end
+
+        it 'updates the order payment state correctly at each iteration' do
+          visit current_path
+          expect(page).to have_css('#payment_status', text: 'Balance due')
+
+          within '#payments' do
+            expect(page).to have_selector('.pill-pending', count: 2)
+            within "#payment_#{payment.id}" do
+              find('.fa-void').click
+            end
+          end
+
+          expect(page).to have_css('#payment_status', text: 'Balance due')
+
+          within '#payments' do
+            expect(page).to have_selector('.pill-pending', count: 1)
+            within "#payment_#{payment.id}" do
+              expect(page).to have_selector('.pill-void', count: 1)
+            end
+          end
+
+          within "#payment_#{second_payment.id}" do
+            find('.fa-void').click
+          end
+
+          within '#payments' do
+            expect(page).not_to have_selector('.pill-pending')
+            expect(page).to have_selector('.pill-void', count: 2)
+          end
+          expect(page).to have_css('#payment_status', text: 'Failed')
+        end
+      end
+    end
+
     it 'lists, updates and creates payments for an order', js: true do
       within_row(1) do
         expect(column_text(3)).to eq('Credit Card')
@@ -70,7 +121,7 @@ describe 'Payments', type: :feature do
       end
 
       click_icon :void
-      expect(page).to have_css('#payment_status', text: 'Balance due')
+      expect(page).to have_css('#payment_status', text: 'Failed')
       expect(page).to have_content('Payment Updated')
 
       within_row(1) do
@@ -105,7 +156,7 @@ describe 'Payments', type: :feature do
         within_row(1) do
           click_icon(:edit)
           fill_in('amount', with: '$1')
-          click_icon(:save)
+          click_icon(:ok)
           expect(page).to have_selector('td.amount span', text: '$1.00')
           expect(payment.reload.amount).to eq(1.00)
         end
@@ -114,12 +165,7 @@ describe 'Payments', type: :feature do
       it 'allows the amount change to be cancelled by clicking on the cancel button' do
         within_row(1) do
           click_icon(:edit)
-
-          # Can't use fill_in here, as under poltergeist that will unfocus (and
-          # thus submit) the field under poltergeist
-          find('td.amount input').click
-          page.execute_script("$('td.amount input').val('$1')")
-
+          fill_in 'amount', with: '$1'
           click_icon(:cancel)
           expect(page).to have_selector('td.amount span', text: '$150.00')
           expect(payment.reload.amount).to eq(150.00)
@@ -130,7 +176,7 @@ describe 'Payments', type: :feature do
         within_row(1) do
           click_icon(:edit)
           fill_in('amount', with: 'invalid')
-          click_icon(:save)
+          click_icon(:ok)
         end
         expect(page).to have_selector('.flash.error', text: 'Invalid resource. Please fix errors and try again.')
         expect(payment.reload.amount).to eq(150.00)
@@ -159,9 +205,9 @@ describe 'Payments', type: :feature do
       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_with_force "Card Number", with: "4111 1111 1111 1111"
         fill_in "Name", with: "Test User"
-        fill_in "Expiration", with: "09 / #{Time.current.year + 1}"
+        fill_in_with_force "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)
@@ -182,7 +228,7 @@ describe 'Payments', type: :feature do
 
     context "user existing card" do
       let!(:cc) do
-        create(:credit_card, payment_method: payment_method, gateway_customer_profile_id: "BGS-RFRE")
+        create(:credit_card, payment_method: payment_method, gateway_customer_profile_id: "BGS-RFRE", user: order.user)
       end
 
       before do
@@ -216,12 +262,7 @@ describe 'Payments', type: :feature do
     context 'with a soft-deleted payment method' do
       let(:order) { create(:completed_order_with_totals, line_items_count: 1) }
       let!(:payment_method) { create(:check_payment_method) }
-      let!(:payment) do
-        create(:payment,
-          order:          order,
-          amount:         order.outstanding_balance,
-          payment_method: payment_method)
-      end
+      let!(:payment) { create_payment(payment_method: payment_method) }
 
       before do
         payment_method.discard
@@ -249,9 +290,9 @@ describe 'Payments', type: :feature do
 
     it "is able to create a new payment", js: true do
       choose payment_method.name
-      fill_in "Card Number", with: "4111 1111 1111 1111"
+      fill_in_with_force "Card Number", with: "4111 1111 1111 1111"
       fill_in "Name", with: "Test User"
-      fill_in "Expiration", with: "09 / #{Time.current.year + 1}"
+      fill_in_with_force "Expiration", with: "09 / #{Time.current.year + 1}"
       fill_in "Card Code", with: "007"
       click_button "Continue"
       expect(page).to have_content("Payment has been successfully created!")
@@ -278,9 +319,9 @@ describe 'Payments', type: :feature do
 
     it "displays an error" do
       choose payment_method.name
-      fill_in "Card Number", with: "4111 1111 1111 1111"
+      fill_in_with_force "Card Number", with: "4111 1111 1111 1111"
       fill_in "Name", with: "Test User"
-      fill_in "Expiration", with: "09 / #{Time.current.year + 1}"
+      fill_in_with_force "Expiration", with: "09 / #{Time.current.year + 1}"
       fill_in "Card Code", with: "007"
       click_button "Continue"
       expect(page).to have_content I18n.t('spree.insufficient_stock_for_order')

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

@@ -50,6 +50,31 @@ describe 'Product Details', type: :feature do
     end
   end
 
+  context "when default price is deleted" do
+    it "does not show the master price", js: true do
+      product = 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"
+      within_row(1) { click_icon :edit }
+
+      click_link 'Prices'
+
+      within "#spree_price_#{product.master.default_price.id}" do
+        accept_alert do
+          click_icon :trash
+        end
+      end
+      expect(page).to have_content("Price has been successfully removed")
+
+      click_link 'Product Details'
+
+      expect(page).not_to have_field('product_price')
+      expect(page).to have_content('This Product has no price in the default currency (USD).')
+    end
+  end
+
   # Regression test for https://github.com/spree/spree/issues/3385
   context "deleting a product", js: true do
     it "is still able to find the master variant" do

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

@@ -26,19 +26,13 @@ describe "Product Display Order", type: :feature do
       visit spree.edit_admin_product_path(product)
 
       assert_selected_taxons([taxon_1])
+
       select2_search "Clothing", from: "Taxon"
       assert_selected_taxons([taxon_1, taxon_2])
 
-      # Without this line we have a flaky spec probably due to select2 not
-      # closing its fixed overlay correctly. Clicking anywhere in the page
-      # before submit apparently solves the issue.
-      find('.edit_product', visible: true).click
-
       click_button "Update"
 
-      within('.flash') do
-        expect(page).to have_content(%(Product "#{product.name}" has been successfully updated!))
-      end
+      expect(find(".flash")).to have_text "Product \"#{product.name}\" has been successfully updated!"
       assert_selected_taxons([taxon_1, taxon_2])
     end