Merge remote-tracking branch 'origin/develop'

We'll only use the master branch for development from now on.

2 files changed, 4 insertions, 4 deletions

diff --git a/engines/support/test/integration/create_ticket_test.rb b/engines/support/test/integration/create_ticket_test.rb
index 00f9a6b..6abb3d3 100644
--- a/engines/support/test/integration/create_ticket_test.rb
+++ b/engines/support/test/integration/create_ticket_test.rb
@@ -29,7 +29,7 @@ class CreateTicketTest < BrowserIntegrationTest
     fill_in 'Description', with: 'description of the problem goes here'
     click_on 'Submit Ticket'
     assert page.has_content?("is invalid")
-    assert_equal 'invalid data', find_field('Email').value
+    assert_equal 'invaliddata', find_field('Email').value
     assert_equal 'some user', find_field('Regarding User').value
   end
 
diff --git a/engines/support/test/unit/ticket_test.rb b/engines/support/test/unit/ticket_test.rb
index 7b5281f..373f06c 100644
--- a/engines/support/test/unit/ticket_test.rb
+++ b/engines/support/test/unit/ticket_test.rb
@@ -8,12 +8,12 @@ class TicketTest < ActiveSupport::TestCase
 
   test "ticket with default attribs is valid" do
     t = FactoryGirl.build :ticket
-    assert t.valid?
+    assert t.valid?, t.errors.full_messages.to_sentence
   end
 
   test "ticket without email is valid" do
     t = FactoryGirl.build :ticket, email: ""
-    assert t.valid?
+    assert t.valid?, t.errors.full_messages.to_sentence
   end
 
   test "ticket validates email format" do
@@ -63,7 +63,7 @@ class TicketTest < ActiveSupport::TestCase
   test "find tickets user commented on" do
 
     # clear old tickets just in case
-    # this will cause RestClient::ResourceNotFound errors if there are multiple copies of the same ticket returned
+    # this will cause RESOURCE_NOT_FOUND errors if there are multiple copies of the same ticket returned
     Ticket.by_includes_post_by.key('123').each {|t| t.destroy}
     # 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?