Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
8040edcc
Commit
8040edcc
authored
Jan 09, 2018
by
Michael Kozono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Route validation for unchanged path
parent
65b04860
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
61 additions
and
1 deletion
+61
-1
app/models/route.rb
app/models/route.rb
+1
-1
spec/models/route_spec.rb
spec/models/route_spec.rb
+60
-0
No files found.
app/models/route.rb
View file @
8040edcc
...
@@ -8,7 +8,7 @@ class Route < ActiveRecord::Base
...
@@ -8,7 +8,7 @@ class Route < ActiveRecord::Base
presence:
true
,
presence:
true
,
uniqueness:
{
case_sensitive:
false
}
uniqueness:
{
case_sensitive:
false
}
validate
:ensure_permanent_paths
validate
:ensure_permanent_paths
,
if: :path_changed?
after_create
:delete_conflicting_redirects
after_create
:delete_conflicting_redirects
after_update
:delete_conflicting_redirects
,
if: :path_changed?
after_update
:delete_conflicting_redirects
,
if: :path_changed?
...
...
spec/models/route_spec.rb
View file @
8040edcc
...
@@ -16,6 +16,66 @@ describe Route do
...
@@ -16,6 +16,66 @@ describe Route do
it
{
is_expected
.
to
validate_presence_of
(
:source
)
}
it
{
is_expected
.
to
validate_presence_of
(
:source
)
}
it
{
is_expected
.
to
validate_presence_of
(
:path
)
}
it
{
is_expected
.
to
validate_presence_of
(
:path
)
}
it
{
is_expected
.
to
validate_uniqueness_of
(
:path
).
case_insensitive
}
it
{
is_expected
.
to
validate_uniqueness_of
(
:path
).
case_insensitive
}
describe
'#ensure_permanent_paths'
do
context
'when the route is not yet persisted'
do
let
(
:new_route
)
{
Route
.
new
(
path:
'foo'
,
source:
build
(
:group
))
}
context
'when permanent conflicting redirects exist'
do
it
'is invalid'
do
redirect
=
RedirectRoute
.
new
(
path:
'foo/bar/baz'
,
source:
create
(
:group
),
permanent:
true
)
redirect
.
save!
(
validate:
false
)
expect
(
new_route
.
valid?
).
to
be_falsey
expect
(
new_route
.
errors
.
first
[
1
]).
to
eq
(
'foo has been taken before. Please use another one'
)
end
end
context
'when no permanent conflicting redirects exist'
do
it
'is valid'
do
expect
(
new_route
.
valid?
).
to
be_truthy
end
end
end
context
'when path has changed'
do
before
do
route
.
path
=
'foo'
end
context
'when permanent conflicting redirects exist'
do
it
'is invalid'
do
redirect
=
RedirectRoute
.
new
(
path:
'foo/bar/baz'
,
source:
create
(
:group
),
permanent:
true
)
redirect
.
save!
(
validate:
false
)
expect
(
route
.
valid?
).
to
be_falsey
expect
(
route
.
errors
.
first
[
1
]).
to
eq
(
'foo has been taken before. Please use another one'
)
end
end
context
'when no permanent conflicting redirects exist'
do
it
'is valid'
do
expect
(
route
.
valid?
).
to
be_truthy
end
end
end
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
.
save!
(
validate:
false
)
expect
(
route
.
valid?
).
to
be_truthy
end
end
context
'when no permanent conflicting redirects exist'
do
it
'is valid'
do
expect
(
route
.
valid?
).
to
be_truthy
end
end
end
end
end
end
describe
'callbacks'
do
describe
'callbacks'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment