Overhaul t.resizeWindow and implement t.maximizeWindow (closes DevExp…

…ress#816, closes DevExpress#812) (DevExpress#837) * Show error is the requested size is too big on Mac * Implement t.maximize
kirovboris · Dec 18, 2019 · f33c166 · f33c166
1 parent 571d25f
commit f33c166
Show file tree

Hide file tree

Showing 29 changed files with 525 additions and 254 deletions.
diff --git a/src/api/test-controller.js b/src/api/test-controller.js
@@ -30,7 +30,8 @@ import {
 import {
     TakeScreenshotCommand,
     ResizeWindowCommand,
-    ResizeWindowToFitDeviceCommand
+    ResizeWindowToFitDeviceCommand,
+    MaximizeWindowCommand
 } from '../test-run/commands/browser-manipulation';
 
 import { WaitCommand } from '../test-run/commands/observation';
@@ -205,6 +206,10 @@ export default class TestController {
         return this._enqueueAction('resizeWindowToFitDevice', ResizeWindowToFitDeviceCommand, { device, options });
     }
 
+    _maximizeWindow$ () {
+        return this._enqueueAction('maximizeWindow', MaximizeWindowCommand);
+    }
+
     _switchToIframe$ (selector) {
         return this._enqueueAction('switchToIframe', SwitchToIframeCommand, { selector });
     }

diff --git a/src/browser/provider/built-in/base.js b/src/browser/provider/built-in/base.js
diff --git a/src/browser/provider/built-in/index.js b/src/browser/provider/built-in/index.js
@@ -1,10 +1,10 @@
-import PathBrowserProvider from './path';
-import LocallyInstalledBrowserProvider from './locally-installed';
-import RemoteBrowserProvider from './remote';
+import pathBrowserProvider from './path';
+import locallyInstalledBrowserProvider from './locally-installed';
+import remoteBrowserProvider from './remote';
 
 
 export default {
-    'locally-installed': new LocallyInstalledBrowserProvider(),
-    'path':              new PathBrowserProvider(),
-    'remote':            new RemoteBrowserProvider()
+    'locally-installed': locallyInstalledBrowserProvider,
+    'path':              pathBrowserProvider,
+    'remote':            remoteBrowserProvider
 };
diff --git a/src/browser/provider/built-in/locally-installed.js b/src/browser/provider/built-in/locally-installed.js
@@ -1,19 +1,28 @@
 import browserTools from 'testcafe-browser-tools';
-import PathBrowserProvider from './path';
 
 
-export default class LocallyInstalledBrowserProvider extends PathBrowserProvider {
-    constructor () {
-        super();
+export default {
+    isMultiBrowser: true,
 
-        this.isMultiBrowser = true;
-    }
+    async openBrowser (browserId, pageUrl, browserName) {
+        var openParameters = await browserTools.getBrowserInfo(browserName);
+
+        await browserTools.open(openParameters, pageUrl);
+    },
+
+    async closeBrowser (browserId) {
+        await browserTools.close(browserId);
+    },
+
+    async isLocalBrowser () {
+        return true;
+    },
 
     async getBrowserList () {
         var installations = await browserTools.getInstallations();
 
         return Object.keys(installations);
-    }
+    },
 
     async isValidBrowserName (browserName) {
         var browserNames = await this.getBrowserList();
@@ -22,4 +31,4 @@ export default class LocallyInstalledBrowserProvider extends PathBrowserProvider
 
         return browserNames.indexOf(browserName) > -1;
     }
-}
+};
diff --git a/src/browser/provider/built-in/path.js b/src/browser/provider/built-in/path.js
@@ -1,14 +1,8 @@
 import browserTools from 'testcafe-browser-tools';
-import OS from 'os-family';
-import BrowserProviderBase from './base';
 
 
-export default class PathBrowserProvider extends BrowserProviderBase {
-    constructor () {
-        super();
-
-        this.isMultiBrowser = true;
-    }
+export default {
+    isMultiBrowser: true,
 
     async _handleJSON (str) {
         var params = null;
@@ -32,7 +26,7 @@ export default class PathBrowserProvider extends BrowserProviderBase {
             openParameters.cmd = params.cmd;
 
         return openParameters;
-    }
+    },
 
     async openBrowser (browserId, pageUrl, browserName) {
         var openParameters = await browserTools.getBrowserInfo(browserName) || await this._handleJSON(browserName);
@@ -41,18 +35,13 @@ export default class PathBrowserProvider extends BrowserProviderBase {
             throw new Error('The specified browser name is not valid!');
 
         await browserTools.open(openParameters, pageUrl);
-
-        if (OS.win)
-            await super.calculateResizeCorrections(browserId);
-    }
+    },
 
     async closeBrowser (browserId) {
         await browserTools.close(browserId);
-    }
+    },
 
-    async getBrowserList () {
-        return [
-            '${PATH_TO_BROWSER_EXECUTABLE}'
-        ];
+    async isLocalBrowser () {
+        return true;
     }
-}
+};
diff --git a/src/browser/provider/built-in/remote.js b/src/browser/provider/built-in/remote.js
@@ -1,46 +1,47 @@
-import BrowserProviderBase from './base';
-import OS from 'os-family';
+import { findWindow } from 'testcafe-browser-tools';
 import WARNING_MESSAGE from '../../../warnings/message';
 
 
-export default class RemoteBrowserProvider extends BrowserProviderBase {
-    constructor () {
-        super();
-
-        // NOTE: This can be used to disable resize correction when running unit tests.
-        this.disableResizeHack = false;
-    }
+export default {
+    localBrowsersFlags: {},
 
     async openBrowser (browserId) {
-        try {
-            if (OS.win && !this.disableResizeHack)
-                await super.calculateResizeCorrections(browserId);
-        }
-        catch (e) {
-            return;
-        }
-    }
+        await this.waitForConnectionReady(browserId);
 
-    async closeBrowser () {
-        return;
-    }
+        var localBrowserWindow = await findWindow(browserId);
 
-    // NOTE: we must try to do a local screenshot or resize, if browser is accessible, but emit warning
-    async takeScreenshot (browserId, ...args) {
-        try {
-            await super.takeScreenshot(browserId, ...args);
-        }
-        catch (e) {
-            this.reportWarning(browserId, WARNING_MESSAGE.browserManipulationsOnRemoteBrowser);
-        }
-    }
+        this.localBrowsersFlags[browserId] = localBrowserWindow !== null;
+    },
+
+    async closeBrowser (browserId) {
+        delete this.localBrowsersFlags[browserId];
+    },
+
+    async isLocalBrowser (browserId) {
+        return this.localBrowsersFlags[browserId];
+    },
+
+    // NOTE: we must try to do a local screenshot or resize, if browser is accessible, and emit warning otherwise
+    async hasCustomActionForBrowser (browserId) {
+        var isLocalBrowser = this.localBrowsersFlags[browserId];
+
+        return {
+            hasResizeWindow:                !isLocalBrowser,
+            hasMaximizeWindow:              !isLocalBrowser,
+            hasTakeScreenshot:              !isLocalBrowser,
+            hasCanResizeWindowToDimensions: !isLocalBrowser
+        };
+    },
+
+    async takeScreenshot (browserId) {
+        this.reportWarning(browserId, WARNING_MESSAGE.browserManipulationsOnRemoteBrowser);
+    },
+
+    async resizeWindow (browserId) {
+        this.reportWarning(browserId, WARNING_MESSAGE.browserManipulationsOnRemoteBrowser);
+    },
 
-    async resizeWindow (browserId, ...args) {
-        try {
-            await super.resizeWindow(browserId, ...args);
-        }
-        catch (e) {
-            this.reportWarning(browserId, WARNING_MESSAGE.browserManipulationsOnRemoteBrowser);
-        }
+    async maximizeWindow (browserId) {
+        this.reportWarning(browserId, WARNING_MESSAGE.browserManipulationsOnRemoteBrowser);
     }
-}
+};
diff --git a/src/browser/provider/cache-item.js b/src/browser/provider/cache-item.js