From d8da8a61ef23ca27c3829a397bde5e1237865a49 Mon Sep 17 00:00:00 2001 From: Aaron Bauman <aaron@messageagency.com> Date: Thu, 3 Aug 2023 15:41:57 -0400 Subject: [PATCH] Fix tests --- .../src/Event/SalesforcePullEnqueueEvent.php | 2 +- modules/salesforce_pull/src/QueueHandler.php | 2 +- modules/salesforce_pull/tests/src/Unit/PullBaseTest.php | 3 +++ src/Event/SalesforceEvents.php | 6 ++++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/salesforce_mapping/src/Event/SalesforcePullEnqueueEvent.php b/modules/salesforce_mapping/src/Event/SalesforcePullEnqueueEvent.php index 3f324d30..d428e67d 100644 --- a/modules/salesforce_mapping/src/Event/SalesforcePullEnqueueEvent.php +++ b/modules/salesforce_mapping/src/Event/SalesforcePullEnqueueEvent.php @@ -54,7 +54,7 @@ class SalesforcePullEnqueueEvent extends SalesforceBaseEvent { * @param SelectQueryResult $records * @param SObject $record */ - public function __construct(SalesforceMappingInterface $mapping, SelectQueryResult $records, SObject $record, $force_pull){ + public function __construct(SalesforceMappingInterface $mapping, SelectQueryResult $records, SObject $record, $force_pull) { $this->mapping = $mapping; $this->records = $records; $this->record = $record; diff --git a/modules/salesforce_pull/src/QueueHandler.php b/modules/salesforce_pull/src/QueueHandler.php index 3ed6843f..66a4c9ff 100644 --- a/modules/salesforce_pull/src/QueueHandler.php +++ b/modules/salesforce_pull/src/QueueHandler.php @@ -289,7 +289,7 @@ class QueueHandler { $triggerField = $mapping->getPullTriggerDate(); try { foreach ($results->records() as $record) { - $event = $this->eventDispatcher->dispatch(new SalesforcePullEnqueueEvent($mapping, $results, $record), SalesforceEvents::PULL_ENQUEUE); + $event = $this->eventDispatcher->dispatch(new SalesforcePullEnqueueEvent($mapping, $results, $record, $force_pull), SalesforceEvents::PULL_ENQUEUE); if ($force_pull || $event->isEnqueueAllowed()) { $this->enqueueRecord($mapping, $record, $force_pull); } diff --git a/modules/salesforce_pull/tests/src/Unit/PullBaseTest.php b/modules/salesforce_pull/tests/src/Unit/PullBaseTest.php index 497760d3..bf1fa313 100644 --- a/modules/salesforce_pull/tests/src/Unit/PullBaseTest.php +++ b/modules/salesforce_pull/tests/src/Unit/PullBaseTest.php @@ -220,6 +220,9 @@ class PullBaseTest extends UnitTestCase { $this->etm, $this->sfapi, $this->ed, + [], + 'cron_salesforce_pull', + ['cron' => ['time' => 180]], ]) ->getMock(); $this->pullWorker->expects($this->any()) diff --git a/src/Event/SalesforceEvents.php b/src/Event/SalesforceEvents.php index d4436357..6877187d 100644 --- a/src/Event/SalesforceEvents.php +++ b/src/Event/SalesforceEvents.php @@ -2,6 +2,8 @@ namespace Drupal\salesforce\Event; +use Drupal\salesforce_mapping\Event\SalesforcePullEnqueueEvent; + /** * Defines events for Salesforce. * @@ -151,6 +153,10 @@ final class SalesforceEvents { const PULL_ENTITY_VALUE = 'salesforce.pull_entity_value'; /** + * Dispatched immediately prior to queueing a Drupal entity to be pulled. + * + * Subscribers receive a + * Drupal\salesforce_mapping\Event\SalesforcePullEnqueueEvent instance. * * @Event * -- GitLab