Merge remote-tracking branch 'origin/release/0.6.4' into wdtk

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

1 files changed, 20 insertions, 0 deletions

diff --git a/spec/controllers/comment_controller_spec.rb b/spec/controllers/comment_controller_spec.rb
index 93752537c..b71bc0aea 100644
--- a/spec/controllers/comment_controller_spec.rb
+++ b/spec/controllers/comment_controller_spec.rb
@@ -54,6 +54,26 @@ describe CommentController, "when commenting on a request" do
         response.should render_template('new')
     end
 
+    describe 'when commenting on an external request' do
+
+        describe 'when responding to a GET request on a successful request' do
+
+            before do
+                @external_request = info_requests(:external_request)
+                @external_request.described_state = 'successful'
+                @external_request.save!
+            end
+
+            it 'should be successful' do
+                get :new, :url_title => @external_request.url_title,
+                          :type => 'request'
+                response.should be_success
+            end
+
+        end
+
+    end
+
 end