summaryrefslogtreecommitdiff
path: root/help/test/functional/tickets_controller_test.rb
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2013-07-08 11:30:35 -0700
committerjessib <jessib@leap.se>2013-07-08 11:30:35 -0700
commitfc3c5994df61de04b8b17b495a638efc0d760126 (patch)
tree644aa93dfd0a6da2ed9b20ba688712fb9082f425 /help/test/functional/tickets_controller_test.rb
parentcfb9e1d4c2e954222b77c4dd11e06ae3a0092be5 (diff)
parent3113f8b814417a896ad5340fda88927733f8ab22 (diff)
Merge branch 'master' into feature/disable_account
Conflicts: users/app/controllers/users_controller.rb users/app/helpers/users_helper.rb users/app/views/users/edit.html.haml users/app/views/users/show.html.haml users/config/locales/en.yml
Diffstat (limited to 'help/test/functional/tickets_controller_test.rb')
-rw-r--r--help/test/functional/tickets_controller_test.rb13
1 files changed, 7 insertions, 6 deletions
diff --git a/help/test/functional/tickets_controller_test.rb b/help/test/functional/tickets_controller_test.rb
index f8627d8..6479ba4 100644
--- a/help/test/functional/tickets_controller_test.rb
+++ b/help/test/functional/tickets_controller_test.rb
@@ -181,23 +181,24 @@ class TicketsControllerTest < ActionController::TestCase
test "admin_status mine vs all" do
testticket = FactoryGirl.create :ticket
+ user = find_record :user
login :is_admin? => true, :email => nil
- get :index, {:admin_status => "all", :open_status => "open"}
+ get :index, {:open_status => "open"}
assert assigns(:all_tickets).include?(testticket)
- get :index, {:admin_status => "mine", :open_status => "open"}
+ get :index, {:user_id => user.id, :open_status => "open"}
assert !assigns(:all_tickets).include?(testticket)
testticket.destroy
end
test "commenting on a ticket adds to tickets that are mine" do
testticket = FactoryGirl.create :ticket
- login :is_admin? => true, :email => nil
-
- get :index, {:admin_status => "mine", :open_status => "open"}
+ user = find_record :admin_user
+ login user
+ get :index, {:user_id => user.id, :open_status => "open"}
assert_difference('assigns[:all_tickets].count') do
put :update, :id => testticket.id, :ticket => {:comments_attributes => {"0" => {"body" =>"NEWER comment"}}}
- get :index, {:admin_status => "mine", :open_status => "open"}
+ get :index, {:user_id => user.id, :open_status => "open"}
end
assert assigns(:all_tickets).include?(assigns(:ticket))