Merge branch 'master' into darkswarm

Conflicts:
	spec/features/admin/products_spec.rb

config/initializers/spree.rb

@@ -22,6 +22,7 @@ Spree.config do |config|
   # -- spree_paypal_express
   # Auto-capture payments. Without this option, payments must be manually captured in the paypal interface.
   config.auto_capture = true
+  #config.override_actionmailer_config = false
 end
 
 

spec/features/admin/products_spec.rb

@@ -104,9 +104,7 @@ feature %q{
         product = create(:simple_product, supplier: @supplier2)
 
         click_link 'Products'
-        within "#sub_nav" do
-          click_link 'Products'
-        end
+        within('#sub_nav') { click_link 'Products' }
         click_link product.name
         within('#sidebar') { click_link 'Product Distributions' }
 

spec/features/consumer/checkout_spec.rb

@@ -415,6 +415,7 @@ feature %q{
 
     # -- Checkout: Email
     email = ActionMailer::Base.deliveries.last
+    email.from.include?(@distributor_oc.email).should == true
     email.body.should =~ /Distribution[\s+]\$54.00/
   end
 

spec/models/exchange_spec.rb

@@ -81,12 +81,12 @@ describe Exchange do
 
     it "finds exchanges going to any of a number of enterprises" do
       Exchange.to_enterprises([coordinator]).should == [incoming_exchange]
-      Exchange.to_enterprises([coordinator, distributor]).should == [incoming_exchange, outgoing_exchange]
+      Exchange.to_enterprises([coordinator, distributor]).sort.should == [incoming_exchange, outgoing_exchange].sort
     end
 
     it "finds exchanges coming from any of a number of enterprises" do
       Exchange.from_enterprises([coordinator]).should == [outgoing_exchange]
-      Exchange.from_enterprises([supplier, coordinator]).should == [incoming_exchange, outgoing_exchange]
+      Exchange.from_enterprises([supplier, coordinator]).sort.should == [incoming_exchange, outgoing_exchange].sort
     end
 
     it "finds exchanges with a particular variant" do