Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/actions/manifest_route_update.rb
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def find_or_create_valid_route(app, manifest_route, user_audit_info)
)
elsif !route.available_in_space?(app.space)
raise InvalidRoute.new('Routes cannot be mapped to destinations in different spaces')
elsif manifest_route[:options]
elsif manifest_route[:options].present?
message = RouteUpdateMessage.new({
'options' => manifest_route[:options]
})
Expand Down
2 changes: 1 addition & 1 deletion lib/delayed_job_plugins/before_enqueue_hook.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ class BeforeEnqueueHook < Delayed::Plugin
end
end
end
Delayed::Worker.plugins << BeforeEnqueueHook
Delayed::Worker.plugins << BeforeEnqueueHook unless Delayed::Worker.plugins.include?(BeforeEnqueueHook)
7 changes: 7 additions & 0 deletions spec/unit/actions/manifest_route_update_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ module VCAP::CloudController
end
end

context 'when no options are provided' do
it 'does not call RouteUpdate' do
expect(RouteUpdate).not_to receive(:new)
ManifestRouteUpdate.update(app.guid, message, user_audit_info)
end
end

context 'when the new route has a protocol' do
let(:message) do
ManifestRoutesUpdateMessage.new(
Expand Down
16 changes: 16 additions & 0 deletions spec/unit/lib/delayed_job_plugins/before_enqueue_hook_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
require 'delayed_job'
require_relative '../../../../lib/delayed_job_plugins/before_enqueue_hook'

RSpec.describe BeforeEnqueueHook do
it 'is registered in Delayed::Worker.plugins' do
expect(Delayed::Worker.plugins).to include(BeforeEnqueueHook)
end

it 'does not register duplicate entries when loaded multiple times' do
count_before = Delayed::Worker.plugins.count(BeforeEnqueueHook)
load File.expand_path('../../../../lib/delayed_job_plugins/before_enqueue_hook.rb', __dir__)
count_after = Delayed::Worker.plugins.count(BeforeEnqueueHook)

expect(count_after).to eq(count_before)
end
end
Loading