Merge branch 'develop' - hotfix for database change

4 files changed, 7 insertions, 7 deletions

diff --git a/help/test/factories.rb b/help/test/factories.rb
index bce3af1..be04f15 100644
--- a/help/test/factories.rb
+++ b/help/test/factories.rb
@@ -1,7 +1,7 @@
 FactoryGirl.define do
 
   factory :ticket do
-    title { Faker::Lorem.sentence }
+    subject { Faker::Lorem.sentence }
     email { Faker::Internet.email }
 
     factory :ticket_with_comment do
diff --git a/help/test/functional/tickets_controller_test.rb b/help/test/functional/tickets_controller_test.rb
index 3747ad0..0f56e6e 100644
--- a/help/test/functional/tickets_controller_test.rb
+++ b/help/test/functional/tickets_controller_test.rb
@@ -53,7 +53,7 @@ class TicketsControllerTest < ActionController::TestCase
   end
 
   test "should create unauthenticated ticket" do
-    params = {:title => "unauth ticket test title", :comments_attributes => {"0" => {"body" =>"body of test ticket"}}}
+    params = {:subject => "unauth ticket test subject", :comments_attributes => {"0" => {"body" =>"body of test ticket"}}}
 
     assert_difference('Ticket.count') do
       post :create, :ticket => params
@@ -70,7 +70,7 @@ class TicketsControllerTest < ActionController::TestCase
 
   test "should create authenticated ticket" do
 
-    params = {:title => "auth ticket test title", :comments_attributes => {"0" => {"body" =>"body of test ticket"}}}
+    params = {:subject => "auth ticket test subject", :comments_attributes => {"0" => {"body" =>"body of test ticket"}}}
 
     login
 
diff --git a/help/test/unit/ticket_comment_test.rb b/help/test/unit/ticket_comment_test.rb
index 44865ed..fe8cc95 100644
--- a/help/test/unit/ticket_comment_test.rb
+++ b/help/test/unit/ticket_comment_test.rb
@@ -36,7 +36,7 @@ class TicketCommentTest < ActiveSupport::TestCase
 =end
 
   test "add comments" do
-    testticket = Ticket.create :title => "testing"
+    testticket = Ticket.create :subject => "testing"
     assert_equal testticket.comments.count, 0
     comment = TicketComment.new :body => "my email broke"
     #assert comment.valid? #validating or saving necessary for setting posted_at
diff --git a/help/test/unit/ticket_test.rb b/help/test/unit/ticket_test.rb
index 751fe70..f5e6ea7 100644
--- a/help/test/unit/ticket_test.rb
+++ b/help/test/unit/ticket_test.rb
@@ -44,12 +44,12 @@ class TicketTest < ActiveSupport::TestCase
 # TODO: do once have current_user stuff in order
   test "code if & only if not creator-validated" do
     User.current_test = nil
-    t1 = Ticket.create :title => 'test title'
+    t1 = Ticket.create :subject => 'test title'
     assert_not_nil t1.code
     assert_nil t1.created_by
 
     User.current_test = 4
-    t2 = Ticket.create :title => 'test title'
+    t2 = Ticket.create :subject => 'test title'
     assert_nil t2.code
     assert_not_nil t2.created_by
   end
@@ -64,7 +64,7 @@ class TicketTest < ActiveSupport::TestCase
     # TODO: the by_includes_post_by view is only used for tests. Maybe we should get rid of it and change the test to including ordering?
 
 
-    testticket = Ticket.create :title => "test retrieving commented tickets"
+    testticket = Ticket.create :subject => "test retrieving commented tickets"
     comment = TicketComment.new :body => "my email broke", :posted_by => "123"
     assert_equal 0, testticket.comments.count
     assert_equal [], Ticket.by_includes_post_by.key('123').all