From 5b43688443e8cbae9f5e244c33d1afd47696d5bf Mon Sep 17 00:00:00 2001 From: Steven Miers Date: Wed, 29 Apr 2015 15:34:28 -0500 Subject: [PATCH] VRFS-3007 : Fix failure on musician search spec. --- ruby/lib/jam_ruby/models/musician_search.rb | 2 +- .../jam_ruby/models/musician_search_model_spec.rb | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ruby/lib/jam_ruby/models/musician_search.rb b/ruby/lib/jam_ruby/models/musician_search.rb index d9aef634d..5dbb465db 100644 --- a/ruby/lib/jam_ruby/models/musician_search.rb +++ b/ruby/lib/jam_ruby/models/musician_search.rb @@ -221,7 +221,7 @@ module JamRuby end def do_search(params={}) - rel = User.musicians.where(['users.id != ?', self.user.id]) + rel = User.musicians.where('users.id <> ?', self.user.id) rel = self._genres(rel) rel = self._ages(rel) rel = self._studios(rel) diff --git a/ruby/spec/jam_ruby/models/musician_search_model_spec.rb b/ruby/spec/jam_ruby/models/musician_search_model_spec.rb index 6f42c4ac9..499a0b14f 100644 --- a/ruby/spec/jam_ruby/models/musician_search_model_spec.rb +++ b/ruby/spec/jam_ruby/models/musician_search_model_spec.rb @@ -178,13 +178,18 @@ describe 'Musician Search Model' do end describe "sort order by distance" do - before(:each) do + before(:all) do + User.delete_all + end + + before(:each) do create_phony_database end it "sorts by distance" do - search.update_json_value(MusicianSearch::KEY_SORT_ORDER, MusicianSearch::SORT_VALS[1]) - results = search.do_search + musician_search = MusicianSearch.create_search(searcher) + musician_search.update_json_value(MusicianSearch::KEY_SORT_ORDER, MusicianSearch::SORT_VALS[1]) + results = musician_search.do_search expect(results[0].id).to eq(austin_user.id) expect(results[1].id).to eq(dallas_user.id) expect(results[2].id).to eq(miami_user.id)