diff --git a/app/models/ticket.rb b/app/models/ticket.rb index 5f15aae..3150fd7 100644 --- a/app/models/ticket.rb +++ b/app/models/ticket.rb @@ -7,6 +7,7 @@ class Ticket < ActiveRecord::Base has_many :things, :as => :attached, :dependent => :destroy validates_presence_of :client_id + validates_presence_of :creator_id validates_presence_of :user_id validates_presence_of :description diff --git a/config/environments/test.rb b/config/environments/test.rb index 36001b6..6d02a3c 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -4,7 +4,7 @@ # test suite. You never need to work with it otherwise. Remember that # your test database is "scratch space" for the test suite and is wiped # and recreated between test runs. Don't rely on the data there! -config.cache_classes = true +config.cache_classes = false # Log error messages when you accidentally call methods on nil. config.whiny_nils = true diff --git a/test/factories/schedules.rb b/test/factories/schedules.rb index 732cbbe..1f62867 100644 --- a/test/factories/schedules.rb +++ b/test/factories/schedules.rb @@ -1,7 +1,7 @@ Factory.define :schedule do |f| f.name "24x7" f.active true - f.user_id 1 + f.association :user f.start_time "7am" f.end_time "10pm" end \ No newline at end of file diff --git a/test/factories/users.rb b/test/factories/users.rb index 84fde4a..47e1358 100644 --- a/test/factories/users.rb +++ b/test/factories/users.rb @@ -8,3 +8,8 @@ f.remember_token "77de68daecd823babbb58edb1c8e14d7106e83bb" f.association :client end + +Factory.define :george, :parent => :user do |f| + f.email "george@example.com" + f.name "George Jones" +end \ No newline at end of file diff --git a/test/unit/ticket_test.rb b/test/unit/ticket_test.rb index d15636f..5c61626 100644 --- a/test/unit/ticket_test.rb +++ b/test/unit/ticket_test.rb @@ -53,7 +53,8 @@ class TicketTest < ActiveSupport::TestCase context "ticket#technician" do should "return the ticket user" do - ticket = Factory.create(:ticket) + user = Factory.create(:user) + ticket = Factory.create(:ticket, :user_id => user.id) assert_equal ticket.technician.name, ticket.user.name end end @@ -65,25 +66,22 @@ class TicketTest < ActiveSupport::TestCase end end - context "Ticket#limit" do - - end - context "Ticket#totals" do setup do + @user = Factory.create(:user) (1..2).each do - Factory.create(:ticket) + Factory.create(:ticket, :user_id => @user.id) end (1..3).each do - Factory.create(:ticket, :active_on => Date.tomorrow) + Factory.create(:ticket, :user_id => @user.id, :active_on => Date.tomorrow) end (1..4).each do - Factory.create(:ticket, :completed_on => 2.days.ago) + Factory.create(:ticket, :user_id => @user.id, :completed_on => 2.days.ago) end (1..5).each do - Factory.create(:ticket, :archived_on => 5.days.ago) + Factory.create(:ticket, :user_id => @user.id, :archived_on => 5.days.ago) end - @totals = Ticket.totals(User.find(1)) + @totals = Ticket.totals(@user) end should "return proper number of open tickets" do assert_equal @totals[:open].to_i, 2 @@ -98,8 +96,5 @@ class TicketTest < ActiveSupport::TestCase assert_equal @totals[:all].to_i, 9 end end - - context "ticket#checklists" do - end - + end