blax-software
/
laravel-websockets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix on tests (#895)

This commit is contained in:
erikn69 2021-12-17 10:42:26 -05:00 committed by GitHub
parent 19af8b0414
commit 0a8f7aa33e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 50 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/FetchChannelTest.php
View File

@ -5,7 +5,6 @@ namespace BeyondCode\LaravelWebSockets\Test;
use BeyondCode\LaravelWebSockets\API\FetchChannel; use BeyondCode\LaravelWebSockets\API\FetchChannel;
use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Request;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Pusher\Pusher;
use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpKernel\Exception\HttpException;
class FetchChannelTest extends TestCase class FetchChannelTest extends TestCase
@ -24,7 +23,7 @@ class FetchChannelTest extends TestCase
'channelName' => 'my-channel', 'channelName' => 'my-channel',
]; ];
$queryString = Pusher::build_auth_query_string( $queryString = self::build_auth_query_string(
'TestKey', 'InvalidSecret', 'GET', $requestPath 'TestKey', 'InvalidSecret', 'GET', $requestPath
); );
@ -48,7 +47,7 @@ class FetchChannelTest extends TestCase
'channelName' => 'my-channel', 'channelName' => 'my-channel',
]; ];
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath); $queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
$request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams)); $request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams));
@ -79,7 +78,7 @@ class FetchChannelTest extends TestCase
'channelName' => 'presence-channel', 'channelName' => 'presence-channel',
]; ];
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath); $queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
$request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams)); $request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams));
@ -113,7 +112,7 @@ class FetchChannelTest extends TestCase
'channelName' => 'invalid-channel', 'channelName' => 'invalid-channel',
]; ];
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath); $queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
$request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams)); $request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams));

13
tests/FetchChannelsTest.php
View File

@ -5,7 +5,6 @@ namespace BeyondCode\LaravelWebSockets\Test;
use BeyondCode\LaravelWebSockets\API\FetchChannels; use BeyondCode\LaravelWebSockets\API\FetchChannels;
use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Request;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Pusher\Pusher;
use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpKernel\Exception\HttpException;
class FetchChannelsTest extends TestCase class FetchChannelsTest extends TestCase
@ -23,7 +22,7 @@ class FetchChannelsTest extends TestCase
'appId' => '1234', 'appId' => '1234',
]; ];
$queryString = Pusher::build_auth_query_string( $queryString = self::build_auth_query_string(
'TestKey', 'InvalidSecret', 'GET', $requestPath 'TestKey', 'InvalidSecret', 'GET', $requestPath
); );
@ -46,7 +45,7 @@ class FetchChannelsTest extends TestCase
'appId' => '1234', 'appId' => '1234',
]; ];
$queryString = Pusher::build_auth_query_string( $queryString = self::build_auth_query_string(
'TestKey', 'TestSecret', 'GET', $requestPath 'TestKey', 'TestSecret', 'GET', $requestPath
); );
@ -81,7 +80,7 @@ class FetchChannelsTest extends TestCase
'appId' => '1234', 'appId' => '1234',
]; ];
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath, [ $queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath, [
'filter_by_prefix' => 'presence-global', 'filter_by_prefix' => 'presence-global',
]); ]);
@ -117,7 +116,7 @@ class FetchChannelsTest extends TestCase
'appId' => '1234', 'appId' => '1234',
]; ];
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath, [ $queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath, [
'filter_by_prefix' => 'presence-global', 'filter_by_prefix' => 'presence-global',
'info' => 'user_count', 'info' => 'user_count',
]); ]);
@ -156,7 +155,7 @@ class FetchChannelsTest extends TestCase
'appId' => '1234', 'appId' => '1234',
]; ];
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath, [ $queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath, [
'info' => 'user_count', 'info' => 'user_count',
]); ]);
@ -180,7 +179,7 @@ class FetchChannelsTest extends TestCase
'appId' => '1234', 'appId' => '1234',
]; ];
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath); $queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
$request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams)); $request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams));

11
tests/FetchUsersTest.php
View File

@ -4,7 +4,6 @@ namespace BeyondCode\LaravelWebSockets\Test;
use BeyondCode\LaravelWebSockets\API\FetchUsers; use BeyondCode\LaravelWebSockets\API\FetchUsers;
use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Request;
use Pusher\Pusher;
use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpKernel\Exception\HttpException;
class FetchUsersTest extends TestCase class FetchUsersTest extends TestCase
@ -23,7 +22,7 @@ class FetchUsersTest extends TestCase
'channelName' => 'my-channel', 'channelName' => 'my-channel',
]; ];
$queryString = Pusher::build_auth_query_string( $queryString = self::build_auth_query_string(
'TestKey', 'InvalidSecret', 'GET', $requestPath 'TestKey', 'InvalidSecret', 'GET', $requestPath
); );
@ -50,7 +49,7 @@ class FetchUsersTest extends TestCase
'channelName' => 'my-channel', 'channelName' => 'my-channel',
]; ];
$queryString = Pusher::build_auth_query_string( $queryString = self::build_auth_query_string(
'TestKey', 'TestSecret', 'GET', $requestPath 'TestKey', 'TestSecret', 'GET', $requestPath
); );
@ -77,7 +76,7 @@ class FetchUsersTest extends TestCase
'channelName' => 'invalid-channel', 'channelName' => 'invalid-channel',
]; ];
$queryString = Pusher::build_auth_query_string( $queryString = self::build_auth_query_string(
'TestKey', 'TestSecret', 'GET', $requestPath 'TestKey', 'TestSecret', 'GET', $requestPath
); );
@ -101,7 +100,7 @@ class FetchUsersTest extends TestCase
'channelName' => 'presence-channel', 'channelName' => 'presence-channel',
]; ];
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath); $queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
$request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams)); $request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams));
@ -131,7 +130,7 @@ class FetchUsersTest extends TestCase
'channelName' => 'presence-channel', 'channelName' => 'presence-channel',
]; ];
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath); $queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
$request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams)); $request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams));

7
tests/PresenceChannelTest.php
View File

@ -6,7 +6,6 @@ use BeyondCode\LaravelWebSockets\API\TriggerEvent;
use BeyondCode\LaravelWebSockets\Server\Exceptions\InvalidSignature; use BeyondCode\LaravelWebSockets\Server\Exceptions\InvalidSignature;
use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Request;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Pusher\Pusher;
use Ratchet\ConnectionInterface; use Ratchet\ConnectionInterface;
class PresenceChannelTest extends TestCase class PresenceChannelTest extends TestCase
@ -419,7 +418,7 @@ class PresenceChannelTest extends TestCase
'appId' => '1234', 'appId' => '1234',
]; ];
$queryString = Pusher::build_auth_query_string( $queryString = self::build_auth_query_string(
'TestKey', 'TestSecret', 'POST', $requestPath, [ 'TestKey', 'TestSecret', 'POST', $requestPath, [
'name' => 'some-event', 'name' => 'some-event',
'channels' => ['presence-channel'], 'channels' => ['presence-channel'],
@ -460,7 +459,7 @@ class PresenceChannelTest extends TestCase
'appId' => '1234', 'appId' => '1234',
]; ];
$queryString = Pusher::build_auth_query_string( $queryString = self::build_auth_query_string(
'TestKey', 'TestSecret', 'POST', $requestPath, [ 'TestKey', 'TestSecret', 'POST', $requestPath, [
'name' => 'some-event', 'name' => 'some-event',
'channels' => ['presence-channel'], 'channels' => ['presence-channel'],
@ -508,7 +507,7 @@ class PresenceChannelTest extends TestCase
'appId' => '1234', 'appId' => '1234',
]; ];
$queryString = Pusher::build_auth_query_string( $queryString = self::build_auth_query_string(
'TestKey', 'TestSecret', 'POST', $requestPath, [ 'TestKey', 'TestSecret', 'POST', $requestPath, [
'name' => 'some-event', 'name' => 'some-event',
'channels' => ['presence-channel'], 'channels' => ['presence-channel'],

7
tests/PrivateChannelTest.php
View File

@ -6,7 +6,6 @@ use BeyondCode\LaravelWebSockets\API\TriggerEvent;
use BeyondCode\LaravelWebSockets\Server\Exceptions\InvalidSignature; use BeyondCode\LaravelWebSockets\Server\Exceptions\InvalidSignature;
use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Request;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Pusher\Pusher;
use Ratchet\ConnectionInterface; use Ratchet\ConnectionInterface;
class PrivateChannelTest extends TestCase class PrivateChannelTest extends TestCase
@ -239,7 +238,7 @@ class PrivateChannelTest extends TestCase
'appId' => '1234', 'appId' => '1234',
]; ];
$queryString = Pusher::build_auth_query_string( $queryString = self::build_auth_query_string(
'TestKey', 'TestSecret', 'POST', $requestPath, [ 'TestKey', 'TestSecret', 'POST', $requestPath, [
'name' => 'some-event', 'name' => 'some-event',
'channels' => ['private-channel'], 'channels' => ['private-channel'],
@ -280,7 +279,7 @@ class PrivateChannelTest extends TestCase
'appId' => '1234', 'appId' => '1234',
]; ];
$queryString = Pusher::build_auth_query_string( $queryString = self::build_auth_query_string(
'TestKey', 'TestSecret', 'POST', $requestPath, [ 'TestKey', 'TestSecret', 'POST', $requestPath, [
'name' => 'some-event', 'name' => 'some-event',
'channels' => ['private-channel'], 'channels' => ['private-channel'],
@ -328,7 +327,7 @@ class PrivateChannelTest extends TestCase
'appId' => '1234', 'appId' => '1234',
]; ];
$queryString = Pusher::build_auth_query_string( $queryString = self::build_auth_query_string(
'TestKey', 'TestSecret', 'POST', $requestPath, [ 'TestKey', 'TestSecret', 'POST', $requestPath, [
'name' => 'some-event', 'name' => 'some-event',
'channels' => ['private-channel'], 'channels' => ['private-channel'],

7
tests/PublicChannelTest.php
View File

@ -5,7 +5,6 @@ namespace BeyondCode\LaravelWebSockets\Test;
use BeyondCode\LaravelWebSockets\API\TriggerEvent; use BeyondCode\LaravelWebSockets\API\TriggerEvent;
use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Request;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Pusher\Pusher;
use Ratchet\ConnectionInterface; use Ratchet\ConnectionInterface;
class PublicChannelTest extends TestCase class PublicChannelTest extends TestCase
@ -220,7 +219,7 @@ class PublicChannelTest extends TestCase
'appId' => '1234', 'appId' => '1234',
]; ];
$queryString = Pusher::build_auth_query_string( $queryString = self::build_auth_query_string(
'TestKey', 'TestSecret', 'POST', $requestPath, [ 'TestKey', 'TestSecret', 'POST', $requestPath, [
'name' => 'some-event', 'name' => 'some-event',
'channels' => ['public-channel'], 'channels' => ['public-channel'],
@ -261,7 +260,7 @@ class PublicChannelTest extends TestCase
'appId' => '1234', 'appId' => '1234',
]; ];
$queryString = Pusher::build_auth_query_string( $queryString = self::build_auth_query_string(
'TestKey', 'TestSecret', 'POST', $requestPath, [ 'TestKey', 'TestSecret', 'POST', $requestPath, [
'name' => 'some-event', 'name' => 'some-event',
'channels' => ['public-channel'], 'channels' => ['public-channel'],
@ -309,7 +308,7 @@ class PublicChannelTest extends TestCase
'appId' => '1234', 'appId' => '1234',
]; ];
$queryString = Pusher::build_auth_query_string( $queryString = self::build_auth_query_string(
'TestKey', 'TestSecret', 'POST', $requestPath, [ 'TestKey', 'TestSecret', 'POST', $requestPath, [
'name' => 'some-event', 'name' => 'some-event',
'channels' => ['public-channel'], 'channels' => ['public-channel'],

25
tests/TestCase.php
View File

@ -10,6 +10,7 @@ use BeyondCode\LaravelWebSockets\Helpers;
use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Request;
use Illuminate\Support\Facades\Redis; use Illuminate\Support\Facades\Redis;
use Orchestra\Testbench\BrowserKit\TestCase as Orchestra; use Orchestra\Testbench\BrowserKit\TestCase as Orchestra;
use Pusher\Pusher;
use React\EventLoop\Factory as LoopFactory; use React\EventLoop\Factory as LoopFactory;
abstract class TestCase extends Orchestra abstract class TestCase extends Orchestra
@ -482,4 +483,28 @@ abstract class TestCase extends Orchestra
$this->markTestSkipped('Skipped test because the replication mode is Local.'); $this->markTestSkipped('Skipped test because the replication mode is Local.');
} }
} }
protected static function build_auth_query_string(
$auth_key,
$auth_secret,
$request_method,
$request_path,
$query_params = [],
$auth_version = '1.0',
$auth_timestamp = null
) {
$method = method_exists(Pusher::class, 'build_auth_query_params') ? 'build_auth_query_params' : 'build_auth_query_string';
$params = Pusher::$method(
$auth_key, $auth_secret, $request_method, $request_path, $query_params, $auth_version, $auth_timestamp
);
if ($method == 'build_auth_query_string') {
return $params;
}
ksort($params);
return http_build_query($params);
}
} }

3
tests/TriggerEventTest.php
View File

@ -4,7 +4,6 @@ namespace BeyondCode\LaravelWebSockets\Test;
use BeyondCode\LaravelWebSockets\API\TriggerEvent; use BeyondCode\LaravelWebSockets\API\TriggerEvent;
use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Request;
use Pusher\Pusher;
use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpKernel\Exception\HttpException;
class TriggerEventTest extends TestCase class TriggerEventTest extends TestCase
@ -22,7 +21,7 @@ class TriggerEventTest extends TestCase
'appId' => '1234', 'appId' => '1234',
]; ];
$queryString = Pusher::build_auth_query_string( $queryString = self::build_auth_query_string(
'TestKey', 'InvalidSecret', 'GET', $requestPath 'TestKey', 'InvalidSecret', 'GET', $requestPath
); );