Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
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
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
8f991831
Commit
8f991831
authored
7 years ago
by
Akihiko Odaki (@fn_aki@pawoo.net)
Committed by
Eugen Rochko
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Cover Admin::DomainBlocksController more (#3329)
Also domain_block fabricator now sets unique domains
parent
87efa387
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
spec/controllers/admin/domain_blocks_controller_spec.rb
+30
-4
30 additions, 4 deletions
spec/controllers/admin/domain_blocks_controller_spec.rb
spec/fabricators/domain_block_fabricator.rb
+1
-1
1 addition, 1 deletion
spec/fabricators/domain_block_fabricator.rb
with
31 additions
and
5 deletions
spec/controllers/admin/domain_blocks_controller_spec.rb
+
30
−
4
View file @
8f991831
...
...
@@ -8,17 +8,30 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
end
describe
'GET #index'
do
it
'returns http success'
do
get
:index
around
do
|
example
|
default_per_page
=
DomainBlock
.
default_per_page
DomainBlock
.
paginates_per
1
example
.
run
DomainBlock
.
paginates_per
default_per_page
end
it
'renders domain blocks'
do
2
.
times
{
Fabricate
(
:domain_block
)
}
get
:index
,
params:
{
page:
2
}
assigned
=
assigns
(
:domain_blocks
)
expect
(
assigned
.
count
).
to
eq
1
expect
(
assigned
.
klass
).
to
be
DomainBlock
expect
(
response
).
to
have_http_status
(
:success
)
end
end
describe
'GET #new'
do
it
'
returns http success
'
do
it
'
assigns a new domain block
'
do
get
:new
expect
(
assigns
(
:domain_block
)).
to
be_instance_of
(
DomainBlock
)
expect
(
response
).
to
have_http_status
(
:success
)
end
end
...
...
@@ -33,13 +46,25 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
end
describe
'POST #create'
do
it
'blocks the domain'
do
it
'blocks the domain
when succeeded to save
'
do
allow
(
DomainBlockWorker
).
to
receive
(
:perform_async
).
and_return
(
true
)
post
:create
,
params:
{
domain_block:
{
domain:
'example.com'
,
severity:
'silence'
}
}
expect
(
DomainBlockWorker
).
to
have_received
(
:perform_async
)
expect
(
flash
[
:notice
]).
to
eq
I18n
.
t
(
'admin.domain_blocks.created_msg'
)
expect
(
response
).
to
redirect_to
(
admin_domain_blocks_path
)
end
it
'renders new when failed to save'
do
Fabricate
(
:domain_block
,
domain:
'example.com'
)
allow
(
DomainBlockWorker
).
to
receive
(
:perform_async
).
and_return
(
true
)
post
:create
,
params:
{
domain_block:
{
domain:
'example.com'
,
severity:
'silence'
}
}
expect
(
DomainBlockWorker
).
not_to
have_received
(
:perform_async
)
expect
(
response
).
to
render_template
:new
end
end
describe
'DELETE #destroy'
do
...
...
@@ -50,6 +75,7 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
delete
:destroy
,
params:
{
id:
domain_block
.
id
,
domain_block:
{
retroactive:
'1'
}
}
expect
(
service
).
to
have_received
(
:call
).
with
(
domain_block
,
true
)
expect
(
flash
[
:notice
]).
to
eq
I18n
.
t
(
'admin.domain_blocks.destroyed_msg'
)
expect
(
response
).
to
redirect_to
(
admin_domain_blocks_path
)
end
end
...
...
This diff is collapsed.
Click to expand it.
spec/fabricators/domain_block_fabricator.rb
+
1
−
1
View file @
8f991831
Fabricator
(
:domain_block
)
do
domain
"example.com"
domain
{
sequence
(
:domain
)
{
|
i
|
"
#{
i
}#{
Faker
::
Internet
.
domain_name
}
"
}
}
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