Merge branch 'release/0.6.3' into wdtk

Conflicts:
    app/controllers/admin_request_controller.rb
    app/views/request/show.rhtml
    spec/models/info_request_spec.rb

1 files changed, 13 insertions, 0 deletions

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a7f3020c1..c11c7c5bc 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -206,3 +206,16 @@ def load_test_categories
         "Miscellaneous",
             [ "other", "Miscellaneous", "miscellaneous" ],])
 end
+
+
+# Monkeypatch applicationcontroller because the `render_to_string`
+# method in the original breaks all the rspec test assertions such as
+# `should render_template('foo')`.  Same problem as
+# http://stackoverflow.com/questions/8174415/is-it-possible-to-assert-template-or-render-template-against-the-same-partial-wi
+# - a bug in either Rails or Rspec I don't have the time to fix :(
+
+class ApplicationController < ActionController::Base
+    def set_popup_banner
+        @popup_banner = nil
+    end    
+end