spree_backend 3.0.5 → 3.0.6

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

@@ -0,0 +1,129 @@
+require 'spec_helper'
+
+describe "Adjustments", type: :feature do
+  stub_authorization!
+
+  let!(:order) { create(:completed_order_with_totals, line_items_count: 5) }
+  let!(:line_item) do
+    line_item = order.line_items.first
+    # so we can be sure of a determinate price in our assertions
+    line_item.update_column(:price, 10)
+    line_item
+  end
+
+  let!(:tax_adjustment) do
+    create(:tax_adjustment,
+      :adjustable => line_item,
+      :state => 'closed',
+      :order => order,
+      :label => "VAT 5%",
+      :amount => 10)
+  end
+
+  let!(:adjustment) { order.adjustments.create!(order: order, label: 'Rebate', amount: 10) }
+
+  before(:each) do
+    # To ensure the order totals are correct
+    order.update_totals
+    order.persist_totals
+
+    visit spree.admin_orders_path
+    within_row(1) { click_on order.number }
+    click_on "Adjustments"
+  end
+
+  after :each do
+    order.reload.all_adjustments.each do |adjustment|
+      expect(adjustment.order_id).to equal(order.id)
+    end
+  end
+
+  context "admin managing adjustments" do
+    it "should display the correct values for existing order adjustments" do
+      within_row(1) do
+        expect(column_text(2)).to eq("VAT 5%")
+        expect(column_text(3)).to eq("$10.00")
+      end
+    end
+
+    it "only shows eligible adjustments" do
+      expect(page).not_to have_content("ineligible")
+    end
+  end
+
+  context "admin creating a new adjustment" do
+    before(:each) do
+      click_link "New Adjustment"
+    end
+
+    context "successfully" do
+      it "should create a new adjustment" do
+        fill_in "adjustment_amount", with: "10"
+        fill_in "adjustment_label", with: "rebate"
+        click_button "Continue"
+        expect(page).to have_content("successfully created!")
+        expect(page).to have_content("Total: $180.00")
+      end
+    end
+
+    context "with validation errors" do
+      it "should not create a new adjustment" do
+        fill_in "adjustment_amount", with: ""
+        fill_in "adjustment_label", with: ""
+        click_button "Continue"
+        expect(page).to have_content("Label can't be blank")
+        expect(page).to have_content("Amount is not a number")
+      end
+    end
+  end
+
+  context "admin editing an adjustment", js: true do
+
+    before(:each) do
+      within_row(2) { click_icon :edit }
+    end
+
+    context "successfully" do
+      it "should update the adjustment" do
+        fill_in "adjustment_amount", with: "99"
+        fill_in "adjustment_label", with: "rebate 99"
+        click_button "Continue"
+        expect(page).to have_content("successfully updated!")
+        expect(page).to have_content("rebate 99")
+        within(".adjustments") do
+          expect(page).to have_content("$99.00")
+        end
+
+        expect(page).to have_content("Total: $259.00")
+      end
+    end
+
+    context "with validation errors" do
+      it "should not update the adjustment" do
+        fill_in "adjustment_amount", with: ""
+        fill_in "adjustment_label", with: ""
+        click_button "Continue"
+        expect(page).to have_content("Label can't be blank")
+        expect(page).to have_content("Amount is not a number")
+      end
+    end
+  end
+
+  context "deleting an adjustment" do
+    it "should not be possible if adjustment is closed" do
+      within_row(1) do
+        expect(page).not_to have_css('.fa-delete')
+      end
+    end
+
+    it "should update the total", js: true do
+      accept_alert do
+        within_row(2) do
+          click_icon(:delete)
+        end
+      end
+
+      expect(page).to have_content(/Total: ?\$170\.00/)
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe "Cancelling + Resuming", :type => :feature do
+
+  stub_authorization!
+
+  let(:user) { double(id: 123, has_spree_role?: true, spree_api_key: 'fake') }
+
+  before do
+    allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(user)
+  end
+
+  let(:order) do
+    order = create(:order)
+    order.update_columns({
+      :state => 'complete',
+      :completed_at => Time.now
+    })
+    order
+  end
+
+  it "can cancel an order" do
+    visit spree.edit_admin_order_path(order.number)
+    click_button 'Cancel'
+    within(".additional-info") do
+      within(".state") do
+        expect(page).to have_content("canceled")
+      end
+    end
+  end
+
+  context "with a cancelled order" do
+    before do
+      order.update_column(:state, 'canceled')
+    end
+
+    it "can resume an order" do
+      visit spree.edit_admin_order_path(order.number)
+      click_button 'Resume'
+      within(".additional-info") do
+        within(".state") do
+          expect(page).to have_content("resumed")
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,182 @@
+require 'spec_helper'
+
+describe "Customer Details", type: :feature, js: true do
+  stub_authorization!
+
+  let(:country) { create(:country, name: "Kangaland") }
+  let(:state) { create(:state, name: "Alabama", country: country) }
+  let!(:shipping_method) { create(:shipping_method, display_on: "front_end") }
+  let!(:order) { create(:order, state: 'complete', completed_at: "2011-02-01 12:36:15") }
+  let!(:product) { create(:product_in_stock) }
+
+  # We need a unique name that will appear for the customer dropdown
+  let!(:ship_address) { create(:address, country: country, state: state, first_name: "Rumpelstiltskin") }
+  let!(:bill_address) { create(:address, country: country, state: state, first_name: "Rumpelstiltskin") }
+
+  let!(:user) { create(:user, email: 'foobar@example.com', ship_address: ship_address, bill_address: bill_address) }
+
+  # "Intelligiently" wait on condition
+  #
+  # Much better than a random sleep "here and there"
+  # it will not cause any delay in case the condition is fullfilled on first cycle.
+  def wait_for_condition
+    time = Capybara.default_max_wait_time
+    step = 0.1
+    while time > 0
+      return if yield
+      sleep(step)
+      time -= 0.1
+    end
+    fail "Could not achieve condition within #{Capybara.default_max_wait_time} seconds."
+  end
+
+  # Value attribute is dynamically set via JS, so not observable via a CSS/XPath selector
+  # As the browser might take time to make the values visible in the dom we need to
+  # "intelligiently" wait for that event o prevent a race.
+  def expect_form_value(id, value)
+    node = page.find(id)
+    wait_for_condition { node.value.eql?(value) }
+  end
+
+  context "brand new order" do
+    before do
+      visit spree.new_admin_order_path
+    end
+    # Regression test for #3335 & #5317
+    it "associates a user when not using guest checkout" do
+      select2_search product.name, from: Spree.t(:name_or_sku)
+      within("table.stock-levels") do
+        fill_in "variant_quantity", with: 1
+        click_icon :add
+      end
+      wait_for_ajax
+      click_link "Customer"
+      targetted_select2 "foobar@example.com", from: "#s2id_customer_search"
+      # 5317 - Address prefills using user's default.
+      expect_form_value('#order_bill_address_attributes_firstname', user.bill_address.firstname)
+      expect_form_value('#order_bill_address_attributes_lastname', user.bill_address.lastname)
+      expect_form_value('#order_bill_address_attributes_address1', user.bill_address.address1)
+      expect_form_value('#order_bill_address_attributes_address2', user.bill_address.address2)
+      expect_form_value('#order_bill_address_attributes_city', user.bill_address.city)
+      expect_form_value('#order_bill_address_attributes_zipcode', user.bill_address.zipcode)
+      expect_form_value('#order_bill_address_attributes_country_id', user.bill_address.country_id.to_s)
+      expect_form_value('#order_bill_address_attributes_state_id', user.bill_address.state_id.to_s)
+      expect_form_value('#order_bill_address_attributes_phone', user.bill_address.phone)
+      click_button "Update"
+      expect(Spree::Order.last.user).not_to be_nil
+    end
+  end
+
+  context "editing an order" do
+    before do
+      configure_spree_preferences do |config|
+        config.default_country_id = country.id
+        config.company = true
+      end
+
+      visit spree.admin_orders_path
+      within('table#listing_orders') { click_icon(:edit) }
+    end
+
+    context "selected country has no state" do
+      before { create(:country, iso: "BRA", name: "Brazil") }
+
+      it "changes state field to text input" do
+        click_link "Customer"
+
+        within("#billing") do
+          targetted_select2 "Brazil", from: "#s2id_order_bill_address_attributes_country_id"
+          fill_in "order_bill_address_attributes_state_name", with: "Piaui"
+        end
+
+        click_button "Update"
+        expect(find_field("order_bill_address_attributes_state_name").value).to eq("Piaui")
+      end
+    end
+
+    it "should be able to update customer details for an existing order" do
+      order.ship_address = create(:address)
+      order.save!
+
+      click_link "Customer"
+      within("#shipping") { fill_in_address "ship" }
+      within("#billing") { fill_in_address "bill" }
+
+      click_button "Update"
+      click_link "Customer"
+
+      # Regression test for #2950 + #2433
+      # This act should transition the state of the order as far as it will go too
+      within("#order_tab_summary") do
+        expect(find(".state").text).to eq("complete")
+      end
+    end
+
+    it "should show validation errors" do
+      click_link "Customer"
+      click_button "Update"
+      expect(page).to have_content("Shipping address first name can't be blank")
+    end
+
+    it "updates order email for an existing order with a user" do
+      order.update_columns(ship_address_id: ship_address.id, bill_address_id: bill_address.id, state: "confirm", completed_at: nil)
+      previous_user = order.user
+      click_link "Customer"
+      fill_in "order_email", with: "newemail@example.com"
+      expect { click_button "Update" }.to change { order.reload.email }.to "newemail@example.com"
+      expect(order.user_id).to eq previous_user.id
+      expect(order.user.email).to eq previous_user.email
+    end
+
+    context "country associated was removed" do
+      let(:brazil) { create(:country, iso: "BRA", name: "Brazil") }
+
+      before do
+        order.bill_address.country.destroy
+        configure_spree_preferences do |config|
+          config.default_country_id = brazil.id
+        end
+      end
+
+      it "sets default country when displaying form" do
+        click_link "Customer"
+        expect(find_field("order_bill_address_attributes_country_id").value.to_i).to eq brazil.id
+      end
+    end
+
+    # Regression test for #942
+    context "errors when no shipping methods are available" do
+      before do
+        Spree::ShippingMethod.delete_all
+      end
+
+      specify do
+        click_link "Customer"
+        # Need to fill in valid information so it passes validations
+        fill_in "order_ship_address_attributes_firstname",  with: "John 99"
+        fill_in "order_ship_address_attributes_lastname",   with: "Doe"
+        fill_in "order_ship_address_attributes_lastname",   with: "Company"
+        fill_in "order_ship_address_attributes_address1",   with: "100 first lane"
+        fill_in "order_ship_address_attributes_address2",   with: "#101"
+        fill_in "order_ship_address_attributes_city",       with: "Bethesda"
+        fill_in "order_ship_address_attributes_zipcode",    with: "20170"
+
+        page.select('Alabama', from: 'order_ship_address_attributes_state_id')
+        fill_in "order_ship_address_attributes_phone", with: "123-456-7890"
+        expect { click_button "Update" }.not_to raise_error
+      end
+    end
+  end
+
+  def fill_in_address(kind = "bill")
+    fill_in "First Name",              with: "John 99"
+    fill_in "Last Name",               with: "Doe"
+    fill_in "Company",                 with: "Company"
+    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"
+    targetted_select2 "Alabama",       from: "#s2id_order_#{kind}_address_attributes_state_id"
+    fill_in "Phone",                   with: "123-456-7890"
+  end
+end

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

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+# Tests for #3958's features
+describe "Order Line Items", type: :feature, js: true do
+  stub_authorization!
+  
+  before do
+    # Removing the delivery step causes the order page to render a different
+    # partial, called _line_items, which shows line items rather than shipments
+    allow(Spree::Order).to receive_messages :checkout_step_names => [:address, :payment, :confirm, :complete]
+  end
+
+  let!(:order) do
+    order = create(:order_with_line_items, :line_items_count => 1)
+    order.shipments.destroy_all
+    order
+  end
+
+  it "can edit a line item's quantity" do
+    visit spree.edit_admin_order_path(order)
+    within(".line-items") do
+      within_row(1) do
+        find(".edit-line-item").click
+        fill_in "quantity", :with => 10
+        find(".save-line-item").click
+        within '.line-item-qty-show' do
+          expect(page).to have_content("10")
+        end
+        within '.line-item-total' do
+          expect(page).to have_content("$100.00")
+        end
+      end
+    end
+  end
+
+  it "can delete a line item" do
+    visit spree.edit_admin_order_path(order)
+
+    product_name = find(".line-items tr:nth-child(1) .line-item-name").text
+
+    within(".line-items") do
+      within_row(1) do
+        accept_alert do
+          find(".delete-line-item").click
+        end
+      end
+    end
+
+    expect(page).not_to have_content(product_name)
+  end
+end

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

@@ -0,0 +1,225 @@
+require 'spec_helper'
+
+describe "Orders Listing", type: :feature do
+  stub_authorization!
+
+  let(:order1) do
+    create :order_with_line_items,
+      created_at: 1.day.from_now,
+      completed_at: 1.day.from_now,
+      considered_risky: true,
+      number: "R100"
+  end
+
+  let(:order2) do
+    create :order,
+      created_at: 1.day.ago,
+      completed_at: 1.day.ago,
+      number: "R200"
+  end
+
+  before do
+    allow_any_instance_of(Spree::OrderInventory).to receive(:add_to_shipment)
+    # create the order instances after stubbing the `add_to_shipment` method
+    order1; order2
+    visit spree.admin_orders_path
+  end
+
+  describe "listing orders" do
+    it "should list existing orders" do
+      within_row(1) do
+        expect(column_text(2)).to eq "R100"
+        expect(find("td:nth-child(3)")).to have_css '.label-considered_risky'
+        expect(column_text(4)).to eq "cart"
+      end
+
+      within_row(2) do
+        expect(column_text(2)).to eq "R200"
+        expect(find("td:nth-child(3)")).to have_css '.label-considered_safe'
+      end
+    end
+
+    it "should be able to sort the orders listing" do
+      # default is completed_at desc
+      within_row(1) { expect(page).to have_content("R100") }
+      within_row(2) { expect(page).to have_content("R200") }
+
+      click_link "Completed At"
+
+      # Completed at desc
+      within_row(1) { expect(page).to have_content("R200") }
+      within_row(2) { expect(page).to have_content("R100") }
+
+      within('table#listing_orders thead') { click_link "Number" }
+
+      # number asc
+      within_row(1) { expect(page).to have_content("R100") }
+      within_row(2) { expect(page).to have_content("R200") }
+    end
+  end
+
+  describe "searching orders" do
+    it "should be able to search orders" do
+      fill_in "q_number_cont", with: "R200"
+      click_on 'Filter Results'
+      within_row(1) do
+        expect(page).to have_content("R200")
+      end
+
+      # Ensure that the other order doesn't show up
+      within("table#listing_orders") { expect(page).not_to have_content("R100") }
+    end
+
+    it "should return both complete and incomplete orders when only complete orders is not checked" do
+      Spree::Order.create! email: "incomplete@example.com", completed_at: nil, state: 'cart'
+      click_on 'Filter'
+      uncheck "q_completed_at_not_null"
+      click_on 'Filter Results'
+
+      expect(page).to have_content("R200")
+      expect(page).to have_content("incomplete@example.com")
+    end
+
+    it "should be able to filter risky orders" do
+      # Check risky and filter
+      check "q_considered_risky_eq"
+      click_on 'Filter Results'
+
+      # Insure checkbox still checked
+      expect(find("#q_considered_risky_eq")).to be_checked
+      # Insure we have the risky order, R100
+      within_row(1) do
+        expect(page).to have_content("R100")
+      end
+      # Insure the non risky order is not present
+      expect(page).not_to have_content("R200")
+    end
+
+    it "should be able to filter on variant_id" do
+      # Insure we have the SKU in the options
+      expect(find('#q_line_items_variant_id_in').all('option').collect(&:text)).to include(order1.line_items.first.variant.sku)
+
+      # Select and filter
+      find('#q_line_items_variant_id_in').find(:xpath, 'option[2]').select_option
+      click_on 'Filter Results'
+
+      within_row(1) do
+        expect(page).to have_content(order1.number)
+      end
+
+      expect(page).not_to have_content(order2.number)
+    end
+
+    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
+      end
+
+      # Regression test for #4004
+      it "should be able to go from page to page for incomplete orders" do
+        Spree::Order.destroy_all
+        2.times { Spree::Order.create! email: "incomplete@example.com", completed_at: nil, state: 'cart' }
+        click_on 'Filter'
+        uncheck "q_completed_at_not_null"
+        click_on 'Filter Results'
+        within(".pagination") do
+          click_link "2"
+        end
+        expect(page).to have_content("incomplete@example.com")
+        expect(find("#q_completed_at_not_null")).not_to be_checked
+      end
+    end
+
+    it "should be able to search orders using only completed at input" do
+      fill_in "q_created_at_gt", with: Date.current
+      click_on 'Filter Results'
+
+      within_row(1) { expect(page).to have_content("R100") }
+
+      # Ensure that the other order doesn't show up
+      within("table#listing_orders") { expect(page).not_to have_content("R200") }
+    end
+
+    context "filter on promotions" do
+      let!(:promotion) { create(:promotion_with_item_adjustment) }
+
+      before do
+        order1.promotions << promotion
+        order1.save
+        visit spree.admin_orders_path
+      end
+
+      it "only shows the orders with the selected promotion" do
+        select promotion.name, from: "Promotion"
+        click_on 'Filter Results'
+        within_row(1) { expect(page).to have_content("R100") }
+        within("table#listing_orders") { expect(page).not_to have_content("R200") }
+      end
+    end
+
+    it "should be able to apply a ransack filter by clicking a quickfilter icon", js: true do
+      label_pending = page.find '.label-pending'
+      parent_td = label_pending.find(:xpath, '..')
+
+      # Click the quick filter Pending for order #R100
+      within(parent_td) do
+        find('.js-add-filter').click
+      end
+
+      expect(page).to have_content("R100")
+      expect(page).not_to have_content("R200")
+    end
+
+    context "filter on shipment state" do
+      it "only shows the orders with the selected shipment state" do
+        select Spree.t("payment_states.#{order1.shipment_state}"), from: "Shipment State"
+        click_on 'Filter Results'
+        within_row(1) { expect(page).to have_content("R100") }
+        within("table#listing_orders") { expect(page).not_to have_content("R200") }
+      end
+    end
+
+    context "filter on payment state" do
+      it "only shows the orders with the selected payment state" do
+        select Spree.t("payment_states.#{order1.payment_state}"), from: "Payment State"
+        click_on 'Filter Results'
+        within_row(1) { expect(page).to have_content("R100") }
+        within("table#listing_orders") { expect(page).not_to have_content("R200") }
+      end
+    end
+
+    # regression tests for https://github.com/spree/spree/issues/6888
+    context "per page dropdown", js: true do
+      before do
+        select "45", from: "per_page"
+        sleep(1)
+        expect(page).to have_select("per_page", selected: "45")
+      end
+
+      it "adds per_page parameter to url" do
+        expect(current_url).to match(/per_page\=45/)
+      end
+
+      it "can be used with search filtering" do
+        click_on 'Filter'
+        fill_in "q_number_cont", with: "R200"
+        click_on 'Filter Results'
+        expect(page).not_to have_content("R100")
+        within_row(1) { expect(page).to have_content("R200") }
+        expect(current_url).to match(/per_page\=45/)
+        expect(page).to have_select("per_page", selected: "45")
+        select "60", from: "per_page"
+        sleep(1)
+        expect(page).to have_select("per_page", selected: "60")
+        expect(page).not_to have_content("R100")
+        within_row(1) { expect(page).to have_content("R200") }
+        expect(current_url).to match(/per_page\=60/)
+      end
+    end
+  end
+end