Commit 08d21fe8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Add small improvements to constrainers and specs

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 82e551bd
...@@ -7,7 +7,7 @@ class GroupUrlConstrainer ...@@ -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
......
...@@ -7,7 +7,7 @@ class UserUrlConstrainer ...@@ -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
......
...@@ -14,6 +14,6 @@ describe GroupUrlConstrainer, lib: true do ...@@ -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
...@@ -11,6 +11,6 @@ describe UserUrlConstrainer, lib: true do ...@@ -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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment