Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Seth Call 2014-01-17 19:55:42 +00:00
commit f327317ede
1 changed files with 15 additions and 15 deletions

View File

@ -13,24 +13,24 @@ describe Search do
end
def assert_peachy_data
search = Search.search('peach')
search = Search.musician_search('peach')
search.results.length.should == 1
obj = search.results[0]
obj.should be_a_kind_of User
obj.id.should == @user.id
search.recordings.length.should == 0
search.bands.length.should == 1
search.musicians.length.should == 1
search.fans.length.should == 1
search = Search.fan_search('peach')
search.results.length.should == 1
obj = search.results[0]
obj.should be_a_kind_of User
obj.id.should == @fan.id
musician = search.musicians[0]
musician.should be_a_kind_of User
musician.id.should == @user.id
search = Search.band_search('peach')
search.results.length.should == 1
obj = search.results[0]
obj.should be_a_kind_of Band
obj.id.should == @band.id
band = search.bands[0]
band.should be_a_kind_of Band
band.id.should == @band.id
fan = search.fans[0]
fan.should be_a_kind_of User
fan.id.should == @fan.id
end
it "search for band & musician " do