Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce

# Conflicts:
#   db/schema.rb

3 files changed, 12 insertions, 7 deletions

diff --git a/spec/factories/boards.rb b/spec/factories/boards.rb
index ec46146d9b5..a581725245a 100644
--- a/spec/factories/boards.rb
+++ b/spec/factories/boards.rb
@@ -3,7 +3,6 @@ FactoryGirl.define do
     project factory: :empty_project
 
     after(:create) do |board|
-      board.lists.create(list_type: :backlog)
       board.lists.create(list_type: :done)
     end
   end
diff --git a/spec/factories/events.rb b/spec/factories/events.rb
index bfe41f71b57..55727d6b62c 100644
--- a/spec/factories/events.rb
+++ b/spec/factories/events.rb
@@ -3,6 +3,18 @@ FactoryGirl.define do
     project factory: :empty_project
     author factory: :user
 
+    trait(:created)   { action Event::CREATED }
+    trait(:updated)   { action Event::UPDATED }
+    trait(:closed)    { action Event::CLOSED }
+    trait(:reopened)  { action Event::REOPENED }
+    trait(:pushed)    { action Event::PUSHED }
+    trait(:commented) { action Event::COMMENTED }
+    trait(:merged)    { action Event::MERGED }
+    trait(:joined)    { action Event::JOINED }
+    trait(:left)      { action Event::LEFT }
+    trait(:destroyed) { action Event::DESTROYED }
+    trait(:expired)   { action Event::EXPIRED }
+
     factory :closed_issue_event do
       action { Event::CLOSED }
       target factory: :closed_issue
diff --git a/spec/factories/lists.rb b/spec/factories/lists.rb
index 9e3f06c682c..2a2f3cca91c 100644
--- a/spec/factories/lists.rb
+++ b/spec/factories/lists.rb
@@ -6,12 +6,6 @@ FactoryGirl.define do
     sequence(:position)
   end
 
-  factory :backlog_list, parent: :list do
-    list_type :backlog
-    label nil
-    position nil
-  end
-
   factory :done_list, parent: :list do
     list_type :done
     label nil