Skip to content
This repository was archived by the owner on Feb 7, 2024. It is now read-only.

Commit 0a8f7aa

Browse files
erikn69erikn69
authored
Fix on tests (#895)
1 parent 19af8b0 commit 0a8f7aa

8 files changed

+50
-32
lines changed

‎tests/FetchChannelTest.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use BeyondCode\LaravelWebSockets\API\FetchChannel;
66
use GuzzleHttp\Psr7\Request;
77
use Illuminate\Http\JsonResponse;
8-
use Pusher\Pusher;
98
use Symfony\Component\HttpKernel\Exception\HttpException;
109

1110
class FetchChannelTest extends TestCase
@@ -24,7 +23,7 @@ public function test_invalid_signatures_can_not_access_the_api()
2423
'channelName' => 'my-channel',
2524
];
2625

27-
$queryString = Pusher::build_auth_query_string(
26+
$queryString = self::build_auth_query_string(
2827
'TestKey', 'InvalidSecret', 'GET', $requestPath
2928
);
3029

@@ -48,7 +47,7 @@ public function test_it_returns_the_channel_information()
4847
'channelName' => 'my-channel',
4948
];
5049

51-
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
50+
$queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
5251

5352
$request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams));
5453

@@ -79,7 +78,7 @@ public function test_it_returns_presence_channel_information()
7978
'channelName' => 'presence-channel',
8079
];
8180

82-
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
81+
$queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
8382

8483
$request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams));
8584

@@ -113,7 +112,7 @@ public function test_it_returns_404_for_invalid_channels()
113112
'channelName' => 'invalid-channel',
114113
];
115114

116-
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
115+
$queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
117116

118117
$request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams));
119118

‎tests/FetchChannelsTest.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use BeyondCode\LaravelWebSockets\API\FetchChannels;
66
use GuzzleHttp\Psr7\Request;
77
use Illuminate\Http\JsonResponse;
8-
use Pusher\Pusher;
98
use Symfony\Component\HttpKernel\Exception\HttpException;
109

1110
class FetchChannelsTest extends TestCase
@@ -23,7 +22,7 @@ public function test_invalid_signatures_can_not_access_the_api()
2322
'appId' => '1234',
2423
];
2524

26-
$queryString = Pusher::build_auth_query_string(
25+
$queryString = self::build_auth_query_string(
2726
'TestKey', 'InvalidSecret', 'GET', $requestPath
2827
);
2928

@@ -46,7 +45,7 @@ public function test_it_returns_the_channel_information()
4645
'appId' => '1234',
4746
];
4847

49-
$queryString = Pusher::build_auth_query_string(
48+
$queryString = self::build_auth_query_string(
5049
'TestKey', 'TestSecret', 'GET', $requestPath
5150
);
5251

@@ -81,7 +80,7 @@ public function test_it_returns_the_channel_information_for_prefix()
8180
'appId' => '1234',
8281
];
8382

84-
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath, [
83+
$queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath, [
8584
'filter_by_prefix' => 'presence-global',
8685
]);
8786

@@ -117,7 +116,7 @@ public function test_it_returns_the_channel_information_for_prefix_with_user_cou
117116
'appId' => '1234',
118117
];
119118

120-
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath, [
119+
$queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath, [
121120
'filter_by_prefix' => 'presence-global',
122121
'info' => 'user_count',
123122
]);
@@ -156,7 +155,7 @@ public function test_can_not_get_non_presence_channel_user_count()
156155
'appId' => '1234',
157156
];
158157

159-
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath, [
158+
$queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath, [
160159
'info' => 'user_count',
161160
]);
162161

@@ -180,7 +179,7 @@ public function test_it_returns_empty_object_for_no_channels_found()
180179
'appId' => '1234',
181180
];
182181

183-
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
182+
$queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
184183

185184
$request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams));
186185

‎tests/FetchUsersTest.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use BeyondCode\LaravelWebSockets\API\FetchUsers;
66
use GuzzleHttp\Psr7\Request;
7-
use Pusher\Pusher;
87
use Symfony\Component\HttpKernel\Exception\HttpException;
98

109
class FetchUsersTest extends TestCase
@@ -23,7 +22,7 @@ public function test_invalid_signatures_can_not_access_the_api()
2322
'channelName' => 'my-channel',
2423
];
2524

26-
$queryString = Pusher::build_auth_query_string(
25+
$queryString = self::build_auth_query_string(
2726
'TestKey', 'InvalidSecret', 'GET', $requestPath
2827
);
2928

@@ -50,7 +49,7 @@ public function test_it_only_returns_data_for_presence_channels()
5049
'channelName' => 'my-channel',
5150
];
5251

53-
$queryString = Pusher::build_auth_query_string(
52+
$queryString = self::build_auth_query_string(
5453
'TestKey', 'TestSecret', 'GET', $requestPath
5554
);
5655

@@ -77,7 +76,7 @@ public function test_it_returns_404_for_invalid_channels()
7776
'channelName' => 'invalid-channel',
7877
];
7978

80-
$queryString = Pusher::build_auth_query_string(
79+
$queryString = self::build_auth_query_string(
8180
'TestKey', 'TestSecret', 'GET', $requestPath
8281
);
8382

@@ -101,7 +100,7 @@ public function test_it_returns_connected_user_information()
101100
'channelName' => 'presence-channel',
102101
];
103102

104-
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
103+
$queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
105104

106105
$request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams));
107106

@@ -131,7 +130,7 @@ public function test_multiple_clients_with_same_id_gets_counted_once()
131130
'channelName' => 'presence-channel',
132131
];
133132

134-
$queryString = Pusher::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
133+
$queryString = self::build_auth_query_string('TestKey', 'TestSecret', 'GET', $requestPath);
135134

136135
$request = new Request('GET', "{$requestPath}?{$queryString}&".http_build_query($routeParams));
137136

‎tests/PresenceChannelTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
use BeyondCode\LaravelWebSockets\Server\Exceptions\InvalidSignature;
77
use GuzzleHttp\Psr7\Request;
88
use Illuminate\Http\JsonResponse;
9-
use Pusher\Pusher;
109
use Ratchet\ConnectionInterface;
1110

1211
class PresenceChannelTest extends TestCase
@@ -419,7 +418,7 @@ public function test_it_fires_the_event_to_presence_channel()
419418
'appId' => '1234',
420419
];
421420

422-
$queryString = Pusher::build_auth_query_string(
421+
$queryString = self::build_auth_query_string(
423422
'TestKey', 'TestSecret', 'POST', $requestPath, [
424423
'name' => 'some-event',
425424
'channels' => ['presence-channel'],
@@ -460,7 +459,7 @@ public function test_it_fires_event_across_servers_when_there_are_not_users_loca
460459
'appId' => '1234',
461460
];
462461

463-
$queryString = Pusher::build_auth_query_string(
462+
$queryString = self::build_auth_query_string(
464463
'TestKey', 'TestSecret', 'POST', $requestPath, [
465464
'name' => 'some-event',
466465
'channels' => ['presence-channel'],
@@ -508,7 +507,7 @@ public function test_it_fires_event_across_servers_when_there_are_users_locally_
508507
'appId' => '1234',
509508
];
510509

511-
$queryString = Pusher::build_auth_query_string(
510+
$queryString = self::build_auth_query_string(
512511
'TestKey', 'TestSecret', 'POST', $requestPath, [
513512
'name' => 'some-event',
514513
'channels' => ['presence-channel'],

‎tests/PrivateChannelTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
use BeyondCode\LaravelWebSockets\Server\Exceptions\InvalidSignature;
77
use GuzzleHttp\Psr7\Request;
88
use Illuminate\Http\JsonResponse;
9-
use Pusher\Pusher;
109
use Ratchet\ConnectionInterface;
1110

1211
class PrivateChannelTest extends TestCase
@@ -239,7 +238,7 @@ public function test_it_fires_the_event_to_private_channel()
239238
'appId' => '1234',
240239
];
241240

242-
$queryString = Pusher::build_auth_query_string(
241+
$queryString = self::build_auth_query_string(
243242
'TestKey', 'TestSecret', 'POST', $requestPath, [
244243
'name' => 'some-event',
245244
'channels' => ['private-channel'],
@@ -280,7 +279,7 @@ public function test_it_fires_event_across_servers_when_there_are_not_users_loca
280279
'appId' => '1234',
281280
];
282281

283-
$queryString = Pusher::build_auth_query_string(
282+
$queryString = self::build_auth_query_string(
284283
'TestKey', 'TestSecret', 'POST', $requestPath, [
285284
'name' => 'some-event',
286285
'channels' => ['private-channel'],
@@ -328,7 +327,7 @@ public function test_it_fires_event_across_servers_when_there_are_users_locally_
328327
'appId' => '1234',
329328
];
330329

331-
$queryString = Pusher::build_auth_query_string(
330+
$queryString = self::build_auth_query_string(
332331
'TestKey', 'TestSecret', 'POST', $requestPath, [
333332
'name' => 'some-event',
334333
'channels' => ['private-channel'],

‎tests/PublicChannelTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use BeyondCode\LaravelWebSockets\API\TriggerEvent;
66
use GuzzleHttp\Psr7\Request;
77
use Illuminate\Http\JsonResponse;
8-
use Pusher\Pusher;
98
use Ratchet\ConnectionInterface;
109

1110
class PublicChannelTest extends TestCase
@@ -220,7 +219,7 @@ public function test_it_fires_the_event_to_public_channel()
220219
'appId' => '1234',
221220
];
222221

223-
$queryString = Pusher::build_auth_query_string(
222+
$queryString = self::build_auth_query_string(
224223
'TestKey', 'TestSecret', 'POST', $requestPath, [
225224
'name' => 'some-event',
226225
'channels' => ['public-channel'],
@@ -261,7 +260,7 @@ public function test_it_fires_event_across_servers_when_there_are_not_users_loca
261260
'appId' => '1234',
262261
];
263262

264-
$queryString = Pusher::build_auth_query_string(
263+
$queryString = self::build_auth_query_string(
265264
'TestKey', 'TestSecret', 'POST', $requestPath, [
266265
'name' => 'some-event',
267266
'channels' => ['public-channel'],
@@ -309,7 +308,7 @@ public function test_it_fires_event_across_servers_when_there_are_users_locally_
309308
'appId' => '1234',
310309
];
311310

312-
$queryString = Pusher::build_auth_query_string(
311+
$queryString = self::build_auth_query_string(
313312
'TestKey', 'TestSecret', 'POST', $requestPath, [
314313
'name' => 'some-event',
315314
'channels' => ['public-channel'],

‎tests/TestCase.php

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use GuzzleHttp\Psr7\Request;
1111
use Illuminate\Support\Facades\Redis;
1212
use Orchestra\Testbench\BrowserKit\TestCase as Orchestra;
13+
use Pusher\Pusher;
1314
use React\EventLoop\Factory as LoopFactory;
1415

1516
abstract class TestCase extends Orchestra
@@ -482,4 +483,28 @@ protected function skipOnLocalReplication()
482483
$this->markTestSkipped('Skipped test because the replication mode is Local.');
483484
}
484485
}
486+
487+
protected static function build_auth_query_string(
488+
$auth_key,
489+
$auth_secret,
490+
$request_method,
491+
$request_path,
492+
$query_params = [],
493+
$auth_version = '1.0',
494+
$auth_timestamp = null
495+
) {
496+
$method = method_exists(Pusher::class, 'build_auth_query_params') ? 'build_auth_query_params' : 'build_auth_query_string';
497+
498+
$params = Pusher::$method(
499+
$auth_key, $auth_secret, $request_method, $request_path, $query_params, $auth_version, $auth_timestamp
500+
);
501+
502+
if ($method == 'build_auth_query_string') {
503+
return $params;
504+
}
505+
506+
ksort($params);
507+
508+
return http_build_query($params);
509+
}
485510
}

‎tests/TriggerEventTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use BeyondCode\LaravelWebSockets\API\TriggerEvent;
66
use GuzzleHttp\Psr7\Request;
7-
use Pusher\Pusher;
87
use Symfony\Component\HttpKernel\Exception\HttpException;
98

109
class TriggerEventTest extends TestCase
@@ -22,7 +21,7 @@ public function test_invalid_signatures_can_not_fire_the_event()
2221
'appId' => '1234',
2322
];
2423

25-
$queryString = Pusher::build_auth_query_string(
24+
$queryString = self::build_auth_query_string(
2625
'TestKey', 'InvalidSecret', 'GET', $requestPath
2726
);
2827

0 commit comments

Comments
 (0)