Merge branch 'release/0.6.7' into wdtk

Conflicts:
  config/general.yml-example

1 files changed, 11 insertions, 0 deletions

diff --git a/spec/controllers/comment_controller_spec.rb b/spec/controllers/comment_controller_spec.rb
index b71bc0aea..4a7acee23 100644
--- a/spec/controllers/comment_controller_spec.rb
+++ b/spec/controllers/comment_controller_spec.rb
@@ -53,6 +53,17 @@ describe CommentController, "when commenting on a request" do
 
         response.should render_template('new')
     end
+    
+    it "should not allow comments if comments are not allowed" do
+      session[:user_id] = users(:silly_name_user).id
+
+      expect {
+        post :new, :url_title => info_requests(:spam_1_request).url_title,
+              :comment => { :body => "I demand to be heard!" },
+              :type => 'request', :submitted_comment => 1, :preview => 0
+      }.to raise_error("Comments are not allowed on this request")
+      
+    end
 
     describe 'when commenting on an external request' do