seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* VRFS-72 merged

This commit is contained in:
Seth Call 2012-11-12 07:26:13 -06:00
parent 00bd6e4569
commit a179e5b0f0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/api_search/index.rabl
View File

@ -5,7 +5,7 @@ child(:bands => :bands) {
}
child(:musicians => :musicians) {
attributes :id, :first_name, :last_name :location, :photo_url
attributes :id, :first_name, :last_name, :location, :photo_url
}
child(:fans => :fans) {

4
spec/requests/search_api_spec.rb
View File

@ -28,8 +28,8 @@ describe "Search API ", :type => :api do
it "simple search" do
User.delete_search_index # so that the user created before the test and logged in doesn't show up
User.create_search_index
@musician = FactoryGirl.create(:user, name: "Peach", email: "user@example.com", musician: true)
@fan = FactoryGirl.create(:user, name: "Peach Peach", email: "fan@example.com", musician: false)
@musician = FactoryGirl.create(:user, first_name: "Peach", last_name: "Nothing", name: "peach1", email: "user@example.com", musician: true)
@fan = FactoryGirl.create(:user, first_name: "Peach Peach", last_name: "Grovery", name: "peach2", email: "fan@example.com", musician: false)
@band = Band.save(name: "Peach pit", website: "www.bands.com", biography: "zomg we rock")
@band2 = Band.save(name: "Peach", website: "www.bands2.com", biography: "zomg we rock")
User.search_index.refresh