aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/user_controller_spec.rb
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-01-17 08:48:41 +0000
committerRobin Houston <robin.houston@gmail.com>2012-01-17 08:48:41 +0000
commite60d21cb129d1de487ebedd6b5e9efb22913130d (patch)
treeaa1f987ff0d92b2d819f39d89afe2d3d6d821679 /spec/controllers/user_controller_spec.rb
parent9ab3cf355db5b8b6c558aea4744c2803fa658176 (diff)
parentbae21e38242aac2c5843bae5ea5fe3b09408a4f9 (diff)
Merge branch 'release/0.5' into develop
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
-rw-r--r--spec/controllers/user_controller_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb
index 30ad61706..0cf574aa9 100644
--- a/spec/controllers/user_controller_spec.rb
+++ b/spec/controllers/user_controller_spec.rb
@@ -45,7 +45,7 @@ describe UserController, "when showing a user" do
it "should search the user's contributions" do
get :show, :url_name => "bob_smith"
- assigns[:xapian_requests].results.count.should == 2
+ assigns[:xapian_requests].results.count.should == 3
get :show, :url_name => "bob_smith", :user_query => "money"
assigns[:xapian_requests].results.count.should == 1
end