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
e8aab1cd
Commit
e8aab1cd
authored
8 years ago
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
This fixes a long running tests due to changed Sidekiq state
parent
804fa437
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
14 deletions
+17
-14
spec/controllers/admin/groups_controller_spec.rb
spec/controllers/admin/groups_controller_spec.rb
+3
-2
spec/controllers/groups_controller_spec.rb
spec/controllers/groups_controller_spec.rb
+3
-2
spec/models/project_services/irker_service_spec.rb
spec/models/project_services/irker_service_spec.rb
+11
-10
No files found.
spec/controllers/admin/groups_controller_spec.rb
View file @
e8aab1cd
...
...
@@ -7,13 +7,14 @@ describe Admin::GroupsController do
before
do
sign_in
(
admin
)
Sidekiq
::
Testing
.
fake!
end
describe
'DELETE #destroy'
do
it
'schedules a group destroy'
do
Sidekiq
::
Testing
.
fake!
do
expect
{
delete
:destroy
,
id:
project
.
group
.
path
}.
to
change
(
GroupDestroyWorker
.
jobs
,
:size
).
by
(
1
)
end
end
it
'redirects to the admin group path'
do
delete
:destroy
,
id:
project
.
group
.
path
...
...
This diff is collapsed.
Click to expand it.
spec/controllers/groups_controller_spec.rb
View file @
e8aab1cd
...
...
@@ -89,13 +89,14 @@ describe GroupsController do
context
'as the group owner'
do
before
do
Sidekiq
::
Testing
.
fake!
sign_in
(
user
)
end
it
'schedules a group destroy'
do
Sidekiq
::
Testing
.
fake!
do
expect
{
delete
:destroy
,
id:
group
.
path
}.
to
change
(
GroupDestroyWorker
.
jobs
,
:size
).
by
(
1
)
end
end
it
'redirects to the root path'
do
delete
:destroy
,
id:
group
.
path
...
...
This diff is collapsed.
Click to expand it.
spec/models/project_services/irker_service_spec.rb
View file @
e8aab1cd
...
...
@@ -52,19 +52,20 @@ describe IrkerService, models: true do
let
(
:colorize_messages
)
{
'1'
}
before
do
@irker_server
=
TCPServer
.
new
'localhost'
,
0
allow
(
irker
).
to
receive_messages
(
active:
true
,
project:
project
,
project_id:
project
.
id
,
service_hook:
true
,
server_host:
'localhost'
,
server_port:
6659
,
server_host:
@irker_server
.
addr
[
2
]
,
server_port:
@irker_server
.
addr
[
1
]
,
default_irc_uri:
'irc://chat.freenode.net/'
,
recipients:
recipients
,
colorize_messages:
colorize_messages
)
irker
.
valid?
@irker_server
=
TCPServer
.
new
'localhost'
,
6659
end
after
do
...
...
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