Merge branch 'master' into influxdb_regexp_tag_group

CHANGELOG.md

@@ -3,9 +3,11 @@
 ## UNRELASED 7.0
 We are working on the new 7.0 that will include Browsertime 3.0. You can read about [Browsertime 3.0](https://www.sitespeed.io/browsertime-3.0/) and check the [changelog](https://github.com/sitespeedio/browsertime/blob/master/CHANGELOG.md#300).
 
-## Fixes
+## Fixed
 * InfluxDB event annotations overwrite within test session. Thanks [Michael J. Mitchell](https://github.com/mitchtech) for the PR [#1966](https://github.com/sitespeedio/sitespeed.io/issues/1966).
 
+* Sanitize path segments when creating folder (taking care of bad characters when creating new folders) - Thank you [Ryan Siddle](https://github.com/rsiddle) for the PR! [#1961](https://github.com/sitespeedio/sitespeed.io/pull/1961)
+
 ## Added
 * Add StatsD support (with bulking). Thank you [Omri](https://github.com/omrilotan) for the PR [#1994](https://github.com/sitespeedio/sitespeed.io/pull/1994).
 
@@ -24,6 +26,8 @@ We are working on the new 7.0 that will include Browsertime 3.0. You can read ab
 
 * We finetuned the tabs in the result pages and followed Browsertime and make all output 1 based instead of 0. 
 
+* We tried to make CLI parameters the same as with Browsertime, so that you can use the same for both tools (meaning most of the parameters you don't need to append with *browsertime*. Check sitespeed.io --help
+
 ## Breaking changes
 
 ### Plugin makers

CONTRIBUTORS.md

@@ -1,4 +1,5 @@
 Many many many thanks to:
+* Ryan Siddle (@rsiddle)
 * Michael J. Mitchell (@mitchtech)
 * Omri (@omrilotan)
 * Matthew Harrison-Jones (@matthojo)

lib/cli/cli.js

@@ -198,13 +198,6 @@ module.exports.parseCommandLine = function parseCommandLine() {
         'This option takes a regex that will whitelist which userTimings to capture in the results. All userTimings are captured by default. T',
       group: 'Browser'
     })
-    .option('browsertime.firefox.preference', {
-      alias: 'firefox.preference',
-      describe:
-        'Extra command line arguments to pass Firefox preferences by the format key:value ' +
-        'To add multiple preferences, repeat --browsertime.firefox.preference once per argument.',
-      group: 'Firefox'
-    })
     .option('browsertime.firefox.includeResponseBodies', {
       alias: 'firefox.includeResponseBodies',
       describe: 'Include response bodies in HAR',

lib/core/resultsStorage/pathToFolder.js

@@ -12,6 +12,10 @@ module.exports = function pathFromRootToPageDir(url) {
 
   pathSegments.unshift('pages');
 
+  pathSegments.forEach(function(segment, index) {
+    pathSegments[index] = segment.replace(/[^-a-z0-9_.]/gi, '-');
+  });
+
   if (!isEmpty(parsedUrl.search)) {
     const md5 = crypto.createHash('md5'),
       hash = md5

test/pathToFolderTests.js

@@ -14,6 +14,11 @@ describe('pathFromRootToPageDir', function() {
     expect(path).to.equal('pages/www.foo.bar/x/y/z.html/');
   });
 
+  it('should create path from url with sanitized characters', function() {
+    const path = pathFromRootToPageDir('http://www.foo.bar/x/y/z:200.html');
+    expect(path).to.equal('pages/www.foo.bar/x/y/z-200.html/');
+  });
+
   it('should create path from url with query string', function() {
     const path = pathFromRootToPageDir('http://www.foo.bar/x/y/z?foo=bar');
     expect(path).to.equal('pages/www.foo.bar/x/y/z/query-115ffe20/');