try to fix tests2

DevExpress · Jul 3, 2018 · 5f761de · 5f761de
1 parent abd2386
commit 5f761de
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/src/screenshots/capturer.js b/src/screenshots/capturer.js
@@ -4,7 +4,7 @@ import cropScreenshot from './crop';
 import { ensureDir } from '../utils/promisified-functions';
 import { isInQueue, addToQueue } from '../utils/async-queue';
 import WARNING_MESSAGE from '../notifications/warning-message';
-import correctFilePath from '../utils/correct-file-path';
+import escapeUserAgent from '../utils/escape-user-agent';
 
 export default class Capturer {
     constructor (baseScreenshotsPath, testEntry, connection, pathPattern, warningLog) {
@@ -128,7 +128,7 @@ export default class Capturer {
         const screenshot = {
             screenshotPath,
             thumbnailPath,
-            userAgent:           this.pathPattern.data.parsedUserAgent.toString(),
+            userAgent:           escapeUserAgent(this.pathPattern.data.parsedUserAgent),
             quarantineAttemptID: this.pathPattern.data.quarantineAttempt,
             takenOnFail:         forError,
         };

diff --git a/src/screenshots/path-pattern.js b/src/screenshots/path-pattern.js
@@ -1,6 +1,6 @@
 import { escapeRegExp as escapeRe } from 'lodash';
-import sanitizeFilename from 'sanitize-filename';
 import correctFilePath from '../utils/correct-file-path';
+import escapeUserAgent from '../utils/escape-user-agent';
 
 const DATE_FORMAT = 'YYYY-MM-DD';
 const TIME_FORMAT = 'HH-mm-ss';
@@ -70,10 +70,6 @@ export default class PathPattern {
         };
     }
 
-    static _escapeUserAgent (userAgent) {
-        return sanitizeFilename(userAgent.toString()).replace(/\s+/g, '_');
-    }
-
     static _buildPath (pattern, placeholderToDataMap, forError) {
         let resultFilePath = pattern;
 
@@ -94,7 +90,7 @@ export default class PathPattern {
                 else if (placeholder === PLACEHOLDERS.USERAGENT) {
                     const userAgent = placeholderToDataMap[placeholder];
 
-                    return PathPattern._escapeUserAgent(userAgent);
+                    return escapeUserAgent(userAgent);
                 }
 
                 return placeholderToDataMap[placeholder];

diff --git a/src/utils/escape-user-agent.js b/src/utils/escape-user-agent.js
@@ -0,0 +1,5 @@
+import sanitizeFilename from 'sanitize-filename';
+
+export default function escapeUserAgent (userAgent) {
+    return sanitizeFilename(userAgent.toString()).replace(/\s+/g, '_');
+}
diff --git a/test/server/util-test.js b/test/server/util-test.js
@@ -1,5 +1,6 @@
 const expect          = require('chai').expect;
 const correctFilePath = require('../../lib/utils/correct-file-path');
+const escapeUserAgent = require('../../lib/utils/escape-user-agent');
 
 describe('Utils', () => {
     it('Correct File Path', () => {
@@ -8,4 +9,8 @@ describe('Utils', () => {
         expect(correctFilePath('test.png', 'test.png'));
         expect(correctFilePath('test', 'png')).eql('test.png');
     });
+
+    it('Escape user agent', () => {
+        expect(escapeUserAgent('Chrome 67.0.3396 / Windows 8.1.0.0')).eql('Chrome_67.0.3396_Windows_8.1.0.0');
+    });
 });