diff --git a/cli/Valet/Ngrok.php b/cli/Valet/Ngrok.php index b845def..23fd439 100644 --- a/cli/Valet/Ngrok.php +++ b/cli/Valet/Ngrok.php @@ -58,7 +58,7 @@ public function findHttpTunnelUrl(array $tunnels, string $domain): ?string // If there are active tunnels on the Ngrok instance we will spin through them and // find the one responding on HTTP. Each tunnel has an HTTP and a HTTPS address foreach ($tunnels as $tunnel) { - if (($tunnel->proto === 'http' || $tunnel->proto === 'https') && strpos($tunnel->config->addr, strtolower($domain))) { + if (($tunnel->proto === 'http' || $tunnel->proto === 'https') && stripos($tunnel->config->addr, $domain)) { return $tunnel->public_url; } } diff --git a/tests/NgrokTest.php b/tests/NgrokTest.php index 7f37da6..d320bcd 100644 --- a/tests/NgrokTest.php +++ b/tests/NgrokTest.php @@ -31,26 +31,21 @@ public function test_it_matches_correct_share_tunnel() 'config' => (object) [ 'addr' => 'http://mysite.test:80', ], - 'public_url' => 'http://bad-proto.ngrok.io/', + 'public_url' => 'https://right-one.ngrok.io/', ], (object) [ 'proto' => 'http', 'config' => (object) [ - 'addr' => 'http://nottherightone.test:80', + 'addr' => 'http://mynewsite.test:80', ], - 'public_url' => 'http://bad-site.ngrok.io/', - ], - (object) [ - 'proto' => 'http', - 'config' => (object) [ - 'addr' => 'http://mysite.test:80', - ], - 'public_url' => 'http://right-one.ngrok.io/', + 'public_url' => 'http://new-right-one.ngrok.io/', ], ]; $ngrok = resolve(Ngrok::class); - $this->assertEquals('http://right-one.ngrok.io/', $ngrok->findHttpTunnelUrl($tunnels, 'mysite')); + $this->assertEquals('https://right-one.ngrok.io/', $ngrok->findHttpTunnelUrl($tunnels, 'mysite')); + $this->assertEquals('http://new-right-one.ngrok.io/', $ngrok->findHttpTunnelUrl($tunnels, 'mynewsite')); + } public function test_it_checks_against_lowercased_domain()