Merge branch 'fix-failing-tests' into 'master'
This fixes a long running tests due to changed Sidekiq state ## What does this MR do? Fixes a ordering of tests problem, where GroupsController tests change global state and this affects IrkerService cc @connorshea See merge request !5819
This commit is contained in:
commit
931eadaa5e
3 changed files with 10 additions and 7 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue