Skip to content
Snippets Groups Projects
Verified Commit 08d21fe8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Add small improvements to constrainers and specs

parent 82e551bd
No related branches found
No related tags found
1 merge request!7327Refactor routing constraints
Pipeline #
Loading
@@ -7,7 +7,7 @@ class GroupUrlConstrainer
Loading
@@ -7,7 +7,7 @@ class GroupUrlConstrainer
id = extract_resource_path(request.path) id = extract_resource_path(request.path)
   
if id =~ Gitlab::Regex.namespace_regex if id =~ Gitlab::Regex.namespace_regex
!!Group.find_by_path(id) Group.find_by(path: id).present?
else else
false false
end end
Loading
Loading
Loading
@@ -7,7 +7,7 @@ class UserUrlConstrainer
Loading
@@ -7,7 +7,7 @@ class UserUrlConstrainer
id = extract_resource_path(request.path) id = extract_resource_path(request.path)
   
if id =~ Gitlab::Regex.namespace_regex if id =~ Gitlab::Regex.namespace_regex
!!User.find_by('lower(username) = ?', id.downcase) User.find_by('lower(username) = ?', id.downcase).present?
else else
false false
end end
Loading
Loading
Loading
@@ -14,6 +14,6 @@ describe GroupUrlConstrainer, lib: true do
Loading
@@ -14,6 +14,6 @@ describe GroupUrlConstrainer, lib: true do
end end
   
def request(path) def request(path)
OpenStruct.new(path: path) double(:request, path: path)
end end
end end
Loading
@@ -11,6 +11,6 @@ describe UserUrlConstrainer, lib: true do
Loading
@@ -11,6 +11,6 @@ describe UserUrlConstrainer, lib: true do
end end
   
def request(path) def request(path)
OpenStruct.new(path: path) double(:request, path: path)
end end
end end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment