solidus_backend 2.3.1 → 2.4.0.beta1

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

@@ -9,11 +9,6 @@ describe Spree::Admin::OrdersController, type: :controller do
 
     before do
       request.env["HTTP_REFERER"] = "http://localhost:3000"
-
-      # ensure no respond_overrides are in effect
-      if Spree::BaseController.spree_responders[:OrdersController].present?
-        Spree::BaseController.spree_responders[:OrdersController].clear
-      end
     end
 
     let(:order) do

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

@@ -13,7 +13,7 @@ module Spree
       describe '#create' do
         context "with a valid credit card" do
           let(:order) { create(:order_with_line_items, state: "payment") }
-          let(:payment_method) { create(:credit_card_payment_method, available_to_admin: true, available_to_users: false) }
+          let(:payment_method) { create(:credit_card_payment_method, available_to_admin: true) }
           let(:attributes) do
             {
               order_id: order.number,

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

@@ -13,7 +13,7 @@ describe Spree::Admin::SearchController, type: :controller do
   end
 
   describe 'GET #users' do
-    subject { get :users, params: { format: :json }.merge(params) }
+    subject { get :users, params: params, as: :json }
 
     shared_examples_for 'user found by search' do
       it "should include users matching query" do
@@ -66,7 +66,7 @@ describe Spree::Admin::SearchController, type: :controller do
     let!(:product_one) { create(:product, name: 'jersey') }
     let!(:product_two) { create(:product, name: 'better jersey') }
 
-    subject { get :products, params: params }
+    subject { get :products, params: params, as: :json }
 
     shared_examples_for 'product search' do
       it 'should respond with http success' do

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

@@ -19,7 +19,7 @@ describe "Payment Methods", type: :feature do
         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")[5].text).to eq("Active")
+        expect(all("th")[5].text).to eq("State")
       end
 
       within('table#listing_payment_methods') do

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

@@ -6,7 +6,7 @@ describe "Zones", type: :feature do
   before(:each) do
     Spree::Zone.delete_all
     visit spree.admin_path
-    click_link "Locations"
+    click_link "Zones"
   end
 
   context "show" do

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

@@ -22,7 +22,7 @@ describe "Adjustments", type: :feature do
   let!(:adjustment) { order.adjustments.create!(order: order, label: 'Rebate', amount: 10) }
 
   before(:each) do
-    order.update!
+    order.recalculate
 
     visit spree.admin_path
     click_link "Orders"

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

@@ -21,9 +21,9 @@ describe "Cancelling + Resuming", type: :feature do
 
   it "can cancel an order" do
     visit spree.edit_admin_order_path(order.number)
-    click_button 'cancel'
+    click_button 'Cancel'
     within(".additional-info") do
-      expect(find('dt#order_status + dd')).to have_content("canceled")
+      expect(find('dt#order_status + dd')).to have_content("Canceled")
     end
   end
 
@@ -34,9 +34,9 @@ describe "Cancelling + Resuming", type: :feature do
 
     it "can resume an order" do
       visit spree.edit_admin_order_path(order.number)
-      click_button 'resume'
+      click_button 'Resume'
       within(".additional-info") do
-        expect(find('dt#order_status + dd')).to have_content("resumed")
+        expect(find('dt#order_status + dd')).to have_content("Resumed")
       end
     end
   end

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

@@ -32,7 +32,7 @@ describe "Cancel items" do
 
       click_button "Cancel Items"
       expect(page).to have_content("Inventory canceled")
-      expect(page).to have_content("1 x canceled")
+      expect(page).to have_content("1 x Canceled")
     end
   end
 

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

@@ -48,6 +48,13 @@ describe "Customer Details", type: :feature, js: true do
       expect(Spree::Order.last.user).not_to be_nil
     end
 
+    # Regression test for https://github.com/solidusio/solidus/pull/2176
+    it "does not reset guest checkout to true when returning to customer tab" do
+      click_button "Update"
+      click_link "Customer"
+      expect(find('#guest_checkout_true')).not_to be_checked
+    end
+
     context "when required quantity is more than available" do
       let(:quantity) { 11 }
       let!(:product) { create(:product_not_backorderable) }
@@ -103,7 +110,7 @@ describe "Customer Details", type: :feature, js: true do
       # Regression test for https://github.com/spree/spree/issues/2950 and https://github.com/spree/spree/issues/2433
       # This act should transition the state of the order as far as it will go too
       within("#order_tab_summary") do
-        expect(find("dt#order_status + dd")).to have_content("complete")
+        expect(find("dt#order_status + dd")).to have_content("Complete")
       end
     end
 

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

@@ -32,7 +32,7 @@ describe "Orders Listing", type: :feature, js: true do
     it "should list existing orders" do
       within_row(1) do
         expect(column_text(2)).to eq "R100"
-        expect(column_text(3)).to eq "cart"
+        expect(column_text(3)).to eq "Cart"
       end
 
       within_row(2) do

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

@@ -54,7 +54,7 @@ describe "New Order", type: :feature do
     click_on "Ship"
 
     within '.carton-state' do
-      expect(page).to have_content('shipped')
+      expect(page).to have_content('Shipped')
     end
   end
 
@@ -155,8 +155,8 @@ describe "New Order", type: :feature do
       click_on "Payments"
       click_on "Continue"
 
-      within(".additional-info .state") do
-        expect(page).to have_content("confirm")
+      within(".additional-info") do
+        expect(page).to have_content("Confirm")
       end
     end
   end

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

@@ -90,7 +90,7 @@ describe "Order Details", type: :feature, js: true do
         click_icon :check
 
         expect(page).not_to have_css("input[name=tracking]")
-        expect(page).to have_content("Tracking: FOOBAR")
+        expect(page).to have_content("Tracking Number FOOBAR")
       end
 
       it "can change the shipping method" do
@@ -99,7 +99,7 @@ describe "Order Details", type: :feature, js: true do
         within("table.index tr.show-method") do
           click_icon :edit
         end
-        select "UPS Ground $100.00", from: "Shipping Method"
+        select "UPS Ground $100.00", from: "selected_shipping_rate_id"
         click_icon :check
 
         expect(page).not_to have_css('#selected_shipping_rate_id')
@@ -195,7 +195,7 @@ describe "Order Details", type: :feature, js: true do
             within_row(1) { click_icon 'arrows-h' }
             complete_split_to(stock_location2, quantity: 2)
 
-            expect(page).to have_content("pending package from 'Clarksville'")
+            expect(page).to have_content("Pending package from 'Clarksville'")
 
             expect(order.shipments.count).to eq(1)
             expect(order.shipments.last.backordered?).to eq(false)
@@ -203,17 +203,17 @@ describe "Order Details", type: :feature, js: true do
             expect(order.shipments.first.stock_location.id).to eq(stock_location2.id)
           end
 
-          it 'should allow me to split more than I have if available there' do
+          it 'should not allow me to split more than I had in the original shipment' do
             expect(order.shipments.first.stock_location.id).to eq(stock_location.id)
 
             within_row(1) { click_icon 'arrows-h' }
             complete_split_to(stock_location2, quantity: 5)
 
-            expect(page).to have_content("pending package from 'Clarksville'")
+            expect(page).to have_content("Pending package from 'Clarksville'")
 
             expect(order.shipments.count).to eq(1)
             expect(order.shipments.last.backordered?).to eq(false)
-            expect(order.shipments.first.inventory_units_for(product.master).count).to eq(5)
+            expect(order.shipments.first.inventory_units_for(product.master).count).to eq(2)
             expect(order.shipments.first.stock_location.id).to eq(stock_location2.id)
           end
 
@@ -222,7 +222,7 @@ describe "Order Details", type: :feature, js: true do
 
             within_row(1) { click_icon 'arrows-h' }
 
-            accept_alert "Unable to complete split" do
+            accept_alert "Quantity must be greater than 0" do
               complete_split_to(stock_location2, quantity: 0)
             end
 
@@ -232,7 +232,7 @@ describe "Order Details", type: :feature, js: true do
 
             fill_in 'item_quantity', with: -1
 
-            accept_alert "Unable to complete split" do
+            accept_alert "Quantity must be greater than 0" do
               click_icon :ok
             end
 
@@ -265,7 +265,7 @@ describe "Order Details", type: :feature, js: true do
               within_row(1) { click_icon 'arrows-h' }
               complete_split_to(stock_location2, quantity: 2)
 
-              accept_alert "Unable to complete split"
+              accept_alert "Desired shipment not enough stock in desired stock location"
 
               expect(order.shipments.count).to eq(1)
               expect(order.shipments.first.inventory_units_for(product.master).count).to eq(2)
@@ -281,7 +281,7 @@ describe "Order Details", type: :feature, js: true do
               within_row(1) { click_icon 'arrows-h' }
               complete_split_to(stock_location2, quantity: 2)
 
-              expect(page).to have_content("pending package from 'Clarksville'")
+              expect(page).to have_content("Pending package from 'Clarksville'")
 
               expect(order.shipments.count).to eq(1)
               expect(order.shipments.first.inventory_units_for(product.master).count).to eq(2)
@@ -364,7 +364,7 @@ describe "Order Details", type: :feature, js: true do
             within(all('.stock-contents', count: 2).first) do
               within_row(1) { click_icon 'arrows-h' }
 
-              accept_alert("Unable to complete split") do
+              accept_alert("Desired shipment not enough stock in desired stock location") do
                 complete_split_to(@shipment2, quantity: 200)
               end
             end
@@ -404,6 +404,7 @@ describe "Order Details", type: :feature, js: true do
 
         context 'receiving shipment can backorder' do
           it 'should add more to the backorder' do
+            @shipment1.inventory_units.update_all(state: :on_hand)
             product.master.stock_items.last.update_column(:backorderable, true)
             product.master.stock_items.last.update_column(:count_on_hand, 0)
             expect(@shipment2.reload.backordered?).to eq(false)
@@ -411,16 +412,16 @@ describe "Order Details", type: :feature, js: true do
             within_row(1) { click_icon 'arrows-h' }
             complete_split_to(@shipment2, quantity: 1)
 
-            expect(page).to have_content("1 x backordered")
+            expect(page).to have_content("1 x Backordered")
 
-            within('.stock-contents', text: "1 x on hand") do
+            within('.stock-contents', text: "1 x On hand") do
               within_row(1) { click_icon 'arrows-h' }
               complete_split_to(@shipment2, quantity: 1)
             end
 
             # Empty shipment should be removed
             expect(page).to have_css('.stock-contents', count: 1)
-            expect(page).to have_content("2 x backordered")
+            expect(page).to have_content("2 x Backordered")
           end
         end
       end
@@ -510,7 +511,7 @@ describe "Order Details", type: :feature, js: true do
       within("table.index tr.show-method") do
         click_icon :edit
       end
-      select "UPS Ground $100.00", from: "Shipping Method"
+      select "UPS Ground $100.00", from: "selected_shipping_rate_id"
       click_icon :check
 
       expect(page).not_to have_css('#selected_shipping_rate_id')
@@ -525,7 +526,7 @@ describe "Order Details", type: :feature, js: true do
       find(".ship-shipment-button").click
 
       within '.carton-state' do
-        expect(page).to have_content('shipped')
+        expect(page).to have_content('Shipped')
       end
     end
   end

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

@@ -66,17 +66,17 @@ describe 'Payments', type: :feature do
       within_row(1) do
         expect(column_text(3)).to eq('$150.00')
         expect(column_text(4)).to eq('Credit Card')
-        expect(column_text(6)).to eq('checkout')
+        expect(column_text(6)).to eq('Checkout')
       end
 
       click_icon :void
-      expect(page).to have_css('#payment_status', text: 'balance due')
+      expect(page).to have_css('#payment_status', text: 'Balance due')
       expect(page).to have_content('Payment Updated')
 
       within_row(1) do
         expect(column_text(3)).to eq('$150.00')
         expect(column_text(4)).to eq('Credit Card')
-        expect(column_text(6)).to eq('void')
+        expect(column_text(6)).to eq('Void')
       end
 
       click_on 'New Payment'
@@ -86,7 +86,7 @@ describe 'Payments', type: :feature do
 
       click_icon(:capture)
 
-      expect(page).to have_selector('#payment_status', text: 'paid')
+      expect(page).to have_selector('#payment_status', text: 'Paid')
       expect(page).not_to have_selector('#new_payment_section')
     end
 

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

@@ -28,10 +28,10 @@ describe 'Order Risk Analysis', type: :feature do
     end
 
     it "can be approved" do
-      click_button('approve')
+      click_button('Approve')
       expect(page).to have_content 'Approver'
       expect(page).to have_content 'Approved at'
-      expect(page).to have_content 'Status: complete'
+      expect(page).to have_content 'Status: Complete'
     end
   end
 

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

@@ -33,7 +33,7 @@ describe "Shipments", type: :feature do
     def ship_shipment
       find(".ship-shipment-button").click
 
-      expect(page).to have_content("shipped package")
+      expect(page).to have_content("Shipped package")
       expect(order.reload.shipment_state).to eq("shipped")
     end
 

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

@@ -147,7 +147,7 @@ describe "Product Images", type: :feature do
       end
 
       # ensure correct cell count
-      expect(page).to have_css("thead th", count: 3)
+      expect(page).to have_css("thead th", count: 4)
     end
   end
 end

data/spec/features/admin/store_credits_spec.rb

@@ -23,7 +23,7 @@ describe "Store credits admin" do
       click_link "Store Credit"
       expect(page.current_path).to eq spree.admin_user_store_credits_path(store_credit.user)
 
-      store_credit_table = page.find("#sc-table")
+      store_credit_table = page.find(".sc-table")
       expect(store_credit_table).to have_css('tr', count: 1)
       expect(store_credit_table).to have_content(Spree::Money.new(store_credit.amount).to_s)
       expect(store_credit_table).to have_content(Spree::Money.new(store_credit.amount_used).to_s)
@@ -48,7 +48,7 @@ describe "Store credits admin" do
       click_button "Create"
 
       expect(page.current_path).to eq spree.admin_user_store_credits_path(store_credit.user)
-      store_credit_table = page.find("#sc-table")
+      store_credit_table = page.find(".sc-table")
       expect(store_credit_table).to have_css('tr', count: 2)
       expect(Spree::StoreCredit.count).to eq 2
     end
@@ -67,7 +67,7 @@ describe "Store credits admin" do
     end
 
     it "updates the store credit's amount" do
-      page.find("#sc-table td.actions a.fa-edit").click
+      page.find(".sc-table td.actions a.fa-edit").click
       expect(page).to have_content 'Store credit history'
       click_link "Change amount"
       expect(page).to have_content 'Editing store credit amount'

data/spec/features/admin/stores_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe 'Stores', type: :feature do
+  stub_authorization!
+
+  context 'when adding a store' do
+    before { visit spree.new_admin_store_path }
+
+    it 'admin should be able to set the default_currency' do
+      expect(find('#store_default_currency').value).to eq ''
+
+      fill_in 'store_name', with: 'Solidus Store'
+      fill_in 'store_code', with: 'solidus'
+      fill_in 'store_url', with: 'example.solidus.io'
+      fill_in 'store_mail_from_address', with: 'from@solidus.io'
+      select 'EUR', from: 'store_default_currency'
+      click_button 'Create'
+
+      @store = Spree::Store.last
+
+      expect(@store.default_currency).to eq 'EUR'
+    end
+  end
+
+  context 'when editing a store' do
+    let(:store) { create :store, default_currency: 'AUD' }
+    before { visit spree.edit_admin_store_path(store) }
+
+    it 'admin should be able to change the default_currency' do
+      select 'EUR', from: 'store_default_currency'
+      click_button 'Update'
+      expect(store.reload.default_currency).to eq 'EUR'
+    end
+  end
+end

data/spec/features/admin/users_spec.rb

@@ -5,6 +5,8 @@ describe 'Users', type: :feature do
   let!(:country) { create(:country) }
   let!(:user_a) { create(:user_with_addresses, email: 'a@example.com') }
   let!(:user_b) { create(:user_with_addresses, email: 'b@example.com') }
+  let!(:admin_role) { create(:role, name: 'admin') }
+  let!(:user_role) { create(:role, name: 'user') }
 
   let(:order) { create(:completed_order_with_totals, user: user_a, number: "R123") }
 
@@ -62,7 +64,8 @@ describe 'Users', type: :feature do
 
     it "can sort desc" do
       within_table(table_id) do
-        click_link sort_link
+        # Ransack adds a ▲ to the sort link. With exact match Capybara is not able to find that link
+        click_link sort_link, exact: false
 
         expect(page).to have_text text_match_1
         expect(page).to have_text text_match_2
@@ -86,7 +89,7 @@ describe 'Users', type: :feature do
       end
     end
 
-    it 'displays the correct results for a user search' do
+    it 'displays the correct results for a user search by email' do
       fill_in 'q_email_cont', with: user_a.email
       click_button 'Search'
       within_table('listing_users') do
@@ -94,6 +97,41 @@ describe 'Users', type: :feature do
         expect(page).not_to have_text user_b.email
       end
     end
+
+    context "member since" do
+      it_behaves_like "a sortable attribute" do
+        let(:text_match_1) { user_a.email }
+        let(:text_match_2) { user_b.email }
+        let(:table_id) { "listing_users" }
+        let(:sort_link) { Spree.t(:member_since) }
+      end
+
+      it 'displays the correct results for a user search by creation date' do
+        user_a.update_column(:created_at, 2.weeks.ago)
+        fill_in 'q_created_at_lt', with: 1.week.ago
+        click_button 'Search'
+        within_table('listing_users') do
+          expect(page).to have_text user_a.email
+          expect(page).not_to have_text user_b.email
+        end
+      end
+    end
+
+    context 'with users having roles' do
+      before do
+        user_a.spree_roles << admin_role
+        user_b.spree_roles << user_role
+      end
+
+      it 'displays the correct results for a user search by role' do
+        select 'admin', from: Spree.user_class.human_attribute_name(:spree_roles)
+        click_button 'Search'
+        within_table('listing_users') do
+          expect(page).to have_text user_a.email
+          expect(page).not_to have_text user_b.email
+        end
+      end
+    end
   end
 
   context 'editing users' do
@@ -119,7 +157,6 @@ describe 'Users', type: :feature do
     end
 
     it 'can edit user roles' do
-      Spree::Role.create name: "admin"
       click_link 'Account'
 
       check 'user_spree_role_admin'
@@ -260,7 +297,7 @@ describe 'Users', type: :feature do
       end
     end
 
-    [:number, :state, :total].each do |attr|
+    [:number, :total].each do |attr|
       context attr do
         it_behaves_like "a sortable attribute" do
           let(:text_match_1) { order.send(attr).to_s }
@@ -270,6 +307,13 @@ describe 'Users', type: :feature do
         end
       end
     end
+
+    context "state" do
+      let(:text_match_1) { "Complete" }
+      let(:text_match_2) { "Complete" }
+      let(:table_id) { "listing_orders" }
+      let(:sort_link) { "orders_#{attr}_title" }
+    end
   end
 
   context 'items purchased with sorting' do
@@ -290,15 +334,18 @@ describe 'Users', type: :feature do
       end
     end
 
-    [:number, :state].each do |attr|
-      context attr do
-        it_behaves_like "a sortable attribute" do
-          let(:text_match_1) { order.send(attr).to_s }
-          let(:text_match_2) { order_2.send(attr).to_s }
-          let(:table_id) { "listing_items" }
-          let(:sort_link) { "orders_#{attr}_title" }
-        end
-      end
+    context "number" do
+      let(:text_match_1) { "R123" }
+      let(:text_match_2) { "R456" }
+      let(:table_id) { "listing_items" }
+      let(:sort_link) { "orders_#{attr}_title" }
+    end
+
+    context "state" do
+      let(:text_match_1) { "Complete" }
+      let(:text_match_2) { "Complete" }
+      let(:table_id) { "listing_items" }
+      let(:sort_link) { "orders_#{attr}_title" }
     end
 
     it "has item attributes" do

data/spec/spec_helper.rb

@@ -40,8 +40,6 @@ require 'spree/testing_support/url_helpers'
 require 'spree/testing_support/order_walkthrough'
 require 'spree/testing_support/capybara_ext'
 
-require 'paperclip/matchers'
-
 require 'capybara-screenshot/rspec'
 Capybara.save_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
 
@@ -72,6 +70,15 @@ RSpec.configure do |config|
     DatabaseCleaner.clean_with :truncation
   end
 
+  config.when_first_matching_example_defined(type: :feature) do
+    config.before :suite do
+      # Preload assets
+      # This should avoid capybara timeouts, and avoid counting asset compilation
+      # towards the timing of the first feature spec.
+      Rails.application.precompiled_assets
+    end
+  end
+
   config.prepend_before(:each) do
     if RSpec.current_example.metadata[:js]
       DatabaseCleaner.strategy = :truncation
@@ -110,8 +117,6 @@ RSpec.configure do |config|
   config.include Spree::TestingSupport::ControllerRequests, type: :controller
   config.include Spree::TestingSupport::Flash
 
-  config.include Paperclip::Shoulda::Matchers
-
   config.extend WithModel
 
   config.fail_fast = ENV['FAIL_FAST'] || false