Skip to content

Commit dada9d4

Browse files
authored
Merge pull request #63 from cakephp/tests-61
Add tests for #61
2 parents b4fbb14 + 7fa2e73 commit dada9d4

File tree

3 files changed

+30
-4
lines changed

3 files changed

+30
-4
lines changed

src/Command/WorkerCommand.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
use Cake\Log\Log;
2525
use Cake\Queue\Consumption\QueueExtension;
2626
use Cake\Queue\Queue\Processor;
27-
use Enqueue\SimpleClient\SimpleClient;
27+
use Cake\Queue\QueueManager;
2828
use Psr\Log\LoggerInterface;
2929
use Psr\Log\NullLogger;
3030

@@ -139,8 +139,7 @@ public function execute(Arguments $args, ConsoleIo $io)
139139
$processor->getEventManager()->on($listener);
140140
$extension->getEventManager()->on($listener);
141141
}
142-
$url = Configure::read("Queue.{$config}.url");
143-
$client = new SimpleClient($url, $logger);
142+
$client = QueueManager::engine($config);
144143
$queue = $args->getOption('queue')
145144
? (string)$args->getOption('queue')
146145
: Configure::read("Queue.{$config}.queue", 'default');

tests/TestCase/Command/WorkerCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ public function testQueueProcessesJobWithOtherQueue()
223223
{
224224
$config = [
225225
'queue' => 'other',
226-
'url' => 'file:///' . TMP . DS . 'queue',
226+
'url' => 'file:///' . TMP . DS . 'other-queue',
227227
];
228228
Configure::write([
229229
'Queue' => ['other' => $config],

tests/TestCase/QueueManagerTest.php

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,33 @@ public function testSetConfigOverwrite()
7171
]);
7272
}
7373

74+
public function testNonDefaultQueueNameString()
75+
{
76+
QueueManager::setConfig('test', [
77+
'url' => 'file:///' . TMP . DS . 'queue',
78+
'queue' => 'other',
79+
]);
80+
$engine = QueueManager::engine('test');
81+
$this->assertInstanceOf(SimpleClient::class, $engine);
82+
$this->assertSame('other', $engine->getDriver()->getConfig()->getRouterQueue());
83+
}
84+
85+
public function testNonDefaultQueueNameArray()
86+
{
87+
QueueManager::setConfig('test', [
88+
'url' => [
89+
'transport' => 'file:',
90+
'client' => [
91+
'router_queue' => 'other',
92+
],
93+
],
94+
'queue' => 'ignored',
95+
]);
96+
$engine = QueueManager::engine('test');
97+
$this->assertInstanceOf(SimpleClient::class, $engine);
98+
$this->assertSame('other', $engine->getDriver()->getConfig()->getRouterQueue());
99+
}
100+
74101
public function testEngine()
75102
{
76103
QueueManager::setConfig('test', [

0 commit comments

Comments
 (0)