summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2018-01-11 11:17:38 -0800
committerMichael Kozono <mkozono@gmail.com>2018-01-11 11:17:38 -0800
commit601c24d5b6b4b10ea986223c7a38110435420dbe (patch)
treeda66d6c3e7be1263aa6a88172e2ca3c161bcb243
parentc517788e671a0a81b08dbad1fb4537f0f56a43d0 (diff)
downloadgitlab-ce-601c24d5b6b4b10ea986223c7a38110435420dbe.tar.gz
Add RedirectRoute factory
-rw-r--r--spec/factories/redirect_routes.rb15
-rw-r--r--spec/models/route_spec.rb6
2 files changed, 18 insertions, 3 deletions
diff --git a/spec/factories/redirect_routes.rb b/spec/factories/redirect_routes.rb
new file mode 100644
index 00000000000..c29c81c5df9
--- /dev/null
+++ b/spec/factories/redirect_routes.rb
@@ -0,0 +1,15 @@
+FactoryBot.define do
+ factory :redirect_route do
+ sequence(:path) { |n| "redirect#{n}" }
+ source factory: :group
+ permanent false
+
+ trait :permanent do
+ permanent true
+ end
+
+ trait :temporary do
+ permanent false
+ end
+ end
+end
diff --git a/spec/models/route_spec.rb b/spec/models/route_spec.rb
index 1266e0ea602..8a3b1034f3c 100644
--- a/spec/models/route_spec.rb
+++ b/spec/models/route_spec.rb
@@ -23,7 +23,7 @@ describe Route do
context 'when permanent conflicting redirects exist' do
it 'is invalid' do
- redirect = RedirectRoute.new(path: 'foo/bar/baz', source: create(:group), permanent: true)
+ redirect = build(:redirect_route, :permanent, path: 'foo/bar/baz')
redirect.save!(validate: false)
expect(new_route.valid?).to be_falsey
@@ -45,7 +45,7 @@ describe Route do
context 'when permanent conflicting redirects exist' do
it 'is invalid' do
- redirect = RedirectRoute.new(path: 'foo/bar/baz', source: create(:group), permanent: true)
+ redirect = build(:redirect_route, :permanent, path: 'foo/bar/baz')
redirect.save!(validate: false)
expect(route.valid?).to be_falsey
@@ -63,7 +63,7 @@ describe Route do
context 'when path has not changed' do
context 'when permanent conflicting redirects exist' do
it 'is valid' do
- redirect = RedirectRoute.new(path: 'git_lab/foo/bar', source: create(:group), permanent: true)
+ redirect = build(:redirect_route, :permanent, path: 'git_lab/foo/bar')
redirect.save!(validate: false)
expect(route.valid?).to be_truthy