Skip to content
Merged
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
4 changes: 3 additions & 1 deletion lib/active_interactor/organizer/interactor_interface.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,10 @@ def execute_inplace_callback(target, callback)
end

# Executes after_perform callbacks that have been deferred on the interactor
def execute_deferred_after_perform_callbacks(context)
def execute_deferred_after_perform_callbacks(context, organizer)
return unless deferred_after_perform_callbacks.present?
return if check_conditionals(organizer, :if) == false
return if check_conditionals(organizer, :unless) == true

interactor = interactor_class.new(context)
env = ActiveSupport::Callbacks::Filters::Environment.new(interactor, false, nil)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def execute_deferred_after_perform_callbacks(context)
if interface.interactor_class <= ActiveInteractor::Organizer::Base
context.merge!(interface.interactor_class.organized.execute_deferred_after_perform_callbacks(context))
else
context.merge!(interface.execute_deferred_after_perform_callbacks(context))
context.merge!(interface.execute_deferred_after_perform_callbacks(context, self))
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/active_interactor/organizer/perform.rb
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def run_deferred_callbacks(interface)
end

def run_deferred_callbacks_on_interactor(interface, context)
context.merge!(interface.execute_deferred_after_perform_callbacks(context))
context.merge!(interface.execute_deferred_after_perform_callbacks(context, self))
end

def run_deferred_callbacks_on_children(organizer_interface, context)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,40 @@ def test_method
expect_any_instance_of(test_interactor_2).to receive(:perform)
subject
end

context 'when the first interactor has a deferred callback' do
let!(:test_interactor_1) do
build_interactor('TestInteractor1') do
defer_after_callbacks_when_organized

after_perform do
context.after_perform_was_invoked = true
end
end
end

it 'is expected to invoke the deferred callback' do
result = subject
expect(result.after_perform_was_invoked).to be_truthy
end
end

context 'when the second interactor has a deferred callback' do
let!(:test_interactor_2) do
build_interactor('TestInteractor2') do
defer_after_callbacks_when_organized

after_perform do
context.after_perform_was_invoked = true
end
end
end

it 'is expected to invoke the deferred callback' do
result = subject
expect(result.after_perform_was_invoked).to be_truthy
end
end
end
end

Expand Down Expand Up @@ -247,6 +281,40 @@ def test_method
expect_any_instance_of(test_interactor_2).to receive(:perform)
subject
end

context 'when the first interactor has a deferred callback' do
let!(:test_interactor_1) do
build_interactor('TestInteractor1') do
defer_after_callbacks_when_organized

after_perform do
context.after_perform_was_invoked = true
end
end
end

it 'is expected not to invoke the deferred callback' do
result = subject
expect(result.after_perform_was_invoked).to be_nil
end
end

context 'when the second interactor has a deferred callback' do
let!(:test_interactor_2) do
build_interactor('TestInteractor2') do
defer_after_callbacks_when_organized

after_perform do
context.after_perform_was_invoked = true
end
end
end

it 'is expected to invoke the deferred callback' do
result = subject
expect(result.after_perform_was_invoked).to be_truthy
end
end
end
end

Expand Down Expand Up @@ -286,6 +354,40 @@ def test_method
expect_any_instance_of(test_interactor_2).to receive(:perform)
subject
end

context 'when the first interactor has a deferred callback' do
let!(:test_interactor_1) do
build_interactor('TestInteractor1') do
defer_after_callbacks_when_organized

after_perform do
context.after_perform_was_invoked = true
end
end
end

it 'is expected to invoke the deferred callback' do
result = subject
expect(result.after_perform_was_invoked).to be_nil
end
end

context 'when the second interactor has a deferred callback' do
let!(:test_interactor_2) do
build_interactor('TestInteractor2') do
defer_after_callbacks_when_organized

after_perform do
context.after_perform_was_invoked = true
end
end
end

it 'is expected to invoke the deferred callback' do
result = subject
expect(result.after_perform_was_invoked).to be_truthy
end
end
end
end

Expand Down Expand Up @@ -321,6 +423,40 @@ def test_method
expect_any_instance_of(test_interactor_2).to receive(:perform)
subject
end

context 'when the first interactor has a deferred callback' do
let!(:test_interactor_1) do
build_interactor('TestInteractor1') do
defer_after_callbacks_when_organized

after_perform do
context.after_perform_was_invoked = true
end
end
end

it 'is expected to invoke the deferred callback' do
result = subject
expect(result.after_perform_was_invoked).to be_truthy
end
end

context 'when the second interactor has a deferred callback' do
let!(:test_interactor_2) do
build_interactor('TestInteractor2') do
defer_after_callbacks_when_organized

after_perform do
context.after_perform_was_invoked = true
end
end
end

it 'is expected to invoke the deferred callback' do
result = subject
expect(result.after_perform_was_invoked).to be_truthy
end
end
end
end
end