summaryrefslogtreecommitdiff
path: root/spec/factories
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-03-23 17:37:14 +0100
committerRémy Coutable <remy@rymai.me>2017-04-03 18:54:48 +0200
commit169dc4cec1f45cdcc548e3e682e4fd6f4c98926a (patch)
treebcf157ecd3f15f27ddb55fabebad1a8842c2bcc1 /spec/factories
parent5f7cb26394921535a6e1e15f3baee7666c3ef654 (diff)
downloadgitlab-ce-169dc4cec1f45cdcc548e3e682e4fd6f4c98926a.tar.gz
Fix brittle specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/factories')
-rw-r--r--spec/factories/issues.rb2
-rw-r--r--spec/factories/merge_requests.rb2
-rw-r--r--spec/factories/sequences.rb2
-rw-r--r--spec/factories/snippets.rb9
4 files changed, 7 insertions, 8 deletions
diff --git a/spec/factories/issues.rb b/spec/factories/issues.rb
index dbd0fff8376..0b6977e3b17 100644
--- a/spec/factories/issues.rb
+++ b/spec/factories/issues.rb
@@ -1,6 +1,6 @@
FactoryGirl.define do
factory :issue do
- title
+ title { generate(:title) }
author
project factory: :empty_project
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb
index ae0bbbd6aeb..e36fe326e1c 100644
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
@@ -1,6 +1,6 @@
FactoryGirl.define do
factory :merge_request do
- title
+ title { generate(:title) }
author
association :source_project, :repository, factory: :project
target_project { source_project }
diff --git a/spec/factories/sequences.rb b/spec/factories/sequences.rb
index 5b8501aa770..2321455bfee 100644
--- a/spec/factories/sequences.rb
+++ b/spec/factories/sequences.rb
@@ -3,6 +3,8 @@ FactoryGirl.define do
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) { |n| "label#{n}" }
sequence(:branch) { |n| "my-branch-#{n}" }
diff --git a/spec/factories/snippets.rb b/spec/factories/snippets.rb
index fb87c584f0b..18cb0f5de26 100644
--- a/spec/factories/snippets.rb
+++ b/spec/factories/snippets.rb
@@ -1,12 +1,9 @@
FactoryGirl.define do
- sequence(:title, aliases: [:content]) { |n| "My snippet #{n}" }
- sequence(:file_name) { |n| "snippet-#{n}.rb" }
-
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