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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
f9e2e3e5
Commit
f9e2e3e5
authored
3 years ago
by
Serena Fang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move blocked user creation to higher scope
parent
9f1be2a7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
8 deletions
+3
-8
spec/requests/api/users_spec.rb
spec/requests/api/users_spec.rb
+3
-8
No files found.
spec/requests/api/users_spec.rb
View file @
f9e2e3e5
...
@@ -9,6 +9,7 @@ RSpec.describe API::Users do
...
@@ -9,6 +9,7 @@ RSpec.describe API::Users do
let_it_be
(
:gpg_key
)
{
create
(
:gpg_key
,
user:
user
)
}
let_it_be
(
:gpg_key
)
{
create
(
:gpg_key
,
user:
user
)
}
let_it_be
(
:email
)
{
create
(
:email
,
user:
user
)
}
let_it_be
(
:email
)
{
create
(
:email
,
user:
user
)
}
let
(
:blocked_user
)
{
create
(
:user
,
:blocked
)
}
let
(
:omniauth_user
)
{
create
(
:omniauth_user
)
}
let
(
:omniauth_user
)
{
create
(
:omniauth_user
)
}
let
(
:ldap_blocked_user
)
{
create
(
:omniauth_user
,
provider:
'ldapmain'
,
state:
'ldap_blocked'
)
}
let
(
:ldap_blocked_user
)
{
create
(
:omniauth_user
,
provider:
'ldapmain'
,
state:
'ldap_blocked'
)
}
let
(
:private_user
)
{
create
(
:user
,
private_profile:
true
)
}
let
(
:private_user
)
{
create
(
:user
,
private_profile:
true
)
}
...
@@ -2626,9 +2627,7 @@ RSpec.describe API::Users do
...
@@ -2626,9 +2627,7 @@ RSpec.describe API::Users do
end
end
context
'for a blocked user'
do
context
'for a blocked user'
do
before
do
let
(
:user_id
)
{
blocked_user
.
id
}
user
.
block
end
it
'returns 403'
do
it
'returns 403'
do
activate
activate
...
@@ -2723,9 +2722,7 @@ RSpec.describe API::Users do
...
@@ -2723,9 +2722,7 @@ RSpec.describe API::Users do
end
end
context
'for a blocked user'
do
context
'for a blocked user'
do
before
do
let
(
:user_id
)
{
blocked_user
.
id
}
user
.
block
end
it
'returns 403'
do
it
'returns 403'
do
deactivate
deactivate
...
@@ -2788,8 +2785,6 @@ RSpec.describe API::Users do
...
@@ -2788,8 +2785,6 @@ RSpec.describe API::Users do
subject
(
:approve
)
{
post
api
(
"/users/
#{
user_id
}
/approve"
,
api_user
)
}
subject
(
:approve
)
{
post
api
(
"/users/
#{
user_id
}
/approve"
,
api_user
)
}
let_it_be
(
:pending_user
)
{
create
(
:user
,
:blocked_pending_approval
)
}
let_it_be
(
:pending_user
)
{
create
(
:user
,
:blocked_pending_approval
)
}
let_it_be
(
:deactivated_user
)
{
create
(
:user
,
:deactivated
)
}
let_it_be
(
:blocked_user
)
{
create
(
:user
,
:blocked
)
}
context
'performed by a non-admin user'
do
context
'performed by a non-admin user'
do
let
(
:api_user
)
{
user
}
let
(
:api_user
)
{
user
}
...
...
This diff is collapsed.
Click to expand it.
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