Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'

# Conflicts:
#   app/assets/javascripts/dispatcher.js
#   app/assets/stylesheets/pages/projects.scss

22 files changed, 64 insertions, 55 deletions

diff --git a/spec/factories/boards.rb b/spec/factories/boards.rb
index a581725245a..4df9aef2846 100644
--- a/spec/factories/boards.rb
+++ b/spec/factories/boards.rb
@@ -3,7 +3,7 @@ FactoryGirl.define do
     project factory: :empty_project
 
     after(:create) do |board|
-      board.lists.create(list_type: :done)
+      board.lists.create(list_type: :closed)
     end
   end
 end
diff --git a/spec/factories/chat_names.rb b/spec/factories/chat_names.rb
index 24225468d55..9a0be1a4598 100644
--- a/spec/factories/chat_names.rb
+++ b/spec/factories/chat_names.rb
@@ -6,11 +6,7 @@ FactoryGirl.define do
     team_id 'T0001'
     team_domain 'Awesome Team'
 
-    sequence :chat_id do |n|
-      "U#{n}"
-    end
-    sequence :chat_name do |n|
-      "user#{n}"
-    end
+    sequence(:chat_id) { |n| "U#{n}" }
+    chat_name { generate(:username) }
   end
 end
diff --git a/spec/factories/chat_teams.rb b/spec/factories/chat_teams.rb
index 82f44fa3d15..ffedf69a69b 100644
--- a/spec/factories/chat_teams.rb
+++ b/spec/factories/chat_teams.rb
@@ -1,9 +1,6 @@
 FactoryGirl.define do
   factory :chat_team, class: ChatTeam do
-    sequence :team_id do |n|
-      "abcdefghijklm#{n}"
-    end
-
+    sequence(:team_id) { |n| "abcdefghijklm#{n}" }
     namespace factory: :group
   end
 end
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 6b0d084614b..87a0c95c4dc 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -172,7 +172,7 @@ FactoryGirl.define do
         {
             image: 'ruby:2.1',
             services: ['postgres'],
-            after_script: "ls\ndate",
+            after_script: %w(ls date),
             artifacts: {
                 name: 'artifacts_file',
                 untracked: false,
@@ -192,5 +192,10 @@ FactoryGirl.define do
     trait :no_options do
       options { {} }
     end
+
+    trait :non_playable do
+      status 'created'
+      self.when 'manual'
+    end
   end
 end
diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb
index b67c96bc00d..561fbc8e247 100644
--- a/spec/factories/ci/pipelines.rb
+++ b/spec/factories/ci/pipelines.rb
@@ -48,6 +48,10 @@ FactoryGirl.define do
       trait :success do
         status :success
       end
+
+      trait :failed do
+        status :failed
+      end
     end
   end
 end
diff --git a/spec/factories/ci/runners.rb b/spec/factories/ci/runners.rb
index c3b4aff55ba..05abf60d5ce 100644
--- a/spec/factories/ci/runners.rb
+++ b/spec/factories/ci/runners.rb
@@ -1,8 +1,6 @@
 FactoryGirl.define do
   factory :ci_runner, class: Ci::Runner do
-    sequence :description do |n|
-      "My runner#{n}"
-    end
+    sequence(:description) { |n| "My runner#{n}" }
 
     platform  "darwin"
     is_shared false
diff --git a/spec/factories/emails.rb b/spec/factories/emails.rb
index 9794772ac7d..8303861bcfe 100644
--- a/spec/factories/emails.rb
+++ b/spec/factories/emails.rb
@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :email do
     user
-    email { FFaker::Internet.email('alias') }
+    email { generate(:email_alias) }
   end
 end
diff --git a/spec/factories/environments.rb b/spec/factories/environments.rb
index 0852dda6b29..3fbf24b5c7d 100644
--- a/spec/factories/environments.rb
+++ b/spec/factories/environments.rb
@@ -32,5 +32,10 @@ FactoryGirl.define do
         environment.update_attribute(:deployments, [deployment])
       end
     end
+
+    trait :non_playable do
+      status 'created'
+      self.when 'manual'
+    end
   end
 end
diff --git a/spec/factories/issues.rb b/spec/factories/issues.rb
index 7e09f1ba8ea..0b6977e3b17 100644
--- a/spec/factories/issues.rb
+++ b/spec/factories/issues.rb
@@ -1,10 +1,6 @@
 FactoryGirl.define do
-  sequence :issue_created_at do |n|
-    4.hours.ago + ( 2 * n ).seconds
-  end
-
   factory :issue do
-    title
+    title { generate(:title) }
     author
     project factory: :empty_project
 
diff --git a/spec/factories/labels.rb b/spec/factories/labels.rb
index 5ba8443c62c..22c2a1f15e2 100644
--- a/spec/factories/labels.rb
+++ b/spec/factories/labels.rb
@@ -1,7 +1,10 @@
 FactoryGirl.define do
-  factory :label, class: ProjectLabel do
-    sequence(:title) { |n| "label#{n}" }
+  trait :base_label do
+    title { generate(:label_title) }
     color "#990000"
+  end
+
+  factory :label, traits: [:base_label], class: ProjectLabel do
     project factory: :empty_project
 
     transient do
@@ -15,9 +18,7 @@ FactoryGirl.define do
     end
   end
 
-  factory :group_label, class: GroupLabel do
-    sequence(:title) { |n| "label#{n}" }
-    color "#990000"
+  factory :group_label, traits: [:base_label] do
     group
   end
 end
diff --git a/spec/factories/lists.rb b/spec/factories/lists.rb
index 2a2f3cca91c..f6a78811cbe 100644
--- a/spec/factories/lists.rb
+++ b/spec/factories/lists.rb
@@ -6,8 +6,8 @@ FactoryGirl.define do
     sequence(:position)
   end
 
-  factory :done_list, parent: :list do
-    list_type :done
+  factory :closed_list, parent: :list do
+    list_type :closed
     label nil
     position nil
   end
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb
index 21487541507..e36fe326e1c 100644
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
@@ -1,10 +1,9 @@
 FactoryGirl.define do
   factory :merge_request do
-    title
+    title { generate(:title) }
     author
     association :source_project, :repository, factory: :project
     target_project { source_project }
-    project { target_project }
 
     # $ git log --pretty=oneline feature..master
     # 5937ac0a7beb003549fc5fd26fc247adbce4a52e Add submodule from gitlab.com
diff --git a/spec/factories/oauth_applications.rb b/spec/factories/oauth_applications.rb
index 86cdc208268..c7ede40f240 100644
--- a/spec/factories/oauth_applications.rb
+++ b/spec/factories/oauth_applications.rb
@@ -1,8 +1,8 @@
 FactoryGirl.define do
   factory :oauth_application, class: 'Doorkeeper::Application', aliases: [:application] do
-    name { FFaker::Name.name }
+    sequence(:name) { |n| "OAuth App #{n}" }
     uid { Doorkeeper::OAuth::Helpers::UniqueToken.generate }
-    redirect_uri { FFaker::Internet.uri('http') }
+    redirect_uri { generate(:url) }
     owner
     owner_type 'User'
   end
diff --git a/spec/factories/personal_access_tokens.rb b/spec/factories/personal_access_tokens.rb
index 7b15ba47de1..06acaff6cd0 100644
--- a/spec/factories/personal_access_tokens.rb
+++ b/spec/factories/personal_access_tokens.rb
@@ -2,7 +2,7 @@ FactoryGirl.define do
   factory :personal_access_token do
     user
     token { SecureRandom.hex(50) }
-    name { FFaker::Product.brand }
+    sequence(:name) { |n| "PAT #{n}" }
     revoked false
     expires_at { 5.days.from_now }
     scopes ['api']
diff --git a/spec/factories/project_hooks.rb b/spec/factories/project_hooks.rb
index 424ecc65759..39c2a9dd1fb 100644
--- a/spec/factories/project_hooks.rb
+++ b/spec/factories/project_hooks.rb
@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :project_hook do
-    url { FFaker::Internet.uri('http') }
+    url { generate(:url) }
 
     trait :token do
       token { SecureRandom.hex(10) }
diff --git a/spec/factories/sequences.rb b/spec/factories/sequences.rb
new file mode 100644
index 00000000000..c0232ba5bf6
--- /dev/null
+++ b/spec/factories/sequences.rb
@@ -0,0 +1,12 @@
+FactoryGirl.define do
+  sequence(:username) { |n| "user#{n}" }
+  sequence(:name) { |n| "John Doe#{n}" }
+  sequence(:email) { |n| "user#{n}@example.org" }
+  sequence(:email_alias) { |n| "user.alias#{n}@example.org" }
+  sequence(:title) { |n| "My title #{n}" }
+  sequence(:filename) { |n| "filename-#{n}.rb" }
+  sequence(:url) { |n| "http://example#{n}.org" }
+  sequence(:label_title) { |n| "label#{n}" }
+  sequence(:branch) { |n| "my-branch-#{n}" }
+  sequence(:past_time) { |n| 4.hours.ago + (2 * n).seconds }
+end
diff --git a/spec/factories/service_hooks.rb b/spec/factories/service_hooks.rb
index 6dd6af63f3e..e3f88ab8fcc 100644
--- a/spec/factories/service_hooks.rb
+++ b/spec/factories/service_hooks.rb
@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :service_hook do
-    url { FFaker::Internet.uri('http') }
+    url { generate(:url) }
     service
   end
 end
diff --git a/spec/factories/snippets.rb b/spec/factories/snippets.rb
index 365f12a0c95..18cb0f5de26 100644
--- a/spec/factories/snippets.rb
+++ b/spec/factories/snippets.rb
@@ -1,17 +1,9 @@
 FactoryGirl.define do
-  sequence :title, aliases: [:content] do
-    FFaker::Lorem.sentence
-  end
-
-  sequence :file_name do
-    FFaker::Internet.user_name
-  end
-
   factory :snippet do
     author
-    title
-    content
-    file_name
+    title { generate(:title) }
+    content { generate(:title) }
+    file_name { generate(:filename) }
 
     trait :public do
       visibility_level Snippet::PUBLIC
diff --git a/spec/factories/spam_logs.rb b/spec/factories/spam_logs.rb
index a4f6d291269..e369f9f13e9 100644
--- a/spec/factories/spam_logs.rb
+++ b/spec/factories/spam_logs.rb
@@ -1,9 +1,9 @@
 FactoryGirl.define do
   factory :spam_log do
     user
-    source_ip { FFaker::Internet.ip_v4_address }
+    sequence(:source_ip) { |n| "42.42.42.#{n % 255}" }
     noteable_type 'Issue'
-    title { FFaker::Lorem.sentence }
-    description { FFaker::Lorem.paragraph(5) }
+    sequence(:title) { |n| "Spam title #{n}" }
+    description { "Spam description\nwith\nmultiple\nlines" }
   end
 end
diff --git a/spec/factories/system_hooks.rb b/spec/factories/system_hooks.rb
index c786e9cb79b..841e1e293e8 100644
--- a/spec/factories/system_hooks.rb
+++ b/spec/factories/system_hooks.rb
@@ -1,5 +1,5 @@
 FactoryGirl.define do
   factory :system_hook do
-    url { FFaker::Internet.uri('http') }
+    url { generate(:url) }
   end
 end
diff --git a/spec/factories/system_note_metadata.rb b/spec/factories/system_note_metadata.rb
new file mode 100644
index 00000000000..f487a2d7e4a
--- /dev/null
+++ b/spec/factories/system_note_metadata.rb
@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :system_note_metadata do
+    note
+    action 'merge'
+  end
+end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index 249dabbaae8..e1ae94a08e4 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -1,10 +1,8 @@
 FactoryGirl.define do
-  sequence(:name) { FFaker::Name.name }
-
   factory :user, aliases: [:author, :assignee, :recipient, :owner, :creator, :resource_owner] do
-    email { FFaker::Internet.email }
-    name
-    sequence(:username) { |n| "#{FFaker::Internet.user_name}#{n}" }
+    email { generate(:email) }
+    name { generate(:name) }
+    username { generate(:username) }
     password "12345678"
     confirmed_at { Time.now }
     confirmation_token { nil }