test: fix imports to make tests possible to run

Author: shadowusr

src/browser/client-scripts/build.js

@@ -21,8 +21,8 @@ const bundleScript = async opts => {
         {
             sourcemap: false,
             global: true,
-            compress: false, // { screw_ie8: false }, // eslint-disable-line camelcase
-            mangle: false, // { screw_ie8: false }, // eslint-disable-line camelcase
+            compress: { screw_ie8: false }, // eslint-disable-line camelcase
+            mangle: { screw_ie8: false }, // eslint-disable-line camelcase
             output: { screw_ie8: false } // eslint-disable-line camelcase
         },
         uglifyify

src/browser/screen-shooter/utils.ts

@@ -58,8 +58,8 @@ export async function findScrollParentAndScrollBy(
             var log = "";
             if (opts.debug) {
                 // @ts-expect-error Can't use TypeScript in browser-side code
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 return function (...args) {
-                    // eslint-disable-line @typescript-eslint/no-unused-vars
                     for (var i = 0; i < arguments.length; i++) {
                         if (typeof arguments[i] === "object") {
                             try {

test/src/browser/screen-shooter/index.js

@@ -2,7 +2,7 @@
 
 const { Image } = require("src/image");
 const { ScreenShooter } = require("src/browser/screen-shooter");
-const { Viewport } = require("src/browser/screen-shooter/viewport");
+const { Viewport } = require("src/browser/screen-shooter/composite-image");
 
 describe("screen-shooter", () => {
     const sandbox = sinon.createSandbox();

test/src/browser/screen-shooter/viewport/coord-validator.js

@@ -2,13 +2,9 @@
 
 const _ = require("lodash");
 
-const { CoordValidator } = require("src/browser/screen-shooter/viewport/coord-validator");
-const {
-    HeightViewportError,
-} = require("src/browser/screen-shooter/viewport/coord-validator/errors/height-viewport-error");
-const {
-    OffsetViewportError,
-} = require("src/browser/screen-shooter/viewport/coord-validator/errors/offset-viewport-error");
+const { CoordValidator } = require("src/browser/screen-shooter/validation");
+const { VerticalOverflowError } = require("src/browser/screen-shooter/errors/vertical-overflow-error");
+const { HorizontalOverflowError } = require("src/browser/screen-shooter/errors/horizontal-overflow-error");
 
 describe("CoordValidator", () => {
     let coordValidator;
@@ -44,19 +40,19 @@ describe("CoordValidator", () => {
 
     describe("validation failed", () => {
         it("if crop area left boundary is outside of viewport", () => {
-            assert.throws(() => validate_({ left: -1 }), OffsetViewportError);
+            assert.throws(() => validate_({ left: -1 }), HorizontalOverflowError);
         });
 
         it("if crop area top boundary is outside of viewport", () => {
-            assert.throws(() => validate_({ top: -1 }), OffsetViewportError);
+            assert.throws(() => validate_({ top: -1 }), VerticalOverflowError);
         });
 
         it("if crop area right boundary is outside of viewport", () => {
-            assert.throws(() => validate_({ width: +1 }), OffsetViewportError);
+            assert.throws(() => validate_({ width: +1 }), HorizontalOverflowError);
         });
 
         it("if crop area height bigger than viewport height", () => {
-            assert.throws(() => validate_({ height: +1 }), HeightViewportError);
+            assert.throws(() => validate_({ height: +1 }), VerticalOverflowError);
         });
     });
 

test/src/browser/screen-shooter/viewport/index.js

@@ -3,8 +3,8 @@
 const _ = require("lodash");
 
 const { Image } = require("src/image");
-const { Viewport } = require("src/browser/screen-shooter/viewport");
-const { CoordValidator } = require("src/browser/screen-shooter/viewport/coord-validator");
+const { Viewport } = require("src/browser/screen-shooter/composite-image");
+const { CoordValidator } = require("src/browser/screen-shooter/validation");
 
 describe("Viewport", () => {
     const sandbox = sinon.createSandbox();

test/src/browser/utils.js

@@ -6,7 +6,7 @@ const { NewBrowser } = require("src/browser/new-browser");
 const { ExistingBrowser } = require("src/browser/existing-browser");
 const { WEBDRIVER_PROTOCOL } = require("src/constants/config");
 
-export function createBrowserConfig_(opts = {}) {
+exports.createBrowserConfig_ = function createBrowserConfig_(opts = {}) {
     const browser = _.defaults(opts, {
         desiredCapabilities: { browserName: "browser", version: "1.0" },
         baseUrl: "http://base_url",
@@ -50,41 +50,43 @@ export function createBrowserConfig_(opts = {}) {
         system: { debug: true },
         forBrowser: () => browser,
     };
-}
-
-export const mkWdPool_ = ({ gridUrl = "http://localhost:12345/wd/local" } = {}) => ({
-    getWebdriver: sinon
-        .stub()
-        .named("getWebdriver")
-        .resolves({
-            gridUrl,
-            free: sinon.stub().named("free"),
-            kill: sinon.stub().named("kill"),
-        }),
-});
-
-export const mkNewBrowser_ = (
+};
+
+exports.mkWdPool_ = function mkWdPool_({ gridUrl = "http://localhost:12345/wd/local" } = {}) {
+    return {
+        getWebdriver: sinon
+            .stub()
+            .named("getWebdriver")
+            .resolves({
+                gridUrl,
+                free: sinon.stub().named("free"),
+                kill: sinon.stub().named("kill"),
+            }),
+    };
+};
+
+exports.mkNewBrowser_ = function mkNewBrowser_(
     configOpts,
     opts = {
         id: "browser",
         version: "1.0",
         state: {},
-        wdPool: mkWdPool_(),
+        wdPool: exports.mkWdPool_(),
     },
     BrowserClass = NewBrowser,
-) => {
-    return BrowserClass.create(createBrowserConfig_(configOpts), opts);
+) {
+    return BrowserClass.create(exports.createBrowserConfig_(configOpts), opts);
 };
 
-export const mkExistingBrowser_ = (
+exports.mkExistingBrowser_ = function mkExistingBrowser_(
     configOpts,
     opts = { id: "browser", version: "1.0", state: {}, emitter: "emitter" },
     BrowserClass = ExistingBrowser,
-) => {
-    return BrowserClass.create(createBrowserConfig_(configOpts), opts);
+) {
+    return BrowserClass.create(exports.createBrowserConfig_(configOpts), opts);
 };
 
-export const mkMockStub_ = () => {
+exports.mkMockStub_ = function mkMockStub_() {
     const eventEmitter = new EventEmitter();
 
     return {
@@ -94,28 +96,39 @@ export const mkMockStub_ = () => {
     };
 };
 
-export const mkCDPTarget_ = () => ({
-    _targetId: "12345",
-});
+exports.mkCDPTarget_ = function mkCDPTarget_() {
+    return {
+        _targetId: "12345",
+    };
+};
 
-export const mkCDPPage_ = () => ({
-    target: sinon.stub().named("target").returns(mkCDPTarget_()),
-    close: sinon.stub().named("close").resolves(),
-});
+exports.mkCDPPage_ = function mkCDPPage_() {
+    return {
+        target: sinon.stub().named("target").returns(exports.mkCDPTarget_()),
+        close: sinon.stub().named("close").resolves(),
+    };
+};
 
-export const mkCDPBrowserCtx_ = () => ({
-    newPage: sinon.stub().named("newPage").resolves(mkCDPPage_()),
-    isIncognito: sinon.stub().named("isIncognito").returns(false),
-    pages: sinon.stub().named("pages").resolves([]),
-    close: sinon.stub().named("close").resolves(),
-});
+exports.mkCDPBrowserCtx_ = function mkCDPBrowserCtx_() {
+    return {
+        newPage: sinon.stub().named("newPage").resolves(exports.mkCDPPage_()),
+        isIncognito: sinon.stub().named("isIncognito").returns(false),
+        pages: sinon.stub().named("pages").resolves([]),
+        close: sinon.stub().named("close").resolves(),
+    };
+};
 
-export const mkCDPStub_ = () => ({
-    browserContexts: sinon.stub().named("browserContexts").returns([]),
-    createIncognitoBrowserContext: sinon.stub().named("createIncognitoBrowserContext").resolves(mkCDPBrowserCtx_()),
-});
+exports.mkCDPStub_ = function mkCDPStub_() {
+    return {
+        browserContexts: sinon.stub().named("browserContexts").returns([]),
+        createIncognitoBrowserContext: sinon
+            .stub()
+            .named("createIncognitoBrowserContext")
+            .resolves(exports.mkCDPBrowserCtx_()),
+    };
+};
 
-export const mkSessionStub_ = () => {
+exports.mkSessionStub_ = function mkSessionStub_() {
     const session = {};
     const wdioElement = {
         selector: ".selector",
@@ -150,9 +163,9 @@ export const mkSessionStub_ = () => {
     session.waitUntil = sinon.stub().named("waitUntil").resolves();
     session.setTimeout = sinon.stub().named("setTimeout").resolves();
     session.setTimeouts = sinon.stub().named("setTimeouts").resolves();
-    session.getPuppeteer = sinon.stub().named("getPuppeteer").resolves(mkCDPStub_());
+    session.getPuppeteer = sinon.stub().named("getPuppeteer").resolves(exports.mkCDPStub_());
     session.$ = sinon.stub().named("$").resolves(wdioElement);
-    session.mock = sinon.stub().named("mock").resolves(mkMockStub_());
+    session.mock = sinon.stub().named("mock").resolves(exports.mkMockStub_());
     session.getWindowHandles = sinon.stub().named("getWindowHandles").resolves([]);
     session.switchToWindow = sinon.stub().named("switchToWindow").resolves();
     session.findElements = sinon.stub().named("findElements").resolves([]);