@@ -146,7 +146,7 @@ module Sunspot type_id_hash end.inject([]) do |results, pair| type_name, ids = pair - results.concat(Adapters::DataAccessor.create(Util.full_const_get(type_name)).load_all(ids.map(&:to_i))) + results.concat(Adapters::DataAccessor.create(Util.full_const_get(type_name)).load_all(ids)) end.sort_by do |result| hit_ids.index(Adapters::InstanceAdapter.adapt(result).index_id) end lib/sunspot/search.rb @@ -30,19 +30,11 @@ describe 'retrieving search' do it 'should return raw results without loading instances' do post_1, post_2 = Array.new(2) { Post.new } stub_results(post_1, post_2) - MockAdapter::DataAccessor.should_not_receive(:new) + %w(load load_all).each { |message| MockAdapter::DataAccessor.should_not_receive(message) } session.search(Post, :page => 1).raw_results.map do |raw_result| [raw_result.class_name, raw_result.primary_key] end.should == [['Post', post_1.id.to_s], ['Post', post_2.id.to_s]] end - - it 'should load results with integer-ids to avoid conflicts with sluggable finders' do - stub_results(post = Post.new) - mock_adapter = mock() - mock_adapter.should_receive(:load_all).with([post.id]).and_return([post]) - MockAdapter::DataAccessor.should_receive(:new).at_least(1).and_return( mock_adapter ) - session.search(Post).results.should == [post] - end it 'should return total' do stub_results(Post.new, Post.new, 4) spec/api/search_retrieval_spec.rb @@ -17,7 +17,7 @@ describe 'Session' do Sunspot.search(Post) end - xit 'should open a connection with custom host' do + it 'should open a connection with custom host' do Solr::Connection.stub!(:new).with('http://127.0.0.1:8981/solr').and_return(connection) Sunspot.config.solr.url = 'http://127.0.0.1:8981/solr' Sunspot.index(Post.new) spec/api/session_spec.rb @@ -8,7 +8,7 @@ describe Sunspot do Sunspot.send(:session).should_not == old_session end - xit "should keep keep configuration" do + it "should keep keep configuration" do Sunspot.config.solr.url = "http://localhost:9999/path/solr" config_before_reset = Sunspot.config @@ -17,4 +17,4 @@ describe Sunspot do Sunspot.config.should == config_before_reset end end -end +end \ No newline at end of file spec/api/sunspot_spec.rb 0824e06e158245b87f2ea41ff70d38b7e1b4f8e5 Mat Brown mat@patch.com http://github.com/outoftime/sunspot/commit/a6e87ab822ae1df7fc185f14e2a6ef2d2034f50c a6e87ab822ae1df7fc185f14e2a6ef2d2034f50c 2009-06-23T07:11:00-07:00 2009-06-23T07:11:00-07:00 Revert "added sluggable_finder support, explicitly converted string-ids to integers" This reverts commit 0824e06e158245b87f2ea41ff70d38b7e1b4f8e5. 12fae57249ac8edac0cf0a0de61c4e2aea125916 Mat Brown mat@patch.com