Merge pull request #5320 from luisramos0/vo_fix

[Spree 2.1] Fix variant overrides specs and shops spec

app/controllers/admin/variant_overrides_controller.rb

@@ -5,7 +5,7 @@ module Admin
     include OpenFoodNetwork::SpreeApiKeyLoader
     include EnterprisesHelper
 
-    before_filter :load_data
+    prepend_before_filter :load_data
     before_filter :load_collection, only: [:bulk_update]
     before_filter :load_spree_api_key, only: :index
 

app/models/enterprise.rb

@@ -118,7 +118,7 @@ class Enterprise < ActiveRecord::Base
       except(:select).
       select('DISTINCT enterprises.id')
 
-    if ready_enterprises.present?
+    if ready_enterprises.any?
       where("enterprises.id NOT IN (?)", ready_enterprises)
     else
       where(nil)