Merge branch 'develop' into feature/billing-no-authenticated-payments

Conflicts:
	billing/config/locales/en.yml

1 files changed, 11 insertions, 3 deletions

diff --git a/help/test/factories.rb b/help/test/factories.rb
index 5b38952..be04f15 100644
--- a/help/test/factories.rb
+++ b/help/test/factories.rb
@@ -1,9 +1,17 @@
 FactoryGirl.define do
 
   factory :ticket do
-    title { Faker::Lorem.sentence }
-    comments_attributes do
-      { "0" => { "body" => Faker::Lorem.sentences.join(" ") } }
+    subject { Faker::Lorem.sentence }
+    email { Faker::Internet.email }
+
+    factory :ticket_with_comment do
+      comments_attributes do
+        { "0" => { "body" => Faker::Lorem.sentences.join(" ") } }
+      end
+    end
+
+    factory :ticket_with_creator do
+      created_by { FactoryGirl.create(:user).id }
     end
   end