spree_core 2.0.13 → 2.1.0

data/lib/spree/testing_support/capybara_ext.rb

@@ -13,19 +13,11 @@ module CapybaraExt
   end
 
   def within_row(num, &block)
-    if 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-child(#{num})", &block)
   end
 
   def column_text(num)
-    if example.metadata[:js]
-      find("td:nth-child(#{num})").text
-    else
-      all("td")[num-1].text
-    end
+    find("td:nth-child(#{num})").text
   end
 
   def set_select2_field(field, value)
@@ -36,8 +28,8 @@ module CapybaraExt
     label = find_label_by_text(options[:from])
     within label.first(:xpath,".//..") do
       options[:from] = "##{find(".select2-container")["id"]}"
+      targetted_select2_search(value, options)
     end
-    targetted_select2_search(value, options)
   end
 
   def targetted_select2_search(value, options)
@@ -51,8 +43,8 @@ module CapybaraExt
 
     within label.first(:xpath,".//..") do
       options[:from] = "##{find(".select2-container")["id"]}"
+      targetted_select2(value, options)
     end
-    targetted_select2(value, options)
   end
 
   def select2_no_label value, options={}
@@ -73,10 +65,9 @@ module CapybaraExt
   end
 
   def select_select2_result(value)
-    # results are in a div appended to the end of the document
-    within(:xpath, '//body') do
-      page.find("div.select2-result-label", text: %r{#{Regexp.escape(value)}}i).click
-    end
+    #p %Q{$("div.select2-result-label:contains('#{value}')").mouseup()}
+    sleep(1)
+    page.execute_script(%Q{$("div.select2-result-label:contains('#{value}')").mouseup()})
   end
 
   def find_label_by_text(text)
@@ -103,7 +94,7 @@ module CapybaraExt
 
   def wait_for_ajax
     counter = 0
-    while page.evaluate_script("$.active").to_i > 0
+    while page.execute_script("return $.active").to_i > 0
       counter += 1
       sleep(0.1)
       raise "AJAX request took longer than 5 seconds." if counter >= 50
@@ -111,6 +102,11 @@ 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)

data/lib/spree/testing_support/common_rake.rb

@@ -10,7 +10,7 @@ namespace :common do
     args.with_defaults(:user_class => "Spree::LegacyUser")
     require "#{ENV['LIB_NAME']}"
 
-    Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--database=#{ENV['DB_NAME']}", "--quiet"]
+    Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--quiet"]
     Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--auto-accept", "--migrate=false", "--seed=false", "--sample=false", "--quiet", "--user_class=#{args[:user_class]}"]
 
     puts "Setting up dummy database..."

data/lib/spree/testing_support/controller_requests.rb

@@ -4,9 +4,9 @@
 # Inside your spec_helper.rb, include this module inside the RSpec.configure
 # block by doing this:
 #
-#   require 'spree/testing_support/controller_requests'
+#   require 'spree/core/testing_support/controller_requests'
 #   RSpec.configure do |c|
-#     c.include Spree::TestingSupport::ControllerRequests, :type => :controller
+#     c.include Spree::Core::TestingSupport::ControllerRequests, :type => :controller
 #   end
 #
 # Then, in your controller tests, you can access spree routes like this:
@@ -56,7 +56,7 @@ module Spree
 
       def process_spree_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
         parameters ||= {}
-        process(action, parameters.merge!(:use_route => :spree), session, flash, method)
+        process(action, method, parameters.merge!(:use_route => :spree), session, flash)
       end
     end
   end

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

@@ -7,7 +7,7 @@ FactoryGirl.define do
   factory :credit_card, class: TestCard do
     verification_value 123
     month 12
-    year { Time.now.year }
+    year 2013
     number '4111111111111111'
   end
 end

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

@@ -12,10 +12,6 @@ FactoryGirl.define do
     # ensure stock item will be created for this products master
     before(:create) { create(:stock_location) if Spree::StockLocation.count == 0 }
 
-    after(:create) do |p|
-      p.variants_including_master.each { |v| v.save! }
-    end
-
     factory :custom_product do
       name 'Custom Product'
       price 17.99

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

@@ -4,9 +4,7 @@ FactoryGirl.define do
     name 'UPS Ground'
 
     before(:create) do |shipping_method, evaluator|
-      if shipping_method.shipping_categories.empty?
-        shipping_method.shipping_categories << (Spree::ShippingCategory.first || create(:shipping_category))
-      end
+      shipping_method.shipping_categories << (Spree::ShippingCategory.first || create(:shipping_category))
     end
 
     factory :shipping_method, class: Spree::ShippingMethod do

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

@@ -11,7 +11,7 @@ FactoryGirl.define do
     authentication_token { generate(:user_authentication_token) } if Spree.user_class.attribute_method? :authentication_token
 
     factory :admin_user do
-      spree_roles { [Spree::Role.find_by_name('admin') || create(:role, name: 'admin')] }
+      spree_roles { [Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')] }
     end
   end
 end

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

@@ -9,8 +9,6 @@ FactoryGirl.define do
     height { generate(:random_float) }
     width  { generate(:random_float) }
     depth  { generate(:random_float) }
-    is_master 0
-    track_inventory true
 
     product { |p| p.association(:base_product) }
     option_values { [create(:option_value)] }
@@ -22,18 +20,5 @@ FactoryGirl.define do
       # on_hand 5
       product { |p| p.association(:product) }
     end
-
-    factory :master_variant do
-      is_master 1
-    end
-
-    factory :on_demand_variant do
-      track_inventory false
-
-      factory :on_demand_master_variant do
-        is_master 1
-      end
-    end
-
   end
 end

data/lib/spree/testing_support/factories.rb

@@ -2,7 +2,7 @@ require 'factory_girl'
 
 Spree::Zone.class_eval do
   def self.global
-    find_by_name('GlobalZone') || FactoryGirl.create(:global_zone)
+    find_by(name: 'GlobalZone') || FactoryGirl.create(:global_zone)
   end
 end
 

data/lib/spree/testing_support/order_walkthrough.rb

@@ -50,7 +50,7 @@ class OrderWalkthrough
   end
 
   def self.payment(order)
-    order.payments.create!({:payment_method => Spree::PaymentMethod.first, :amount => order.total}, :without_protection => true)
+    order.payments.create!(:payment_method => Spree::PaymentMethod.first, :amount => order.total)
     # TODO: maybe look at some way of making this payment_state change automatic
     order.payment_state = 'paid'
     order.next!

data/lib/tasks/core.rake

@@ -86,8 +86,8 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
     end
 
     if load_sample
-      # Reload models' attributes in case they were loaded in old migrations with wrong attributes
-      ActiveRecord::Base.descendants.each(&:reset_column_information)
+      #prevent errors for missing attributes (since rails 3.1 upgrade)
+
       Rake::Task["spree_sample:load"].invoke
     end