Merge pull request #16 from o2ps/fix-manifest-dev-server-url

Fix BuildDirectoryProvider pointing to public URL of dev server

Author: jiripudil

src/BuildDirectoryProvider.php

@@ -32,7 +32,7 @@ public function __construct(string $directory, DevServer $devServer)
 	public function getBuildDirectory(): string
 	{
 		return $this->devServer->isAvailable()
-			? $this->devServer->getUrl()
+			? $this->devServer->getInternalUrl()
 			: $this->directory;
 	}
 

src/DevServer.php

@@ -31,9 +31,9 @@ class DevServer
 	 */
 	private $publicUrl;
 
-    /**
-     * @var float
-     */
+	/**
+	 * @var float
+	 */
 	private $timeout;
 
 	/**
@@ -58,6 +58,12 @@ public function getUrl(): string
 	}
 
 
+	public function getInternalUrl(): string
+	{
+		return $this->url;
+	}
+
+
 	public function isEnabled(): bool
 	{
 		return $this->enabled;

tests/WebpackNetteAdapter/BuildDirectoryProviderTest.phpt

@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace OopsTests\WebpackNetteAdapter;
+
+use Oops\WebpackNetteAdapter\BuildDirectoryProvider;
+use Oops\WebpackNetteAdapter\DevServer;
+use Tester\Assert;
+use Tester\TestCase;
+
+
+require_once __DIR__ . '/../bootstrap.php';
+
+
+/**
+ * @testCase
+ */
+class BuildDirectoryProviderTest extends TestCase
+{
+
+	public function testWithDevServer(): void
+	{
+		$devServer = \Mockery::mock(DevServer::class);
+		$devServer->shouldReceive('isAvailable')->andReturn(TRUE);
+		$devServer->shouldReceive('getInternalUrl')->andReturn('http://localhost:3000');
+
+		$provider = new BuildDirectoryProvider('dist/', $devServer);
+		Assert::same('http://localhost:3000', $provider->getBuildDirectory());
+	}
+
+
+	public function testWithoutDevServer(): void
+	{
+		$devServer = \Mockery::mock(DevServer::class);
+		$devServer->shouldReceive('isAvailable')->andReturn(FALSE);
+		$devServer->shouldReceive('getInternalUrl')->never();
+
+		$provider = new BuildDirectoryProvider('dist/', $devServer);
+		Assert::same('dist/', $provider->getBuildDirectory());
+	}
+
+
+	protected function tearDown(): void
+	{
+		parent::tearDown();
+		\Mockery::close();
+	}
+
+}
+
+
+(new BuildDirectoryProviderTest())->run();

tests/WebpackNetteAdapter/DI/WebpackExtensionTest.phpt

@@ -112,14 +112,15 @@ class WebpackExtensionTest extends TestCase
 		// mock devServer so that it is available
 		$devServerMock = \Mockery::mock(DevServer::class);
 		$devServerMock->shouldReceive('getUrl')->andReturn('/devServer/');
+		$devServerMock->shouldReceive('getInternalUrl')->andReturn('/devServer-internal/');
 		$devServerMock->shouldReceive('isAvailable')->andReturn(TRUE);
 		$container->removeService('webpack.devServer');
 		$container->addService('webpack.devServer', $devServerMock);
 
 		/** @var AssetLocator $assetLocator */
 		$assetLocator = $container->getByType(AssetLocator::class);
 		Assert::same('/devServer/foo.js', $assetLocator->locateInPublicPath('foo.js'));
-		Assert::same('/devServer/foo.js', $assetLocator->locateInBuildDirectory('foo.js'));
+		Assert::same('/devServer-internal/foo.js', $assetLocator->locateInBuildDirectory('foo.js'));
 		Assert::same('data:,', $assetLocator->locateInPublicPath('foo.css'));
 		Assert::same('data:,', $assetLocator->locateInBuildDirectory('foo.css'));
 

tests/WebpackNetteAdapter/DevServerTest.phpt

@@ -41,6 +41,7 @@ class DevServerTest extends TestCase
 		$devServer = new DevServer(TRUE, 'http://localhost:3000', NULL, 0.1, $this->httpClient);
 		Assert::true($devServer->isEnabled());
 		Assert::same($devServer->getUrl(), 'http://localhost:3000');
+		Assert::same($devServer->getInternalUrl(), 'http://localhost:3000');
 
 		$this->httpClient->shouldReceive('request')
 			->with('GET', 'http://localhost:3000', ['http_errors' => FALSE, 'verify' => FALSE, 'timeout' => 0.1])
@@ -53,9 +54,10 @@ class DevServerTest extends TestCase
 	{
 	    $devServer = new DevServer(TRUE, 'http://localhost:3000', 'http://localhost:3030', 0.1, $this->httpClient);
 	    Assert::true($devServer->isEnabled());
-	    Assert::same($devServer->getUrl(), 'http://localhost:3030');
+		Assert::same($devServer->getUrl(), 'http://localhost:3030');
+		Assert::same($devServer->getInternalUrl(), 'http://localhost:3000');
 
-	    $this->httpClient->shouldReceive('request')
+		$this->httpClient->shouldReceive('request')
 	        ->with('GET', 'http://localhost:3000', ['http_errors' => FALSE, 'verify' => FALSE, 'timeout' => 0.1])
 	        ->andReturn(new Response(404));