solidus_backend 2.7.4 → 2.9.2

data/spec/features/admin/configuration/payment_methods_spec.rb

@@ -21,8 +21,8 @@ describe "Payment Methods", type: :feature do
       within("table#listing_payment_methods") do
         expect(all("th")[1].text).to eq("Name")
         expect(all("th")[2].text).to eq("Type")
-        expect(all("th")[3].text).to eq("Available to users")
-        expect(all("th")[4].text).to eq("Available to admin")
+        expect(all("th")[3].text).to eq("Available to Users")
+        expect(all("th")[4].text).to eq("Available to Admin")
         expect(all("th")[5].text).to eq("State")
       end
 

data/spec/features/admin/configuration/shipping_methods_spec.rb

@@ -18,7 +18,7 @@ describe "Shipping Methods", type: :feature do
       within_row(1) do
         expect(column_text(1)).to eq(shipping_method.name)
         expect(column_text(2)).to eq(zone.name)
-        expect(column_text(3)).to eq("Flat rate")
+        expect(column_text(3)).to eq("Flat Rate")
         expect(column_text(4)).to eq("Yes")
       end
     end
@@ -99,7 +99,7 @@ describe "Shipping Methods", type: :feature do
         click_icon :edit
       end
 
-      select 'Flexible Rate per package item', from: 'Base Calculator'
+      select 'Flexible Rate per Package Item', from: 'Base Calculator'
 
       fill_in 'First Item', with: 10
       fill_in 'Additional Item', with: 20

data/spec/features/admin/homepage_spec.rb

@@ -23,10 +23,6 @@ describe "Homepage", type: :feature do
         expect(page).to have_link("Products", href: "/admin/products", count: 2)
       end
 
-      it "should have a link to reports" do
-        expect(page).to have_link("Reports", href: "/admin/reports")
-      end
-
       it "should have a link to configuration" do
         expect(page).to have_link("Settings", href: "/admin/stores")
       end
@@ -71,7 +67,7 @@ describe "Homepage", type: :feature do
 
   context 'as fakedispatch user' do
     before do
-      allow_any_instance_of(Spree::Admin::BaseController).to receive(:spree_current_user).and_return(nil)
+      allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(nil)
     end
 
     custom_authorization! do |_user|
@@ -84,7 +80,6 @@ describe "Homepage", type: :feature do
       expect(page).to have_link('Orders')
       expect(page).not_to have_link('Products')
       expect(page).not_to have_link('Promotions')
-      expect(page).not_to have_link('Reports')
       expect(page).not_to have_link('Settings')
     end
   end

data/spec/features/admin/locale_spec.rb

@@ -19,12 +19,11 @@ describe "setting locale", type: :feature do
         },
         listing_orders: "Ordres"
       })
-    Spree::Backend::Config[:locale] = "fr"
+    stub_spree_preferences(Spree::Backend::Config, locale: "fr")
   end
 
   after do
     I18n.locale = I18n.default_locale
-    Spree::Backend::Config[:locale] = "en"
     ActionView::Base.raise_on_missing_translations = true
   end
 

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

@@ -47,7 +47,7 @@ describe "Orders Listing", type: :feature, js: true do
       within_row(1) { expect(page).to have_content("R100") }
       within_row(2) { expect(page).to have_content("R200") }
 
-      click_link "Completed At", exact: false
+      click_link "Completed at", exact: false
 
       # Completed at desc
       within_row(1) { expect(page).to have_content("R200") }
@@ -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

@@ -201,6 +201,123 @@ describe "New Order", type: :feature do
     end
   end
 
+  context 'with a checkout_zone set as the country of Canada' do
+    let!(:canada) { create(:country, iso: 'CA', states_required: true) }
+    let!(:canada_state) { create(:state, country: canada) }
+    let!(:checkout_zone) { create(:zone, name: 'Checkout Zone', countries: [canada]) }
+
+    before do
+      Spree::Country.update_all(states_required: true)
+      stub_spree_preferences(checkout_zone: checkout_zone.name)
+    end
+
+    context 'and default_country_iso of the United States' do
+      before do
+        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
+        visit spree.new_admin_order_path
+        click_link 'Customer'
+        within '#shipping' do
+          expect(page).to have_select(
+            'Country',
+            options: ['Canada']
+          )
+        end
+      end
+
+      it 'does not show any shipping address state' do
+        visit spree.new_admin_order_path
+        click_link 'Customer'
+        within '#shipping' do
+          expect(page).to have_select(
+            'State',
+            disabled: true,
+            visible: false,
+            options: ['']
+          )
+        end
+      end
+
+      it 'the billing address country select includes only options for Canada' do
+        visit spree.new_admin_order_path
+        click_link 'Customer'
+        within '#billing' do
+          expect(page).to have_select(
+            'Country',
+            options: ['Canada']
+          )
+        end
+      end
+
+      it 'does not show any billing address state' do
+        visit spree.new_admin_order_path
+        click_link 'Customer'
+        within '#billing' do
+          expect(page).to have_select(
+            'State',
+            disabled: true,
+            visible: false,
+            options: ['']
+          )
+        end
+      end
+    end
+
+    context 'and default_country_iso of Canada' do
+      before do
+        stub_spree_preferences(default_country_iso: Spree::Country.find_by!(iso: 'CA').iso)
+      end
+
+      it 'defaults the shipping address country to Canada' do
+        visit spree.new_admin_order_path
+        click_link 'Customer'
+        within '#shipping' do
+          expect(page).to have_select(
+            'Country',
+            selected: 'Canada',
+            options: ['Canada']
+          )
+        end
+      end
+
+      it 'shows relevant shipping address states' do
+        visit spree.new_admin_order_path
+        click_link 'Customer'
+        within '#shipping' do
+          expect(page).to have_select(
+            'State',
+            options: [''] + canada.states.map(&:name)
+          )
+        end
+      end
+
+      it 'defaults the billing address country to Canada' do
+        visit spree.new_admin_order_path
+        click_link 'Customer'
+        within '#billing' do
+          expect(page).to have_select(
+            'Country',
+            selected: 'Canada',
+            options: ['Canada']
+          )
+        end
+      end
+
+      it 'shows relevant billing address states' do
+        visit spree.new_admin_order_path
+        click_link 'Customer'
+        within '#billing' do
+          expect(page).to have_select(
+            'State',
+            options: [''] + canada.states.map(&:name)
+          )
+        end
+      end
+    end
+  end
+
   def fill_in_address
     fill_in "First Name",                with: "John 99"
     fill_in "Last Name",                 with: "Doe"

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'New Refund creation', :js do
+  stub_authorization!
+
+  let(:order) { create :order_ready_to_ship }
+  let(:payment) { order.payments.first }
+  let(:amount) { '10.99' }
+  let!(:reason) { create :refund_reason }
+
+  it 'creates a new refund' do
+    visit spree.new_admin_order_payment_refund_path(order, payment)
+    expect(page).not_to have_selector 'td', text: amount
+    within '.new_refund' do
+      fill_in 'refund_amount', with: amount
+      select reason.name, from: 'Reason'
+      click_button 'Refund'
+    end
+    expect(page).to have_content 'Refund has been successfully created!'
+    expect(page).to have_selector 'td', text: amount
+  end
+
+  it 'disables the button at submit' do
+    visit spree.new_admin_order_payment_refund_path(order, payment)
+    page.execute_script "$('form').submit(function(e) { e.preventDefault()})"
+    within '.new_refund' do
+      fill_in 'refund_amount', with: amount
+      select reason.name, from: 'Reason'
+      click_button 'Refund'
+      expect(find('input[type="submit"]')).to be_disabled
+    end
+  end
+end

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
@@ -415,7 +420,7 @@ describe "Order Details", type: :feature, js: true do
           it 'should not allow a shipment to split stock to itself' do
             visit spree.edit_admin_order_path(order)
             within('tr', text: line_item.sku) { click_icon 'arrows-h' }
-            click_on 'Choose location'
+            click_on 'Choose Location'
             within '.select2-results' do
               expect(page).to have_content(shipment2.number)
               expect(page).not_to have_content(shipment1.number)
@@ -499,7 +504,7 @@ describe "Order Details", type: :feature, js: true do
 
   context 'with only read permissions' do
     before do
-      allow_any_instance_of(Spree::Admin::BaseController).to receive(:spree_current_user).and_return(nil)
+      allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(nil)
     end
 
     custom_authorization! do |_user|

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

@@ -5,31 +5,33 @@ 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"
     end
 
     # Regression tests for https://github.com/spree/spree/issues/1453
-    context 'with a check payment' do
+    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
@@ -205,7 +251,7 @@ describe 'Payments', type: :feature do
         visit spree.admin_order_payments_path(order.reload)
       end
 
-      it "can successfully be created and captured" do
+      it "can successfully be created and captured", js: true do
         click_on 'Update'
         expect(page).to have_content("Payment has been successfully created!")
         click_icon(:capture)
@@ -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')