Merge branch 'master' into rs-redactor-filter

1 files changed, 24 insertions, 0 deletions

diff --git a/spec/factories/ci/events.rb b/spec/factories/ci/events.rb
new file mode 100644
index 00000000000..9638618a400
--- /dev/null
+++ b/spec/factories/ci/events.rb
@@ -0,0 +1,24 @@
+# == Schema Information
+#
+# Table name: events
+#
+#  id          :integer          not null, primary key
+#  project_id  :integer
+#  user_id     :integer
+#  is_admin    :integer
+#  description :text
+#  created_at  :datetime
+#  updated_at  :datetime
+#
+
+FactoryGirl.define do
+  factory :ci_event, class: Ci::Event do
+    sequence :description do |n|
+      "updated project settings#{n}"
+    end
+
+    factory :ci_admin_event do
+      is_admin true
+    end
+  end
+end