summaryrefslogtreecommitdiff
path: root/help
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-11-12 14:41:16 -0800
committerjessib <jessib@riseup.net>2012-11-12 14:41:16 -0800
commite0bfe1981be07f2ab27131c52a20b15e6562822d (patch)
tree9c3c6bbd2597f353346d48e5b96b990232ad39e2 /help
parentdd26e22a3bcf0aebd16c518e44b8ab6a73bd7d0e (diff)
Some test improvements.
Diffstat (limited to 'help')
-rw-r--r--help/app/controllers/tickets_controller.rb6
-rw-r--r--help/test/functional/tickets_controller_test.rb96
2 files changed, 68 insertions, 34 deletions
diff --git a/help/app/controllers/tickets_controller.rb b/help/app/controllers/tickets_controller.rb
index b76b051..102464a 100644
--- a/help/app/controllers/tickets_controller.rb
+++ b/help/app/controllers/tickets_controller.rb
@@ -41,7 +41,7 @@ class TicketsController < ApplicationController
redirect_to tickets_path, :alert => "No such ticket"
return
end
- authorize_ticket_access
+ ticket_access_denied? #authorize_ticket_access
# @ticket.comments.build
# build ticket comments?
end
@@ -49,7 +49,7 @@ class TicketsController < ApplicationController
def update
@ticket = Ticket.find(params[:id])
- if ticket_access?
+ if !ticket_access_denied?
if status = params[:change_status] #close or open button was pressed
@ticket.close if params[:change_status] == 'close'
@ticket.reopen if params[:change_status] == 'open'
@@ -128,7 +128,7 @@ class TicketsController < ApplicationController
@ticket and (admin? or !@ticket.created_by or (current_user and current_user.id == @ticket.created_by))
end
- def authorize_ticket_access
+ def ticket_access_denied?
access_denied unless ticket_access?
end
diff --git a/help/test/functional/tickets_controller_test.rb b/help/test/functional/tickets_controller_test.rb
index bb17acc..2f9045a 100644
--- a/help/test/functional/tickets_controller_test.rb
+++ b/help/test/functional/tickets_controller_test.rb
@@ -3,9 +3,7 @@ require 'test_helper'
class TicketsControllerTest < ActionController::TestCase
test "should get index if logged in" do
- #todo: should redo this and actually authorize
- user = User.last
- session[:user_id] = user.id
+ login(User.last)
get :index
assert_response :success
assert_not_nil assigns(:tickets)
@@ -17,7 +15,6 @@ class TicketsControllerTest < ActionController::TestCase
assert_response :success
end
-
test "should create unauthenticated ticket" do
params = {:title => "ticket test title", :comments_attributes => {"0" => {"body" =>"body of test ticket"}}}
@@ -57,45 +54,82 @@ class TicketsControllerTest < ActionController::TestCase
end
test "add comment to unauthenticated ticket" do
-
ticket = Ticket.last
ticket.created_by = nil # TODO: hacky, but this makes sure this ticket is an unauthenticated one
ticket.save
-# comment_count = t.comments.count
-# put :update, :id => t.id, :ticket => {:comments_attributes => {"0" => {"body" =>"NEWER comment"}} }
-# assert_equal(comment_count + 1, assigns(:ticket).comments.count)
- #assert_difference block isn't working
assert_difference('Ticket.last.comments.count') do
put :update, :id => ticket.id,
:ticket => {:comments_attributes => {"0" => {"body" =>"NEWER comment"}} }
end
- assert_equal ticket, assigns(:ticket)
+ assert_not_equal ticket.comments, assigns(:ticket).comments # ticket == assigns(:ticket), but they have different comments (which we want)
- test "add comment to authenticated ticket" do
+ end
- params = {:title => "ticket test title", :comments_attributes => {"0" => {"body" =>"body of test ticket"}}}
+ test "add comment to own authenticated ticket" do
+
+ login(User.last)
+
+ ticket = Ticket.last
+ ticket.created_by = User.last.id # TODO: hacky, but confirms it is their ticket
+ ticket.save
+ #they should be able to comment if it is their ticket:
+ assert_difference('Ticket.last.comments.count') do
+ put :update, :id => ticket.id,
+ :ticket => {:comments_attributes => {"0" => {"body" =>"NEWER comment"}} }
+ end
+ assert_not_equal ticket.comments, assigns(:ticket).comments
- #todo: should redo this and actually authorize
- user = User.last
- session[:user_id] = user.id
-
- post :create, :ticket => params
- t = assigns(:ticket)
-
- comment_count = t.comments.count
- debugger
- put :update, :id => t.id, :ticket => {:comments_attributes => {"0" => {"body" =>"NEWER comment"}} } # this isn't working
- assert_equal(comment_count + 1, t.comments.count)
-
- #comment_count = t.comments.count
- # now log out: and retry
- #session[:user_id] = nil
- #put :update, :id => t.id, :ticket => {:comments_attributes => {"0" => {"body" =>"EVEN NEWER comment"}} } # should fail
-# assert_equal(comment_count, t.comments.count)
- #assert_difference block isn't working
- t.destroy
+ end
+
+
+ test "cannot comment if it is not your ticket" do
+
+ login(User.last) # assumes User.last is not admin
+ assert !@current_user.is_admin?
+
+ ticket = Ticket.last
+
+ ticket.created_by = User.first.id #assumes User.first != User.last
+ assert_not_equal User.first, User.last
+ ticket.save
+ # they should *not* be able to comment if it is not their ticket
+ put :update, :id => ticket.id,
+ :ticket => {:comments_attributes => {"0" => {"body" =>"NEWER comment"}} }
+ assert_response :redirect
+ assert_access_denied
+ assert_equal ticket.comments, assigns(:ticket).comments
+
+ end
+
+
+ test "admin add comment to authenticated ticket" do
+
+ admin_login = APP_CONFIG['admins'].first
+ attribs = User.valid_attributes_hash
+ attribs[:login] = admin_login
+ admin_user = User.new(attribs)
+ login(admin_user)
+
+ ticket = Ticket.last
+ ticket.created_by = User.last.id # TODO: hacky, but confirms it somebody elses ticket
+ assert_not_equal User.last, admin_user
+ ticket.save
+
+ #admin should be able to comment:
+ assert_difference('Ticket.last.comments.count') do
+ put :update, :id => ticket.id,
+ :ticket => {:comments_attributes => {"0" => {"body" =>"NEWER comment"}} }
+ end
+ assert_not_equal ticket.comments, assigns(:ticket).comments
+
+ end
+
+
+ test "test_tickets_by_admin" do
+ #TODO
end
end
+