diff --git a/plugins/solr/lib/acts_as_searchable.rb b/plugins/solr/lib/acts_as_searchable.rb index feb07ea..bd26a5d 100644 --- a/plugins/solr/lib/acts_as_searchable.rb +++ b/plugins/solr/lib/acts_as_searchable.rb @@ -74,7 +74,7 @@ module ActsAsSearchable db_options[:conditions] = "#{table_name}.id in (#{ids.join(', ')})" end - results = find(:all, db_options) + results = all db_options end end diff --git a/test/unit/product_test.rb b/test/unit/product_test.rb index 2cce599..567a444 100644 --- a/test/unit/product_test.rb +++ b/test/unit/product_test.rb @@ -404,7 +404,7 @@ class ProductTest < ActiveSupport::TestCase env_production_cost = fast_create(ProductionCost, :owner_id => ent.environment.id, :owner_type => 'Environment') ent_production_cost = fast_create(ProductionCost, :owner_id => ent.id, :owner_type => 'Profile') - create(PriceDetail, :product => product, :production_cost => env_production_cost, :product => product) + create(PriceDetail, product: product, production_cost: env_production_cost) assert_equal [env_production_cost, ent_production_cost], product.available_production_costs end -- libgit2 0.21.2