solidus_core 1.1.4 → 1.2.0.beta1

data/lib/spree/permitted_attributes.rb

@@ -87,7 +87,9 @@ module Spree
     @@source_attributes = [
       :number, :month, :year, :expiry, :verification_value,
       :first_name, :last_name, :cc_type, :gateway_customer_profile_id,
-      :gateway_payment_profile_id, :last_digits, :name, :encrypted_data]
+      :gateway_payment_profile_id, :last_digits, :name, :encrypted_data,
+      :existing_card_id,
+    ]
 
     @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]
 

data/lib/spree/testing_support/capybara_ext.rb

@@ -13,19 +13,11 @@ module CapybaraExt
   end
 
   def within_row(num, &block)
-    if RSpec.current_example.metadata[:js]
-      within("table.index tbody tr:nth-child(#{num})", &block)
-    else
-      within(:xpath, all("table.index tbody tr")[num-1].path, &block)
-    end
+    within("table.index tbody tr:nth-of-type(#{num})", &block)
   end
 
   def column_text(num)
-    if RSpec.current_example.metadata[:js]
-      find("td:nth-child(#{num})").text
-    else
-      all("td")[num-1].text
-    end
+    find("td:nth-of-type(#{num})").text
   end
 
   def fill_in_quantity(table_column, selector, quantity)
@@ -43,18 +35,15 @@ module CapybaraExt
   end
 
   def select2_search_without_selection(value, options)
-    page.execute_script "$('#{options[:from]}').select2('open');"
-    page.execute_script "$('input.select2-input').val('#{value}').trigger('keyup-change');"
-  end
-
-  def targetted_select2_search(value, options)
-    find("#{options[:from]}:not(.select2-container-disabled)").click
+    find("#{options[:from]}:not(.select2-container-disabled):not(.select2-offscreen)").click
 
     within_entire_page do
-      select2input = first("#select2-drop input.select2-input") || find("input.select2-input")
-      select2input.set(value)
+      find("input.select2-input.select2-focused").set(value)
     end
+  end
 
+  def targetted_select2_search(value, options)
+    select2_search_without_selection(value, from: options[:from])
     select_select2_result(value)
   end
 
@@ -94,12 +83,17 @@ module CapybaraExt
   def select_select2_result(value)
     # results are in a div appended to the end of the document
     within_entire_page do
-      page.find("div.select2-result-label", text: %r{#{Regexp.escape(value)}}i).click
+      page.find("div.select2-result-label", text: %r{#{Regexp.escape(value)}}i, match: :prefer_exact).click
     end
   end
 
   def find_label_by_text(text)
-    find(:xpath, "//label[text()[contains(.,'#{text}')]]")
+    # This used to find the label by it's text using an xpath query, so we use
+    # a case insensitive search to avoid breakage with existing usage.
+    # We need to select labels which are not .select2-offscreen, as select2
+    # makes a duplicate label with the same text, and we want to be sure to
+    # find the original.
+    find('label:not(.select2-offscreen)', text: %r{#{Regexp.escape(text)}}i, match: :one)
   end
 
   def wait_for_ajax
@@ -124,11 +118,6 @@ module CapybaraExt
   end
 end
 
-Capybara.configure do |config|
-  config.match = :prefer_exact
-  config.ignore_hidden_elements = true
-end
-
 RSpec::Matchers.define :have_meta do |name, expected|
   match do |actual|
     has_css?("meta[name='#{name}'][content='#{expected}']", visible: false)
@@ -144,21 +133,6 @@ RSpec::Matchers.define :have_meta do |name, expected|
   end
 end
 
-RSpec::Matchers.define :have_title do |expected|
-  match do |actual|
-    has_css?("title", text: expected, visible: false)
-  end
-
-  failure_message do |actual|
-    actual = first("title")
-    if actual
-      "expected that title would have been '#{expected}' but was '#{actual.text}'"
-    else
-      "expected that title would exist with '#{expected}'"
-    end
-  end
-end
-
 RSpec.configure do |c|
   c.include CapybaraExt
 end

data/lib/spree/testing_support/factories.rb

@@ -1,20 +1,5 @@
 require 'factory_girl'
 
-Spree::Zone.class_eval do
-  def self.global
-    find_by(name: 'GlobalZone') || FactoryGirl.create(:global_zone)
-  end
-end
-
 Dir["#{File.dirname(__FILE__)}/factories/**"].each do |f|
   require File.expand_path(f)
 end
-
-FactoryGirl.define do
-  sequence(:random_string)      { Faker::Lorem.sentence }
-  sequence(:random_description) { Faker::Lorem.paragraphs(1 + Kernel.rand(5)).join("\n") }
-  sequence(:random_email)       { Faker::Internet.email }
-
-  sequence(:sku) { |n| "SKU-#{n}" }
-  sequence(:random_code)        { Faker::Lorem.characters(10) }
-end

data/lib/spree/testing_support/factories/address_factory.rb

@@ -1,3 +1,6 @@
+require 'spree/testing_support/factories/state_factory'
+require 'spree/testing_support/factories/country_factory'
+
 FactoryGirl.define do
   factory :address, class: Spree::Address do
     firstname 'John'

data/lib/spree/testing_support/factories/adjustment_factory.rb

@@ -1,6 +1,13 @@
+require 'spree/testing_support/factories/line_item_factory'
+require 'spree/testing_support/factories/order_factory'
+require 'spree/testing_support/factories/tax_category_factory'
+require 'spree/testing_support/factories/tax_rate_factory'
+require 'spree/testing_support/factories/zone_factory'
+
 FactoryGirl.define do
   factory :adjustment, class: Spree::Adjustment do
-    association(:adjustable, factory: :order)
+    order
+    adjustable { order }
     amount 100.0
     label 'Shipping'
     association(:source, factory: :tax_rate)
@@ -8,6 +15,7 @@ FactoryGirl.define do
   end
 
   factory :tax_adjustment, class: Spree::Adjustment do
+    order { adjustable.order }
     association(:adjustable, factory: :line_item)
     amount 10.0
     label 'VAT 5%'

data/lib/spree/testing_support/factories/carton_factory.rb

@@ -1,9 +1,12 @@
+require 'spree/testing_support/factories/shipment_factory'
+require 'spree/testing_support/factories/inventory_unit_factory'
+
 FactoryGirl.define do
   factory :carton, class: Spree::Carton do
     address
     stock_location
     shipping_method
-    shipped_at { Time.now }
+    shipped_at { Time.current }
     inventory_units do
       [
         build(

data/lib/spree/testing_support/factories/customer_return_factory.rb

@@ -1,3 +1,7 @@
+require 'spree/testing_support/factories/stock_location_factory'
+require 'spree/testing_support/factories/order_factory'
+require 'spree/testing_support/factories/return_item_factory'
+
 FactoryGirl.define do
 
   factory :customer_return, class: Spree::CustomerReturn do

data/lib/spree/testing_support/factories/inventory_unit_factory.rb

@@ -1,3 +1,8 @@
+require 'spree/testing_support/factories/line_item_factory'
+require 'spree/testing_support/factories/variant_factory'
+require 'spree/testing_support/factories/order_factory'
+require 'spree/testing_support/factories/shipment_factory'
+
 FactoryGirl.define do
   factory :inventory_unit, class: Spree::InventoryUnit do
     variant

data/lib/spree/testing_support/factories/line_item_factory.rb

@@ -1,3 +1,6 @@
+require 'spree/testing_support/factories/order_factory'
+require 'spree/testing_support/factories/product_factory'
+
 FactoryGirl.define do
   factory :line_item, class: Spree::LineItem do
     quantity 1

data/lib/spree/testing_support/factories/option_type_factory.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :option_type, class: Spree::OptionType do
+    sequence(:name) { |n| "foo-size-#{n}" }
+    presentation 'Size'
+  end
+end

data/lib/spree/testing_support/factories/{options_factory.rb → option_value_factory.rb}

@@ -5,9 +5,4 @@ FactoryGirl.define do
     presentation 'S'
     option_type
   end
-
-  factory :option_type, class: Spree::OptionType do
-    sequence(:name) { |n| "foo-size-#{n}" }
-    presentation 'Size'
-  end
 end

data/lib/spree/testing_support/factories/order_factory.rb

@@ -1,3 +1,10 @@
+require 'spree/testing_support/factories/address_factory'
+require 'spree/testing_support/factories/shipment_factory'
+require 'spree/testing_support/factories/store_factory'
+require 'spree/testing_support/factories/user_factory'
+require 'spree/testing_support/factories/line_item_factory'
+require 'spree/testing_support/factories/payment_factory'
+
 FactoryGirl.define do
   factory :order, class: Spree::Order do
     user
@@ -27,16 +34,19 @@ FactoryGirl.define do
         line_items_attributes { [{}] * line_items_count }
         shipment_cost 100
         shipping_method nil
+        stock_location { create(:stock_location) }
       end
 
       after(:create) do |order, evaluator|
+        evaluator.stock_location # must evaluate before creating line items
+
         evaluator.line_items_attributes.each do |attributes|
           attributes = {order: order, price: evaluator.line_items_price}.merge(attributes)
           create(:line_item, attributes)
         end
         order.line_items.reload
 
-        create(:shipment, order: order, cost: evaluator.shipment_cost, shipping_method: evaluator.shipping_method, address: evaluator.ship_address)
+        create(:shipment, order: order, cost: evaluator.shipment_cost, shipping_method: evaluator.shipping_method, address: evaluator.ship_address, stock_location: evaluator.stock_location)
         order.shipments.reload
 
         order.update!
@@ -80,14 +90,14 @@ FactoryGirl.define do
             after(:create) do |order, evaluator|
               order.shipments.each do |shipment|
                 shipment.inventory_units.update_all state: 'shipped'
-                shipment.update_columns(state: 'shipped', shipped_at: Time.now)
+                shipment.update_columns(state: 'shipped', shipped_at: Time.current)
                 if evaluator.with_cartons
                   Spree::Carton.create!(
                     stock_location: shipment.stock_location,
                     address: shipment.address,
                     shipping_method: shipment.shipping_method,
                     inventory_units: shipment.inventory_units,
-                    shipped_at: Time.now,
+                    shipped_at: Time.current,
                   )
                 end
               end

data/lib/spree/testing_support/factories/order_promotion_factory.rb

@@ -1,3 +1,6 @@
+require 'spree/testing_support/factories/order_factory'
+require 'spree/testing_support/factories/promotion_factory'
+
 FactoryGirl.define do
   factory :order_promotion, class: Spree::OrderPromotion do
     association :order

data/lib/spree/testing_support/factories/payment_factory.rb

@@ -1,6 +1,10 @@
+require 'spree/testing_support/factories/payment_method_factory'
+require 'spree/testing_support/factories/credit_card_factory'
+require 'spree/testing_support/factories/order_factory'
+require 'spree/testing_support/factories/store_credit_factory'
+
 FactoryGirl.define do
   factory :payment, aliases: [:credit_card_payment], class: Spree::Payment do
-    amount 45.75
     association(:payment_method, factory: :credit_card_payment_method)
     association(:source, factory: :credit_card)
     order
@@ -8,15 +12,19 @@ FactoryGirl.define do
     response_code '12345'
 
     factory :payment_with_refund do
-      state 'completed'
-      after :create do |payment|
-        create(:refund, amount: 5, payment: payment)
+      transient do
+        refund_amount 5
       end
+
+      amount { refund_amount }
+
+      state 'completed'
+
+      refunds { build_list :refund, 1, amount: refund_amount }
     end
   end
 
   factory :check_payment, class: Spree::Payment do
-    amount 45.75
     association(:payment_method, factory: :check_payment_method)
     order
   end

data/lib/spree/testing_support/factories/price_factory.rb

@@ -1,3 +1,5 @@
+require 'spree/testing_support/factories/variant_factory'
+
 FactoryGirl.define do
   factory :price, class: Spree::Price do
     variant

data/lib/spree/testing_support/factories/product_factory.rb

@@ -1,7 +1,13 @@
+require 'spree/testing_support/sequences'
+require 'spree/testing_support/factories/shipping_category_factory'
+require 'spree/testing_support/factories/stock_location_factory'
+require 'spree/testing_support/factories/tax_category_factory'
+require 'spree/testing_support/factories/product_option_type_factory'
+
 FactoryGirl.define do
   factory :base_product, class: Spree::Product do
     sequence(:name) { |n| "Product ##{n} - #{Kernel.rand(9999)}" }
-    description { generate(:random_description) }
+    description "As seen on TV!"
     price 19.99
     cost_price 17.00
     sku { generate(:sku) }

data/lib/spree/testing_support/factories/product_option_type_factory.rb

@@ -1,3 +1,6 @@
+require 'spree/testing_support/factories/product_factory'
+require 'spree/testing_support/factories/option_type_factory'
+
 FactoryGirl.define do
   factory :product_option_type, class: Spree::ProductOptionType do
     product

data/lib/spree/testing_support/factories/product_property_factory.rb

@@ -1,3 +1,6 @@
+require 'spree/testing_support/factories/product_factory'
+require 'spree/testing_support/factories/property_factory'
+
 FactoryGirl.define do
   factory :product_property, class: Spree::ProductProperty do
     product

data/lib/spree/testing_support/factories/promotion_code_factory.rb

@@ -1,3 +1,6 @@
+require 'spree/testing_support/sequences'
+require 'spree/testing_support/factories/promotion_factory'
+
 FactoryGirl.define do
   factory :promotion_code, class: 'Spree::PromotionCode' do
     promotion

data/lib/spree/testing_support/factories/promotion_factory.rb

@@ -1,3 +1,6 @@
+require 'spree/testing_support/factories/promotion_code_factory'
+require 'spree/testing_support/factories/variant_factory'
+
 FactoryGirl.define do
   factory :promotion, class: Spree::Promotion do
     name 'Promo'

data/lib/spree/testing_support/factories/prototype_factory.rb

@@ -1,3 +1,5 @@
+require 'spree/testing_support/factories/property_factory'
+
 FactoryGirl.define do
   factory :prototype, class: Spree::Prototype do
     name 'Baseball Cap'

data/lib/spree/testing_support/factories/refund_factory.rb

@@ -1,14 +1,19 @@
+require 'spree/testing_support/factories/payment_factory'
+require 'spree/testing_support/factories/refund_reason_factory'
+
 FactoryGirl.define do
   sequence(:refund_transaction_id) { |n| "fake-refund-transaction-#{n}"}
 
   factory :refund, class: Spree::Refund do
+    transient do
+      payment_amount 100
+    end
+
     amount 100.00
     transaction_id { generate(:refund_transaction_id) }
-    association(:payment, state: 'completed')
+    payment do
+      association(:payment, state: 'completed', amount: payment_amount)
+    end
     association(:reason, factory: :refund_reason)
   end
-
-  factory :refund_reason, class: Spree::RefundReason do
-    sequence(:name) { |n| "Refund for return ##{n}" }
-  end
 end

data/lib/spree/testing_support/factories/refund_reason_factory.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :refund_reason, class: Spree::RefundReason do
+    sequence(:name) { |n| "Refund for return ##{n}" }
+  end
+end

data/lib/spree/testing_support/factories/reimbursement_factory.rb

@@ -1,3 +1,5 @@
+require 'spree/testing_support/factories/customer_return_factory'
+
 FactoryGirl.define do
   factory :reimbursement, class: Spree::Reimbursement do
     transient do

data/lib/spree/testing_support/factories/return_authorization_factory.rb

@@ -1,3 +1,7 @@
+require 'spree/testing_support/factories/order_factory'
+require 'spree/testing_support/factories/stock_location_factory'
+require 'spree/testing_support/factories/return_reason_factory'
+
 FactoryGirl.define do
   factory :return_authorization, class: Spree::ReturnAuthorization do
     association(:order, factory: :shipped_order)
@@ -11,8 +15,4 @@ FactoryGirl.define do
     association(:stock_location, factory: :stock_location)
     association(:reason, factory: :return_reason)
   end
-
-  factory :return_reason, class: Spree::ReturnReason do
-    sequence(:name) { |n| "Defect ##{n}" }
-  end
 end

data/lib/spree/testing_support/factories/return_item_factory.rb

@@ -1,3 +1,7 @@
+require 'spree/testing_support/factories/inventory_unit_factory'
+require 'spree/testing_support/factories/return_reason_factory'
+require 'spree/testing_support/factories/return_authorization_factory'
+
 FactoryGirl.define do
   factory :return_item, class: Spree::ReturnItem do
     association(:inventory_unit, factory: :inventory_unit, state: :shipped)