Merge pull request #469 from angrykoala/dev

2.13.2

Author: angrykoala

.github/workflows/npm-publish.yml

@@ -8,16 +8,6 @@ on:
     types: [published]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12
-      - run: npm ci
-      - run: npm test
-
   publish-npm:
     needs: build
     runs-on: ubuntu-latest
@@ -27,8 +17,13 @@ jobs:
         with:
           node-version: 12
           registry-url: https://registry.npmjs.org/
-      - run: npm ci
-      - run: npm publish
+      - run: npm install
+      - name: publish
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgbm-dev
+          npm run lint
+          npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.npm_token}}
 
@@ -41,7 +36,12 @@ jobs:
         with:
           node-version: 12
           registry-url: https://npm.pkg.github.com/
-      - run: npm ci
-      - run: npm publish
+      - run: npm install
+      - name: publish
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgbm-dev
+          npm run lint
+          npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

CHANGELOG.md

@@ -1,3 +1,11 @@
+2.13.2 / 2020-10-24
+===================
+
+* Minor fix in Dockerfile
+* Puppeteer updated to 5.3.1
+* RegExp parameters checks fixed when using vm
+* Dependencies updated
+
 2.13.1 / 2020-08-08
 ===================
 

Dockerfile

@@ -44,5 +44,4 @@ RUN apt-get update && apt-get install -y -q --no-install-recommends\
     && rm -rf /var/lib/apt/lists/*
 
 ENV NO_SANDBOX=true
-ENV PUPPETEER_SKIP_DOWNLOAD=true
 RUN npm install wendigo && npm cache clean --force

lib/browser/mixins/browser_wait.ts

@@ -1,3 +1,4 @@
+import isRegExp from 'lodash.isregexp';
 import BrowserNavigation from './browser_navigation';
 import DomElement from '../../models/dom_element';
 import { TimeoutError, WendigoError, QueryError } from '../../models/errors';
@@ -62,7 +63,7 @@ export default abstract class BrowserWait extends BrowserNavigation {
         timeout = this._getTimeout(timeout);
         if (!url) return Promise.reject(new WendigoError("waitForUrl", `Invalid parameter url.`));
         let parsedUrl: string | RegExp | { source: string, flags: string } = url;
-        if (url instanceof RegExp) {
+        if (isRegExp(url)) {
             parsedUrl = {
                 source: url.source,
                 flags: url.flags

lib/modules/requests/request_filter.ts

@@ -1,9 +1,10 @@
+import isRegExp from 'lodash.isregexp';
 import { Request, ResourceType } from '../../puppeteer_wrapper/puppeteer_types';
 import { matchText } from '../../utils/utils';
 import { ExpectedHeaders } from './types';
 
 function processBody(body: string | RegExp | object): string | RegExp {
-    if (typeof body === 'object' && !(body instanceof RegExp)) {
+    if (typeof body === 'object' && !isRegExp(body)) {
         return JSON.stringify(body);
     } else return body;
 }

lib/modules/requests/request_mock.ts

@@ -1,4 +1,5 @@
 import { EventEmitter } from 'events';
+import isRegExp from 'lodash.isregexp';
 import { URL } from 'url';
 import { Request } from '../../puppeteer_wrapper/puppeteer_types';
 
@@ -178,7 +179,7 @@ export default class RequestMock implements RequestMockInterface {
     }
 
     private _parseUrlQueryString(url: string | RegExp): { [s: string]: string; } | undefined {
-        if (url instanceof RegExp) return undefined;
+        if (isRegExp(url)) return undefined;
         else {
             const parsedUrl = new URL(url);
             if (parsedUrl.search) {
@@ -188,7 +189,7 @@ export default class RequestMock implements RequestMockInterface {
     }
 
     private _parseUrl(url: string | RegExp): string | RegExp {
-        if (url instanceof RegExp) {
+        if (isRegExp(url)) {
             return url;
         } else {
             const parsedUrl = new URL(url);

lib/modules/requests/request_mocker.ts

@@ -1,3 +1,4 @@
+import isRegExp from 'lodash.isregexp';
 import { URL } from 'url';
 import { parseQueryString, compareObjects, matchText } from '../../utils/utils';
 import RequestMock from './request_mock';
@@ -91,7 +92,7 @@ export default class RequestMocker {
         if (existsPriority !== null) return existsPriority;
         const methodPriority = this._checkElementPriority(m1.method, m2.method);
         if (methodPriority !== null) return methodPriority;
-        const urlPriority = this._checkElementPriority(!(m1.url instanceof RegExp), !(m2.url instanceof RegExp));
+        const urlPriority = this._checkElementPriority(!isRegExp(m1.url), !isRegExp(m2.url));
         if (urlPriority !== null) return urlPriority;
         return Boolean(this._checkElementPriority(m1.queryString, m2.queryString));
     }

lib/puppeteer_wrapper/puppeteer_utils.ts

@@ -11,7 +11,7 @@ export async function stringifyLogText(log: ConsoleMessage): Promise<string> {
 
 function stringifyLogArg(arg: JSHandle): Promise<string> {
     return arg.executionContext().evaluate(element => {
-        if (typeof element === 'object' && !(element instanceof RegExp)) {
+        if (typeof element === 'object' && !(element instanceof RegExp)) { // Executed inside context, lodash not available
             try {
                 element = JSON.stringify(element);
             } catch (err) {

lib/utils/utils.ts

@@ -1,3 +1,4 @@
+import isRegExp from 'lodash.isregexp';
 import querystring from 'querystring';
 import { URL } from 'url';
 
@@ -19,7 +20,7 @@ export function isXPathQuery(s: string): boolean {
 }
 
 export function stringify(element: any): string {
-    if (typeof element === 'object' && !(element instanceof RegExp)) {
+    if (typeof element === 'object' && !isRegExp(element)) {
         element = JSON.stringify(element);
     }
     return String(element);
@@ -46,10 +47,10 @@ export function promiseOr(promises: Array<Promise<any>>): Promise<any> {
 
 export function matchText(text: string | null | undefined, expected: string | RegExp): boolean {
     if (text === undefined || text === null) return false;
-    if (expected instanceof RegExp) {
+    if (isRegExp(expected)) {
         return expected.test(text);
     } else {
-        return text === expected;
+        return text === expected;
     }
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wendigo",
-  "version": "2.13.1",
+  "version": "2.13.2",
   "description": "A proper monster for front-end automated testing",
   "engines": {
     "node": ">=8.0.0"
@@ -43,19 +43,21 @@
   "dependencies": {
     "compositer": "^1.3.6",
     "is-class": "0.0.9",
-    "puppeteer": "~5.2.1"
+    "lodash.isregexp": "^4.0.1",
+    "puppeteer": "~5.4.0"
   },
   "devDependencies": {
-    "@types/mocha": "^8.0.1",
-    "@types/node": "^14.0.27",
-    "@types/puppeteer": "~3.0.1",
+    "@types/lodash.isregexp": "^4.0.6",
+    "@types/mocha": "^8.0.3",
+    "@types/node": "^14.14.2",
+    "@types/puppeteer": "~3.0.2",
     "basic-auth": "^2.0.1",
-    "eslint": "^7.6.0",
+    "eslint": "^7.12.0",
     "express": "^4.17.1",
-    "markdownlint-cli": "^0.23.2",
-    "mocha": "^8.1.1",
-    "sinon": "^9.0.2",
+    "markdownlint-cli": "^0.24.0",
+    "mocha": "^8.2.0",
+    "sinon": "^9.2.0",
     "tslint": "^6.1.3",
-    "typescript": "^3.9.7"
+    "typescript": "^4.0.3"
   }
 }

tests/browser/evaluate.test.js

@@ -1,5 +1,6 @@
 "use strict";
 
+const isRegExp = require('lodash.isregexp');
 const Wendigo = require('../..');
 const DomElement = require('../../dist/lib/models/dom_element').default;
 const assert = require('assert');
@@ -54,7 +55,7 @@ describe("Evaluate", function() {
         const result = await browser.evaluate(() => {
             return /aba/g;
         });
-        assert.ok(result instanceof RegExp);
+        assert.ok(isRegExp(result));
         assert.strictEqual(result.source, "aba");
         assert.strictEqual(result.flags, "g");
     });