Fixing a small bug when reporting the relative output path

Author: weaverryan

lib/config/path-util.js

@@ -54,7 +54,7 @@ module.exports = {
      * @return {String}
      */
     getRelativeOutputPath(webpackConfig) {
-        return webpackConfig.outputPath.replace(webpackConfig.getContext() + '/', '');
+        return webpackConfig.outputPath.replace(webpackConfig.getContext() + path.sep, '');
     },
 
     /**

test/config/path-util.js

@@ -124,4 +124,32 @@ describe('path-util getContentBase()', () => {
             }).to.throw('Cannot determine how to prefix the keys in manifest.json. Call Encore.setManifestKeyPrefix() to choose what path (e.g. build/) to use');
         });
     });
+
+    describe('getRelativeOutputPath', () => {
+        it('Works with Unix paths', function() {
+            if (isWindows()) {
+                this.skip();
+            }
+
+            const config = createConfig();
+            config.runtimeConfig.context = '/tmp/webpack-encore';
+            config.outputPath = '/tmp/webpack-encore/public/build';
+
+            const actualPath = pathUtil.getRelativeOutputPath(config);
+            expect(actualPath).to.equal('public/build');
+        });
+
+        it('Works with Windows paths', function() {
+            if (!isWindows()) {
+                this.skip();
+            }
+
+            const config = createConfig();
+            config.runtimeConfig.context = 'C:\\projects\\webpack-encore';
+            config.outputPath = 'C:\\projects\\webpack-encore\\public\\build';
+
+            const actualPath = pathUtil.getRelativeOutputPath(config);
+            expect(actualPath).to.equal('public\\build');
+        });
+    });
 });

test/functional.js

@@ -39,7 +39,7 @@ function convertToManifestPath(assetSrc, webpackConfig) {
 
 describe('Functional tests using webpack', function() {
     // being functional tests, these can take quite long
-    this.timeout(5000);
+    this.timeout(8000);
 
     after(() => {
         testSetup.emptyTmpDir();