splitting up long functional test case

3 files changed, 68 insertions, 34 deletions

diff --git a/engines/support/test/factories.rb b/engines/support/test/factories.rb
index be04f15..bcf41e8 100644
--- a/engines/support/test/factories.rb
+++ b/engines/support/test/factories.rb
@@ -6,13 +6,23 @@ FactoryGirl.define do
 
     factory :ticket_with_comment do
       comments_attributes do
-        { "0" => { "body" => Faker::Lorem.sentences.join(" ") } }
+        { "0" => {
+          "body" => Faker::Lorem.sentences.join(" "),
+          "posted_by" => created_by
+        } }
       end
     end
 
     factory :ticket_with_creator do
       created_by { FactoryGirl.create(:user).id }
     end
+
+  end
+
+  # TicketComments can not be saved. so only use this with build
+  # and add to a ticket afterwards
+  factory :ticket_comment do
+    body { Faker::Lorem.sentences.join(" ") }
   end
 
 end
diff --git a/engines/support/test/functional/ticket_comments_test.rb b/engines/support/test/functional/ticket_comments_test.rb
index e30a018..5cbe233 100644
--- a/engines/support/test/functional/ticket_comments_test.rb
+++ b/engines/support/test/functional/ticket_comments_test.rb
@@ -39,8 +39,7 @@ class TicketsCommentsTest < ActionController::TestCase
   end
 
 
-  test "cannot comment if it is not your ticket" do
-
+  test "cannot comment if it is another users ticket" do
     other_user = find_record :user
     login :is_admin? => false, :email => nil
     ticket = FactoryGirl.create :ticket, :created_by => other_user.id
@@ -50,10 +49,23 @@ class TicketsCommentsTest < ActionController::TestCase
     assert_access_denied
 
     assert_equal ticket.comments.map(&:body), assigns(:ticket).comments.map(&:body)
+  end
 
+  test "authenticated comment on an anonymous ticket adds to my tickets" do
+    login
+    ticket = FactoryGirl.create :ticket
+    other_ticket = FactoryGirl.create :ticket
+    put :update, :id => ticket.id,
+      :ticket => {:comments_attributes => {"0" => {"body" =>"NEWER comment"}} }
+    assert_not_nil assigns(:ticket).comments.last.posted_by
+    assert_equal assigns(:ticket).comments.last.posted_by, @current_user.id
+    visible_tickets = Ticket.search admin_status: 'mine',
+      user_id: @current_user.id, is_admin: false
+    assert_equal [ticket], visible_tickets.all
   end
 
 
+
   test "admin add comment to authenticated ticket" do
 
     other_user = find_record :user
diff --git a/engines/support/test/functional/tickets_controller_test.rb b/engines/support/test/functional/tickets_controller_test.rb
index bb86dad..acc088f 100644
--- a/engines/support/test/functional/tickets_controller_test.rb
+++ b/engines/support/test/functional/tickets_controller_test.rb
@@ -155,51 +155,63 @@ class TicketsControllerTest < ActionController::TestCase
 
   end
 
-  test "tickets for regular user" do
+  test "own tickets include tickets commented upon" do
     login
     ticket = FactoryGirl.create :ticket
     other_ticket = FactoryGirl.create :ticket
-
-    put :update, :id => ticket.id,
-      :ticket => {:comments_attributes => {"0" => {"body" =>"NEWER comment"}} }
-    assert_not_nil assigns(:ticket).comments.last.posted_by
-    assert_equal assigns(:ticket).comments.last.posted_by, @current_user.id
+    comment = FactoryGirl.build(:ticket_comment, posted_by: @current_user.id)
+    ticket.comments << comment
+    ticket.save
 
     get :index, {:open_status => "open"}
     assert assigns(:all_tickets).count > 0
     assert assigns(:all_tickets).include?(ticket)
     assert !assigns(:all_tickets).include?(other_ticket)
+  end
 
-    # user should have one more ticket if a new tick gets a comment by this user
-    assert_difference('assigns[:all_tickets].count') do
-      put :update, :id => other_ticket.id, :ticket => {:comments_attributes => {"0" => {"body" =>"NEWER comment"}}}
-      get :index, {:open_status => "open"}
-    end
-    assert assigns(:all_tickets).include?(other_ticket)
-
-   # if we close one ticket, the user should have 1 less open ticket
-    assert_difference('assigns[:all_tickets].count', -1) do
-      other_ticket.reload
-      other_ticket.close
-      other_ticket.save
-      get :index, {:open_status => "open"}
-    end
+  test "list all tickets created by user" do
+    login
+    ticket = FactoryGirl.create :ticket_with_comment,
+      created_by: @current_user.id
+    other_ticket = FactoryGirl.create :ticket_with_comment,
+      created_by: @current_user.id
+    get :index, {:open_status => "open"}
+    assert_equal 2, assigns[:all_tickets].count
+  end
 
-    number_open_tickets = assigns(:all_tickets).count
+  test "closing ticket removes from open tickets list" do
+    login
+    ticket = FactoryGirl.create :ticket_with_comment,
+      created_by: @current_user.id
+    other_ticket = FactoryGirl.create :ticket_with_comment,
+      created_by: @current_user.id
+    other_ticket.reload
+    other_ticket.close
+    other_ticket.save
+    get :index, {:open_status => "open"}
+    assert_equal 1, assigns[:all_tickets].count
+  end
 
-    # look at closed tickets:
+  test "list closed tickets only" do
+    login
+    open_ticket = FactoryGirl.create :ticket_with_comment,
+      created_by: @current_user.id
+    closed_ticket = FactoryGirl.create :ticket_with_comment,
+      created_by: @current_user.id, is_open: false
     get :index, {:open_status => "closed"}
-    assert !assigns(:all_tickets).include?(ticket)
-    assert assigns(:all_tickets).include?(other_ticket)
-    number_closed_tickets = assigns(:all_tickets).count
+    assert_equal [closed_ticket], assigns(:all_tickets).all
+  end
 
-    # all tickets should equal closed + open
+  test "list all tickets inludes closed + open" do
+    login
+    open_ticket = FactoryGirl.create :ticket_with_comment,
+      created_by: @current_user.id
+    closed_ticket = FactoryGirl.create :ticket_with_comment,
+      created_by: @current_user.id, is_open: false
     get :index, {:open_status => "all"}
-    assert assigns(:all_tickets).include?(ticket)
-    assert assigns(:all_tickets).include?(other_ticket)
-    assert_equal assigns(:all_tickets).count, number_closed_tickets + number_open_tickets
-
-
+    assert_equal 2, assigns(:all_tickets).count
+    assert assigns(:all_tickets).include?(open_ticket)
+    assert assigns(:all_tickets).include?(closed_ticket)
   end
 
 end