aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/comment_controller_spec.rb11
-rw-r--r--spec/controllers/request_controller_spec.rb16
2 files changed, 0 insertions, 27 deletions
diff --git a/spec/controllers/comment_controller_spec.rb b/spec/controllers/comment_controller_spec.rb
index 4a7acee23..b71bc0aea 100644
--- a/spec/controllers/comment_controller_spec.rb
+++ b/spec/controllers/comment_controller_spec.rb
@@ -53,17 +53,6 @@ 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
diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index 77f43b618..95737a250 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -238,22 +238,6 @@ describe RequestController, "when showing one request" do
response.should have_tag('div#owner_actions')
end
- describe 'when the request does allow comments' do
- it 'should have a comment link' do
- get :show, { :url_title => 'why_do_you_have_such_a_fancy_dog' },
- { :user_id => users(:admin_user).id }
- response.should have_tag('#anyone_actions', /Add an annotation/)
- end
- end
-
- describe 'when the request does not allow comments' do
- it 'should not have a comment link' do
- get :show, { :url_title => 'spam_1' },
- { :user_id => users(:admin_user).id }
- response.should_not have_tag('#anyone_actions', /Add an annotation/)
- end
- end
-
describe 'when the request is being viewed by an admin' do
describe 'if the request is awaiting description' do