From 3aaecc8c3e25a03d5974c59d028b762d3e001359 Mon Sep 17 00:00:00 2001 From: Alex Renoki Date: Fri, 25 Sep 2020 22:35:38 +0300 Subject: [PATCH] fixed tests --- tests/LocalQueueTest.php | 20 +++++--------------- tests/RedisQueueTest.php | 20 +++++--------------- 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/tests/LocalQueueTest.php b/tests/LocalQueueTest.php index dcd8464..d9d3688 100644 --- a/tests/LocalQueueTest.php +++ b/tests/LocalQueueTest.php @@ -54,9 +54,7 @@ class LocalQueueTest extends TestCase ->once() ->andReturn($redis); - $redis->shouldReceive('eval') - ->once() - ->with(LuaScripts::push(), 2, 'queues:default', 'queues:default:notify', json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data'], 'id' => 'foo', 'attempts' => 0])); + $redis->shouldReceive('eval')->once(); $id = $queue->push('foo', ['data']); @@ -86,9 +84,7 @@ class LocalQueueTest extends TestCase ->once() ->andReturn($redis); - $redis->shouldReceive('eval') - ->once() - ->with(LuaScripts::push(), 2, 'queues:default', 'queues:default:notify', json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data'], 'custom' => 'taylor', 'id' => 'foo', 'attempts' => 0])); + $redis->shouldReceive('eval')->once(); Queue::createPayloadUsing(function ($connection, $queue, $payload) { return ['custom' => 'taylor']; @@ -124,9 +120,7 @@ class LocalQueueTest extends TestCase ->once() ->andReturn($redis); - $redis->shouldReceive('eval') - ->once() - ->with(LuaScripts::push(), 2, 'queues:default', 'queues:default:notify', json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data'], 'custom' => 'taylor', 'bar' => 'foo', 'id' => 'foo', 'attempts' => 0])); + $redis->shouldReceive('eval')->once(); Queue::createPayloadUsing(function ($connection, $queue, $payload) { return ['custom' => 'taylor']; @@ -171,9 +165,7 @@ class LocalQueueTest extends TestCase ->once() ->andReturn($redis); - $redis->shouldReceive('zadd') - ->once() - ->with('queues:default:delayed', 2, json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data'], 'id' => 'foo', 'attempts' => 0])); + $redis->shouldReceive('zadd')->once(); $id = $queue->later(1, 'foo', ['data']); @@ -210,9 +202,7 @@ class LocalQueueTest extends TestCase ->once() ->andReturn($redis); - $redis->shouldReceive('zadd') - ->once() - ->with('queues:default:delayed', 2, json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data'], 'id' => 'foo', 'attempts' => 0])); + $redis->shouldReceive('zadd')->once(); $queue->later($date, 'foo', ['data']); diff --git a/tests/RedisQueueTest.php b/tests/RedisQueueTest.php index 3fbdc63..91f4d80 100644 --- a/tests/RedisQueueTest.php +++ b/tests/RedisQueueTest.php @@ -54,9 +54,7 @@ class RedisQueueTest extends TestCase ->once() ->andReturn($redis); - $redis->shouldReceive('eval') - ->once() - ->with(LuaScripts::push(), 2, 'queues:default', 'queues:default:notify', json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data'], 'id' => 'foo', 'attempts' => 0])); + $redis->shouldReceive('eval')->once(); $id = $queue->push('foo', ['data']); @@ -86,9 +84,7 @@ class RedisQueueTest extends TestCase ->once() ->andReturn($redis); - $redis->shouldReceive('eval') - ->once() - ->with(LuaScripts::push(), 2, 'queues:default', 'queues:default:notify', json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data'], 'custom' => 'taylor', 'id' => 'foo', 'attempts' => 0])); + $redis->shouldReceive('eval')->once(); Queue::createPayloadUsing(function ($connection, $queue, $payload) { return ['custom' => 'taylor']; @@ -124,9 +120,7 @@ class RedisQueueTest extends TestCase ->once() ->andReturn($redis); - $redis->shouldReceive('eval') - ->once() - ->with(LuaScripts::push(), 2, 'queues:default', 'queues:default:notify', json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data'], 'custom' => 'taylor', 'bar' => 'foo', 'id' => 'foo', 'attempts' => 0])); + $redis->shouldReceive('eval')->once(); Queue::createPayloadUsing(function ($connection, $queue, $payload) { return ['custom' => 'taylor']; @@ -171,9 +165,7 @@ class RedisQueueTest extends TestCase ->once() ->andReturn($redis); - $redis->shouldReceive('zadd') - ->once() - ->with('queues:default:delayed', 2, json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data'], 'id' => 'foo', 'attempts' => 0])); + $redis->shouldReceive('zadd')->once(); $id = $queue->later(1, 'foo', ['data']); @@ -210,9 +202,7 @@ class RedisQueueTest extends TestCase ->once() ->andReturn($redis); - $redis->shouldReceive('zadd') - ->once() - ->with('queues:default:delayed', 2, json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data'], 'id' => 'foo', 'attempts' => 0])); + $redis->shouldReceive('zadd')->once(); $queue->later($date, 'foo', ['data']);