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
Jérome Perrin
gitlab-ce
Commits
340f1fc9
Commit
340f1fc9
authored
Mar 30, 2016
by
Zeger-Jan van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor clean up on admin/users_controller_spec
parent
673bb9ef
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
12 deletions
+3
-12
spec/controllers/admin/users_controller_spec.rb
spec/controllers/admin/users_controller_spec.rb
+3
-12
No files found.
spec/controllers/admin/users_controller_spec.rb
View file @
340f1fc9
require
'spec_helper'
require
'spec_helper'
describe
Admin
::
UsersController
do
describe
Admin
::
UsersController
do
let
(
:
admin
)
{
create
(
:admin
)
}
let
(
:
user
)
{
create
(
:user
)
}
before
do
before
do
sign_in
(
admin
)
sign_in
(
create
(
:admin
)
)
end
end
describe
'DELETE #user with projects'
do
describe
'DELETE #user with projects'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:empty_project
,
namespace:
user
.
namespace
)
}
let
(
:project
)
{
create
(
:project
,
namespace:
user
.
namespace
)
}
before
do
before
do
project
.
team
<<
[
user
,
:developer
]
project
.
team
<<
[
user
,
:developer
]
...
@@ -23,8 +22,6 @@ describe Admin::UsersController do
...
@@ -23,8 +22,6 @@ describe Admin::UsersController do
end
end
describe
'PUT block/:id'
do
describe
'PUT block/:id'
do
let
(
:user
)
{
create
(
:user
)
}
it
'blocks user'
do
it
'blocks user'
do
put
:block
,
id:
user
.
username
put
:block
,
id:
user
.
username
user
.
reload
user
.
reload
...
@@ -50,8 +47,6 @@ describe Admin::UsersController do
...
@@ -50,8 +47,6 @@ describe Admin::UsersController do
end
end
context
'manually blocked users'
do
context
'manually blocked users'
do
let
(
:user
)
{
create
(
:user
)
}
before
do
before
do
user
.
block
user
.
block
end
end
...
@@ -66,8 +61,6 @@ describe Admin::UsersController do
...
@@ -66,8 +61,6 @@ describe Admin::UsersController do
end
end
describe
'PUT unlock/:id'
do
describe
'PUT unlock/:id'
do
let
(
:user
)
{
create
(
:user
)
}
before
do
before
do
request
.
env
[
"HTTP_REFERER"
]
=
"/"
request
.
env
[
"HTTP_REFERER"
]
=
"/"
user
.
lock_access!
user
.
lock_access!
...
@@ -95,8 +88,6 @@ describe Admin::UsersController do
...
@@ -95,8 +88,6 @@ describe Admin::UsersController do
end
end
describe
'PATCH disable_two_factor'
do
describe
'PATCH disable_two_factor'
do
let
(
:user
)
{
create
(
:user
)
}
it
'disables 2FA for the user'
do
it
'disables 2FA for the user'
do
expect
(
user
).
to
receive
(
:disable_two_factor!
)
expect
(
user
).
to
receive
(
:disable_two_factor!
)
allow
(
subject
).
to
receive
(
:user
).
and_return
(
user
)
allow
(
subject
).
to
receive
(
:user
).
and_return
(
user
)
...
...
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