From 0aa8c7427d63612321a5ba54e2ec4fc184665d42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ely=C3=A9zer=20Rezende?= Date: Tue, 21 May 2019 23:12:53 -0400 Subject: [PATCH] Set window size globally on e2e --- awx/ui/test/e2e/nightwatch.conf.js | 9 ++++++++- awx/ui/test/e2e/tests/smoke.js | 1 - awx/ui/test/e2e/tests/test-404-behavior.js | 3 +-- awx/ui/test/e2e/tests/test-credentials-list-actions.js | 1 - awx/ui/test/e2e/tests/test-credentials-search-sort.js | 1 - awx/ui/test/e2e/tests/test-form-error-handling.js | 1 - awx/ui/test/e2e/tests/test-inventories-list-actions.js | 2 -- .../e2e/tests/test-inventory-scripts-list-actions.js | 1 - awx/ui/test/e2e/tests/test-jobs-portal-list-actions.js | 1 - awx/ui/test/e2e/tests/test-launch-jt.js | 1 - awx/ui/test/e2e/tests/test-notifications-list-actions.js | 1 - awx/ui/test/e2e/tests/test-org-permissions.js | 1 - awx/ui/test/e2e/tests/test-pagination.js | 3 +-- awx/ui/test/e2e/tests/test-projects-list-actions.js | 1 - .../e2e/tests/test-templates-copy-delete-warnings.js | 3 --- awx/ui/test/e2e/tests/test-templates-list-actions.js | 2 -- awx/ui/test/e2e/tests/test-websockets.js | 3 +-- awx/ui/test/e2e/tests/test-workflow-visualizer.js | 1 - awx/ui/test/e2e/tests/test-xss.js | 1 - 19 files changed, 11 insertions(+), 26 deletions(-) diff --git a/awx/ui/test/e2e/nightwatch.conf.js b/awx/ui/test/e2e/nightwatch.conf.js index 89d57378ed..fb5fb99d0b 100644 --- a/awx/ui/test/e2e/nightwatch.conf.js +++ b/awx/ui/test/e2e/nightwatch.conf.js @@ -27,7 +27,14 @@ module.exports = { selenium_host: 'localhost', selenium_port: 9515, default_path_prefix: '', - desiredCapabilities: { browserName: 'chrome' }, + desiredCapabilities: { + browserName: 'chrome', + chromeOptions: { + args: [ + 'window-size=1280,800' + ] + } + }, test_workers: { enabled: false }, globals: { launch_url: AWX_E2E_LAUNCH_URL, diff --git a/awx/ui/test/e2e/tests/smoke.js b/awx/ui/test/e2e/tests/smoke.js index 3c9dcddab5..7b5271523f 100644 --- a/awx/ui/test/e2e/tests/smoke.js +++ b/awx/ui/test/e2e/tests/smoke.js @@ -22,7 +22,6 @@ module.exports = { initializeData(); client.login(); - client.resizeWindow(1200, 800); client.waitForAngular(); }, 'create organization': client => { diff --git a/awx/ui/test/e2e/tests/test-404-behavior.js b/awx/ui/test/e2e/tests/test-404-behavior.js index 6effbf8baa..d12181a4ad 100644 --- a/awx/ui/test/e2e/tests/test-404-behavior.js +++ b/awx/ui/test/e2e/tests/test-404-behavior.js @@ -7,8 +7,7 @@ module.exports = { before: (client) => { client .login() - .waitForAngular() - .resizeWindow(1200, 1000); + .waitForAngular(); }, 'Test that default the 404 behavior redirects to the dashboard': client => { client.navigateTo(`${AWX_E2E_URL}#/brokenurl`, false); diff --git a/awx/ui/test/e2e/tests/test-credentials-list-actions.js b/awx/ui/test/e2e/tests/test-credentials-list-actions.js index a48f479d13..117a4a943b 100644 --- a/awx/ui/test/e2e/tests/test-credentials-list-actions.js +++ b/awx/ui/test/e2e/tests/test-credentials-list-actions.js @@ -12,7 +12,6 @@ module.exports = { const credentials = client.page.credentials(); client.useCss(); - client.resizeWindow(1200, 800); client.login(); client.waitForAngular(); diff --git a/awx/ui/test/e2e/tests/test-credentials-search-sort.js b/awx/ui/test/e2e/tests/test-credentials-search-sort.js index 89fad80bf5..7267961bb6 100644 --- a/awx/ui/test/e2e/tests/test-credentials-search-sort.js +++ b/awx/ui/test/e2e/tests/test-credentials-search-sort.js @@ -3,7 +3,6 @@ module.exports = { const credentials = client.page.credentials(); client.login(); - client.resizeWindow(1200, 800); client.waitForAngular(); credentials diff --git a/awx/ui/test/e2e/tests/test-form-error-handling.js b/awx/ui/test/e2e/tests/test-form-error-handling.js index 559292f20b..d4709bdf0d 100644 --- a/awx/ui/test/e2e/tests/test-form-error-handling.js +++ b/awx/ui/test/e2e/tests/test-form-error-handling.js @@ -30,7 +30,6 @@ module.exports = { client .login() .waitForAngular() - .resizeWindow(1200, 1000) .useXpath() .findThenClick(templatesNavTab) .findThenClick('//*[@id="button-add"]') diff --git a/awx/ui/test/e2e/tests/test-inventories-list-actions.js b/awx/ui/test/e2e/tests/test-inventories-list-actions.js index d50be7fc33..c198d537f1 100644 --- a/awx/ui/test/e2e/tests/test-inventories-list-actions.js +++ b/awx/ui/test/e2e/tests/test-inventories-list-actions.js @@ -24,7 +24,6 @@ module.exports = { const inventories = client.page.inventories(); client.useCss(); - client.resizeWindow(1200, 800); client.login(); client.waitForAngular(); @@ -81,7 +80,6 @@ module.exports = { const inventories = client.page.inventories(); client.useCss(); - client.resizeWindow(1200, 800); client.login(); client.waitForAngular(); diff --git a/awx/ui/test/e2e/tests/test-inventory-scripts-list-actions.js b/awx/ui/test/e2e/tests/test-inventory-scripts-list-actions.js index 262266aecb..9d1827f8c1 100644 --- a/awx/ui/test/e2e/tests/test-inventory-scripts-list-actions.js +++ b/awx/ui/test/e2e/tests/test-inventory-scripts-list-actions.js @@ -12,7 +12,6 @@ module.exports = { const inventoryScripts = client.page.inventoryScripts(); client.useCss(); - client.resizeWindow(1200, 800); client.login(); client.waitForAngular(); diff --git a/awx/ui/test/e2e/tests/test-jobs-portal-list-actions.js b/awx/ui/test/e2e/tests/test-jobs-portal-list-actions.js index bb66081126..6cafdf6d27 100644 --- a/awx/ui/test/e2e/tests/test-jobs-portal-list-actions.js +++ b/awx/ui/test/e2e/tests/test-jobs-portal-list-actions.js @@ -7,7 +7,6 @@ let data; module.exports = { before: (client, done) => { - client.resizeWindow(1200, 800); client.login(); client.waitForAngular(); diff --git a/awx/ui/test/e2e/tests/test-launch-jt.js b/awx/ui/test/e2e/tests/test-launch-jt.js index c4fa393d33..0fbc14989c 100644 --- a/awx/ui/test/e2e/tests/test-launch-jt.js +++ b/awx/ui/test/e2e/tests/test-launch-jt.js @@ -67,7 +67,6 @@ module.exports = { }, 'login to awx': client => { client.login(); - client.resizeWindow(1200, 800); client.waitForAngular(); }, 'expected jt launch with no prompts to navigate to job details': client => { diff --git a/awx/ui/test/e2e/tests/test-notifications-list-actions.js b/awx/ui/test/e2e/tests/test-notifications-list-actions.js index 376aa2f0ed..11e4114c84 100644 --- a/awx/ui/test/e2e/tests/test-notifications-list-actions.js +++ b/awx/ui/test/e2e/tests/test-notifications-list-actions.js @@ -12,7 +12,6 @@ module.exports = { const notifications = client.page.notificationTemplates(); client.useCss(); - client.resizeWindow(1200, 800); client.login(); client.waitForAngular(); diff --git a/awx/ui/test/e2e/tests/test-org-permissions.js b/awx/ui/test/e2e/tests/test-org-permissions.js index 1dcd07211b..2a12fafe24 100644 --- a/awx/ui/test/e2e/tests/test-org-permissions.js +++ b/awx/ui/test/e2e/tests/test-org-permissions.js @@ -66,7 +66,6 @@ module.exports = { client .login() .waitForAngular() - .resizeWindow(1200, 1000) .useXpath() .findThenClick(teamsNavTab) .clearValue(searchBar) diff --git a/awx/ui/test/e2e/tests/test-pagination.js b/awx/ui/test/e2e/tests/test-pagination.js index f70c4d934e..f9f5ec6191 100644 --- a/awx/ui/test/e2e/tests/test-pagination.js +++ b/awx/ui/test/e2e/tests/test-pagination.js @@ -26,8 +26,7 @@ module.exports = { client .login() - .waitForAngular() - .resizeWindow(1200, 1000); + .waitForAngular(); }, 'Test job template pagination': client => { client diff --git a/awx/ui/test/e2e/tests/test-projects-list-actions.js b/awx/ui/test/e2e/tests/test-projects-list-actions.js index fa025c851c..0c2acc3a73 100644 --- a/awx/ui/test/e2e/tests/test-projects-list-actions.js +++ b/awx/ui/test/e2e/tests/test-projects-list-actions.js @@ -12,7 +12,6 @@ module.exports = { const projects = client.page.projects(); client.useCss(); - client.resizeWindow(1200, 800); client.login(); client.waitForAngular(); diff --git a/awx/ui/test/e2e/tests/test-templates-copy-delete-warnings.js b/awx/ui/test/e2e/tests/test-templates-copy-delete-warnings.js index 49da6f3cd1..094323a5e1 100644 --- a/awx/ui/test/e2e/tests/test-templates-copy-delete-warnings.js +++ b/awx/ui/test/e2e/tests/test-templates-copy-delete-warnings.js @@ -61,7 +61,6 @@ module.exports = { const templates = client.page.templates(); client.useCss(); - client.resizeWindow(1200, 800); client.login(); client.waitForAngular(); @@ -116,7 +115,6 @@ module.exports = { const templates = client.page.templates(); client.useCss(); - client.resizeWindow(1200, 800); client.login(); client.waitForAngular(); @@ -166,7 +164,6 @@ module.exports = { const templates = client.page.templates(); client.useCss(); - client.resizeWindow(1200, 800); client.login(data.user.username); client.waitForAngular(); diff --git a/awx/ui/test/e2e/tests/test-templates-list-actions.js b/awx/ui/test/e2e/tests/test-templates-list-actions.js index 78b6e93241..05451e93fd 100644 --- a/awx/ui/test/e2e/tests/test-templates-list-actions.js +++ b/awx/ui/test/e2e/tests/test-templates-list-actions.js @@ -26,7 +26,6 @@ module.exports = { const templates = client.page.templates(); client.useCss(); - client.resizeWindow(1200, 800); client.login(); client.waitForAngular(); @@ -84,7 +83,6 @@ module.exports = { const templates = client.page.templates(); client.useCss(); - client.resizeWindow(1200, 800); client.login(); client.waitForAngular(); diff --git a/awx/ui/test/e2e/tests/test-websockets.js b/awx/ui/test/e2e/tests/test-websockets.js index 4aa6877ece..72b567e167 100644 --- a/awx/ui/test/e2e/tests/test-websockets.js +++ b/awx/ui/test/e2e/tests/test-websockets.js @@ -54,8 +54,7 @@ module.exports = { client .login() - .waitForAngular() - .resizeWindow(1200, 1000); + .waitForAngular(); }, 'Test job template status updates for a successful job on dashboard': client => { diff --git a/awx/ui/test/e2e/tests/test-workflow-visualizer.js b/awx/ui/test/e2e/tests/test-workflow-visualizer.js index 112b1b8942..5cc12ec80f 100644 --- a/awx/ui/test/e2e/tests/test-workflow-visualizer.js +++ b/awx/ui/test/e2e/tests/test-workflow-visualizer.js @@ -64,7 +64,6 @@ module.exports = { client .login() .waitForAngular() - .resizeWindow(1200, 1000) .navigateTo(`${AWX_E2E_URL}/#/templates`, false) .useXpath() .waitForElementVisible(workflowSearchBar) diff --git a/awx/ui/test/e2e/tests/test-xss.js b/awx/ui/test/e2e/tests/test-xss.js index 2f916cdab3..dc05ec1593 100644 --- a/awx/ui/test/e2e/tests/test-xss.js +++ b/awx/ui/test/e2e/tests/test-xss.js @@ -75,7 +75,6 @@ module.exports = { client.useCss(); client.login(); - client.resizeWindow(1200, 800); client.waitForAngular(); done();