Merge remote-tracking branch 'origin/release/0.19'0.19

1 files changed, 22 insertions, 0 deletions

diff --git a/spec/controllers/public_body_controller_spec.rb b/spec/controllers/public_body_controller_spec.rb
index 63989baaa..f64975580 100644
--- a/spec/controllers/public_body_controller_spec.rb
+++ b/spec/controllers/public_body_controller_spec.rb
@@ -184,6 +184,11 @@ describe PublicBodyController, "when listing bodies" do
         assigns[:public_bodies].should == [ public_bodies(:geraldine_public_body) ]
     end
 
+    it "should support simple searching of bodies by short_name" do
+        get :list, :public_body_query => 'DfH'
+        assigns[:public_bodies].should == [ public_bodies(:humpadink_public_body) ]
+    end
+
     it "should support simple searching of bodies by notes" do
         get :list, :public_body_query => 'Albatross'
         assigns[:public_bodies].should == [ public_bodies(:humpadink_public_body) ]
@@ -287,6 +292,23 @@ describe PublicBodyController, "when asked to export public bodies as CSV" do
         all_data[1].length.should == 11
     end
 
+    it "only includes visible bodies" do
+        get :list_all_csv
+        all_data = CSV.parse(response.body)
+        all_data.any?{ |row| row.include?('Internal admin authority') }.should be_false
+    end
+
+    it "does not include site_administration bodies" do
+        FactoryGirl.create(:public_body,
+                           :name => 'Site Admin Body',
+                           :tag_string => 'site_administration')
+
+        get :list_all_csv
+
+        all_data = CSV.parse(response.body)
+        all_data.any?{ |row| row.include?('Site Admin Body') }.should be_false
+    end
+
 end
 
 describe PublicBodyController, "when showing public body statistics" do