Merge branch 'release/0.15' into wdtk

Conflicts:
	lib/tasks/stats.rake

1 files changed, 16 insertions, 0 deletions

diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb
index 8c86ad0be..593d51683 100644
--- a/spec/controllers/general_controller_spec.rb
+++ b/spec/controllers/general_controller_spec.rb
@@ -219,6 +219,17 @@ describe GeneralController, 'when using xapian search' do
         assigns[:xapian_bodies].should == nil
     end
 
+    it 'should highlight words for a user-only request' do
+      get :search, :combined => "bob/users"
+      assigns[:highlight_words].should == ['bob']
+    end
+
+    it 'should show spelling corrections for a user-only request' do
+      get :search, :combined => "rob/users"
+      assigns[:spelling_correction].should == 'bob'
+      response.body.should include('did_you_mean')
+    end
+
     it "should filter results based on end of URL being 'requests'" do
         get :search, :combined => "bob/requests"
         assigns[:xapian_requests].results.map{|x|x[:model]}.should =~ [
@@ -238,6 +249,11 @@ describe GeneralController, 'when using xapian search' do
         assigns[:xapian_bodies].results.map{|x|x[:model]}.should == [public_bodies(:geraldine_public_body)]
     end
 
+    it 'should show "Browse all" link if there are no results for a search restricted to bodies' do
+        get :search, :combined => "noresultsshouldbefound/bodies"
+        response.body.should include('Browse all')
+    end
+
     it "should show help when searching for nothing" do
         get :search_redirect, :query => nil
         response.should render_template('search')