Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
mastofe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Pleroma
mastofe
Commits
19abf4ef
Commit
19abf4ef
authored
6 years ago
by
ysksn
Committed by
Yamagishi Kazutoshi
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add specs for UnreservedUsernameValidator (#9698)
* Add specs for UnreservedUsernameValidator * Use instance variable
parent
9790f3b5
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/validators/unreserved_username_validator.rb
+9
-7
9 additions, 7 deletions
app/validators/unreserved_username_validator.rb
spec/validators/unreserved_username_validator_spec.rb
+44
-0
44 additions, 0 deletions
spec/validators/unreserved_username_validator_spec.rb
with
53 additions
and
7 deletions
app/validators/unreserved_username_validator.rb
+
9
−
7
View file @
19abf4ef
...
...
@@ -2,20 +2,22 @@
class
UnreservedUsernameValidator
<
ActiveModel
::
Validator
def
validate
(
account
)
return
if
account
.
username
.
nil?
account
.
errors
.
add
(
:username
,
I18n
.
t
(
'accounts.reserved_username'
))
if
reserved_username?
(
account
.
username
)
@username
=
account
.
username
return
if
@username
.
nil?
account
.
errors
.
add
(
:username
,
I18n
.
t
(
'accounts.reserved_username'
))
if
reserved_username?
end
private
def
pam_controlled?
(
value
)
def
pam_controlled?
return
false
unless
Devise
.
pam_authentication
&&
Devise
.
pam_controlled_service
Rpam2
.
account
(
Devise
.
pam_controlled_service
,
valu
e
).
present?
Rpam2
.
account
(
Devise
.
pam_controlled_service
,
@usernam
e
).
present?
end
def
reserved_username?
(
value
)
return
true
if
pam_controlled?
(
value
)
def
reserved_username?
return
true
if
pam_controlled?
return
false
unless
Setting
.
reserved_usernames
Setting
.
reserved_usernames
.
include?
(
valu
e
.
downcase
)
Setting
.
reserved_usernames
.
include?
(
@usernam
e
.
downcase
)
end
end
This diff is collapsed.
Click to expand it.
spec/validators/unreserved_username_validator_spec.rb
0 → 100644
+
44
−
0
View file @
19abf4ef
# frozen_string_literal: true
require
'rails_helper'
RSpec
.
describe
UnreservedUsernameValidator
,
type: :validator
do
describe
'#validate'
do
before
do
allow
(
validator
).
to
receive
(
:reserved_username?
)
{
reserved_username
}
validator
.
validate
(
account
)
end
let
(
:validator
)
{
described_class
.
new
}
let
(
:account
)
{
double
(
username:
username
,
errors:
errors
)
}
let
(
:errors
)
{
double
(
add:
nil
)
}
context
'@username.nil?'
do
let
(
:username
)
{
nil
}
it
'not calls errors.add'
do
expect
(
errors
).
not_to
have_received
(
:add
).
with
(
:username
,
any_args
)
end
end
context
'!@username.nil?'
do
let
(
:username
)
{
''
}
context
'reserved_username?'
do
let
(
:reserved_username
)
{
true
}
it
'calls erros.add'
do
expect
(
errors
).
to
have_received
(
:add
).
with
(
:username
,
I18n
.
t
(
'accounts.reserved_username'
))
end
end
context
'!reserved_username?'
do
let
(
:reserved_username
)
{
false
}
it
'not calls erros.add'
do
expect
(
errors
).
not_to
have_received
(
:add
).
with
(
:username
,
any_args
)
end
end
end
end
end
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment