From f09201d8c35a2346effa938427a8b31cecf7e7f5 Mon Sep 17 00:00:00 2001 From: Brett Sun Date: Thu, 4 Feb 2016 11:59:25 +0100 Subject: [PATCH] Use environment to configure timeouts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apparently node doesn’t accept destructuring yet… --- test/gemini/tests/environment.js | 33 +++++++++++----- test/gemini/tests/main/authenticated.js | 38 ++++++++++--------- test/gemini/tests/main/basic.js | 30 ++++++++------- test/gemini/tests/main/detail.js | 29 +++++++------- test/gemini/tests/whitelabel/23vivi/23vivi.js | 6 ++- test/gemini/tests/whitelabel/cyland/cyland.js | 6 ++- .../tests/whitelabel/ikonotv/ikonotv.js | 22 ++++++----- .../tests/whitelabel/lumenus/lumenus.js | 6 ++- .../whitelabel/shared/whitelabel_basic.js | 26 +++++++------ 9 files changed, 113 insertions(+), 83 deletions(-) diff --git a/test/gemini/tests/environment.js b/test/gemini/tests/environment.js index 4cb1dacf..32f1c8ee 100644 --- a/test/gemini/tests/environment.js +++ b/test/gemini/tests/environment.js @@ -1,22 +1,35 @@ 'use strict'; -const mainUser = { +const MAIN_USER = { email: 'dimi@mailinator.com', password: '0000000000' }; -const mainPieceId = '12374'; -const mainEditionId = '14gw9x3VA9oJaxp4cHaAuK2bvJzvEj4Xvc'; +const MAIN_PIECE_ID = '12374'; +const MAIN_EDITION_ID = '14gw9x3VA9oJaxp4cHaAuK2bvJzvEj4Xvc'; + +const TIMEOUTS = { + SHORT: 3000, + NORMAL: 5000, + LONG: 10000, + SUPER_DUPER_EXTRA_LONG: 30000 +}; console.log('================== Test environment ==================\n'); console.log('Main user:'); -console.log(` Email: ${mainUser.email}`); -console.log(` Password: ${mainUser.password}\n`); -console.log(`Main piece: ${mainPieceId}`); -console.log(`Main edition: ${mainEditionId}\n`); +console.log(` Email: ${MAIN_USER.email}`); +console.log(` Password: ${MAIN_USER.password}\n`); +console.log(`Main piece: ${MAIN_PIECE_ID}`); +console.log(`Main edition: ${MAIN_EDITION_ID}\n`); +console.log('Timeouts:'); +console.log(` Short: ${TIMEOUTS.SHORT}`); +console.log(` Normal: ${TIMEOUTS.NORMAL}\n`); +console.log(` Long: ${TIMEOUTS.LONG}\n`); +console.log(` Super super extra long: ${TIMEOUTS.SUPER_DUPER_EXTRA_LONG}\n`); console.log('========================================================\n'); module.exports = { - mainUser, - mainPieceId, - mainEditionId + MAIN_USER, + MAIN_PIECE_ID, + MAIN_EDITION_ID, + TIMEOUTS }; diff --git a/test/gemini/tests/main/authenticated.js b/test/gemini/tests/main/authenticated.js index 5dc93562..7adfe16d 100644 --- a/test/gemini/tests/main/authenticated.js +++ b/test/gemini/tests/main/authenticated.js @@ -2,6 +2,8 @@ const gemini = require('gemini'); const environment = require('../environment'); +const MAIN_USER = environment.MAIN_USER; +const TIMEOUTS = environment.TIMEOUTS; /** * Suite of tests against routes that require the user to be authenticated. @@ -15,7 +17,7 @@ gemini.suite('Authenticated', (suite) => { // also defines a `.before()` // FIXME: use a more generic class for this, like just '.app', // when we can use this file with the whitelabels - actions.waitForElementToShow('.ascribe-default-app', 5000); + actions.waitForElementToShow('.ascribe-default-app', TIMEOUTS.NORMAL); }); // Suite just to log us in before any other suites run @@ -24,13 +26,13 @@ gemini.suite('Authenticated', (suite) => { .setUrl('/login') .ignoreElements('.ascribe-body') .capture('logged in', (actions, find) => { - actions.waitForElementToShow('.ascribe-form', 5000); + actions.waitForElementToShow('.ascribe-form', TIMEOUTS.NORMAL); - actions.sendKeys(find('.ascribe-login-wrapper input[name=email]'), environment.mainUser.email); - actions.sendKeys(find('.ascribe-login-wrapper input[name=password]'), environment.mainUser.password); + actions.sendKeys(find('.ascribe-login-wrapper input[name=email]'), MAIN_USER.email); + actions.sendKeys(find('.ascribe-login-wrapper input[name=password]'), MAIN_USER.password); actions.click(find('.ascribe-login-wrapper button[type=submit]')); - actions.waitForElementToShow('.ascribe-accordion-list:not(.ascribe-loading-position)', 5000); + actions.waitForElementToShow('.ascribe-accordion-list:not(.ascribe-loading-position)', TIMEOUTS.NORMAL); }); }); @@ -41,7 +43,7 @@ gemini.suite('Authenticated', (suite) => { .ignoreElements('.client--cyland img.img-brand') .skip(/Mobile/) .before((actions, find) => { - actions.waitForElementToShow('.ascribe-accordion-list:not(.ascribe-loading-position)', 5000); + actions.waitForElementToShow('.ascribe-accordion-list:not(.ascribe-loading-position)', TIMEOUTS.NORMAL); }) .capture('desktop header'); @@ -70,7 +72,7 @@ gemini.suite('Authenticated', (suite) => { .ignoreElements('.client--cyland img.img-brand') .skip(/Desktop/) .before((actions, find) => { - actions.waitForElementToShow('.ascribe-accordion-list:not(.ascribe-loading-position)', 5000); + actions.waitForElementToShow('.ascribe-accordion-list:not(.ascribe-loading-position)', TIMEOUTS.NORMAL); }) .capture('mobile header') .capture('expanded mobile header', (actions, find) => { @@ -90,18 +92,18 @@ gemini.suite('Authenticated', (suite) => { collectionSuite .setCaptureElements('.ascribe-accordion-list') .before((actions, find) => { - actions.waitForElementToShow('.ascribe-accordion-list:not(.ascribe-loading-position)', 5000); + actions.waitForElementToShow('.ascribe-accordion-list:not(.ascribe-loading-position)', TIMEOUTS.NORMAL); // Wait for the images to load // FIXME: unfortuntately gemini doesn't support ignoring multiple elements from a single selector // so we're forced to wait and hope that the images will all finish loading after 5s. // We could also change the thumbnails with JS, but setting up a test user is probably easier. - actions.wait(5000); + actions.wait(TIMEOUTS.NORMAL); }) .capture('collection') .capture('expanded edition in collection', (actions, find) => { actions.click(find('.ascribe-accordion-list-item .ascribe-accordion-list-item-edition-widget')); // Wait for editions to load - actions.waitForElementToShow('.ascribe-accordion-list-item-table', 10000); + actions.waitForElementToShow('.ascribe-accordion-list-item-table', TIMEOUTS.LONG); }) gemini.suite('Collection placeholder', (collectionPlaceholderSuite) => { @@ -109,7 +111,7 @@ gemini.suite('Authenticated', (suite) => { .setCaptureElements('.ascribe-accordion-list-placeholder') .capture('collection empty search', (actions, find) => { actions.sendKeys(find('.ascribe-piece-list-toolbar .search-bar input[type="text"]'), 'no search result'); - actions.waitForElementToShow('.ascribe-accordion-list-placeholder', 5000); + actions.waitForElementToShow('.ascribe-accordion-list-placeholder', TIMEOUTS.NORMAL); }); }); @@ -119,7 +121,7 @@ gemini.suite('Authenticated', (suite) => { .capture('items selected', (actions, find) => { actions.click(find('.ascribe-accordion-list-item .ascribe-accordion-list-item-edition-widget')); // Wait for editions to load - actions.waitForElementToShow('.ascribe-accordion-list-item-table', 5000); + actions.waitForElementToShow('.ascribe-accordion-list-item-table', TIMEOUTS.NORMAL); actions.click('.ascribe-table thead tr input[type="checkbox"]'); actions.waitForElementToShow('.piece-list-bulk-modal'); @@ -133,7 +135,7 @@ gemini.suite('Authenticated', (suite) => { .capture('piece list toolbar') .capture('piece list toolbar search filled', (actions, find) => { actions.sendKeys(find('.ascribe-piece-list-toolbar .search-bar input[type="text"]'), 'search text'); - actions.waitForElementToShow('.ascribe-piece-list-toolbar .search-bar .icon-ascribe-search', 5000); + actions.waitForElementToShow('.ascribe-piece-list-toolbar .search-bar .icon-ascribe-search', TIMEOUTS.NORMAL); }) gemini.suite('Order widget dropdown', (pieceListToolbarOrderWidgetSuite) => { @@ -144,7 +146,7 @@ gemini.suite('Authenticated', (suite) => { actions.click(find('#ascribe-piece-list-toolbar-order-widget-dropdown')); // Wait as the dropdown screenshot still includes the collection in the background - actions.waitForElementToShow('.ascribe-accordion-list:not(.ascribe-loading-position)', 5000); + actions.waitForElementToShow('.ascribe-accordion-list:not(.ascribe-loading-position)', TIMEOUTS.NORMAL); }); }); @@ -156,7 +158,7 @@ gemini.suite('Authenticated', (suite) => { actions.click(find('#ascribe-piece-list-toolbar-filter-widget-dropdown')); // Wait as the dropdown screenshot still includes the collection in the background - actions.waitForElementToShow('.ascribe-accordion-list:not(.ascribe-loading-position)', 5000); + actions.waitForElementToShow('.ascribe-accordion-list:not(.ascribe-loading-position)', TIMEOUTS.NORMAL); }); }); }); @@ -167,7 +169,7 @@ gemini.suite('Authenticated', (suite) => { .capture('register work', (actions, find) => { // The uploader options are only rendered after the user is fetched, so // we have to wait for it here - actions.waitForElementToShow('.file-drag-and-drop-dialog .present-options', 5000); + actions.waitForElementToShow('.file-drag-and-drop-dialog .present-options', TIMEOUTS.NORMAL); }) .capture('register work filled', (actions, find) => { actions.sendKeys(find('.ascribe-form input[name="artist_name"]'), 'artist name'); @@ -199,7 +201,7 @@ gemini.suite('Authenticated', (suite) => { .before((actions, find) => { // This will be called before every nested suite begins unless that suite // also defines a `.before()` - actions.waitForElementToShow('.settings-container', 5000); + actions.waitForElementToShow('.settings-container', TIMEOUTS.NORMAL); }) .capture('user settings'); }); @@ -210,7 +212,7 @@ gemini.suite('Authenticated', (suite) => { .setUrl('/logout') .ignoreElements('.ascribe-body') .capture('logout', (actions, find) => { - actions.waitForElementToShow('.ascribe-login-wrapper', 10000); + actions.waitForElementToShow('.ascribe-login-wrapper', TIMEOUTS.LONG); }); }); }); diff --git a/test/gemini/tests/main/basic.js b/test/gemini/tests/main/basic.js index 2e3dcb3a..5657f77f 100644 --- a/test/gemini/tests/main/basic.js +++ b/test/gemini/tests/main/basic.js @@ -2,6 +2,8 @@ const gemini = require('gemini'); const environment = require('../environment'); +const MAIN_USER = environment.MAIN_USER; +const TIMEOUTS = environment.TIMEOUTS; /** * Basic suite of tests against routes that do not require the user to be authenticated. @@ -14,7 +16,7 @@ gemini.suite('Basic', (suite) => { // This will be called before every nested suite begins unless that suite // also defines a `.before()` // FIXME: use a more generic class for this, like just '.ascribe-app' - actions.waitForElementToShow('.ascribe-default-app', 5000); + actions.waitForElementToShow('.ascribe-default-app', TIMEOUTS.NORMAL); }); gemini.suite('Header-desktop', (headerSuite) => { @@ -22,7 +24,7 @@ gemini.suite('Basic', (suite) => { .setCaptureElements('nav.navbar .container') .skip(/Mobile/) .capture('desktop header', (actions, find) => { - actions.waitForElementToShow('nav.navbar .container', 5000); + actions.waitForElementToShow('nav.navbar .container', TIMEOUTS.NORMAL); }) .capture('hover on active item', (actions, find) => { const activeItem = find('nav.navbar li.active'); @@ -40,7 +42,7 @@ gemini.suite('Basic', (suite) => { .setCaptureElements('nav.navbar .container') .skip(/Desktop/) .capture('mobile header', (actions, find) => { - actions.waitForElementToShow('nav.navbar .container', 5000); + actions.waitForElementToShow('nav.navbar .container', TIMEOUTS.NORMAL); }) .capture('expanded mobile header', (actions, find) => { actions.click(find('nav.navbar .navbar-toggle')); @@ -56,7 +58,7 @@ gemini.suite('Basic', (suite) => { footerSuite .setCaptureElements('.ascribe-footer') .capture('footer', (actions, find) => { - actions.waitForElementToShow('.ascribe-footer', 5000); + actions.waitForElementToShow('.ascribe-footer', TIMEOUTS.NORMAL); }) .capture('hover on footer item', (actions, find) => { const footerItem = find('.ascribe-footer a:not(.social)'); @@ -71,7 +73,7 @@ gemini.suite('Basic', (suite) => { gemini.suite('Login', (loginSuite) => { loginSuite .capture('login', (actions, find) => { - actions.waitForElementToShow('.ascribe-form', 5000); + actions.waitForElementToShow('.ascribe-form', TIMEOUTS.NORMAL); }) .capture('hover on login submit', (actions, find) => { actions.mouseMove(find('.ascribe-form button[type=submit]')); @@ -85,8 +87,8 @@ gemini.suite('Basic', (suite) => { // Remove hover from sign up link actions.click(emailInput); - actions.sendKeys(emailInput, environment.mainUser.email); - actions.sendKeys(find('.ascribe-form input[name=password]'), environment.mainUser.password); + actions.sendKeys(emailInput, MAIN_USER.email); + actions.sendKeys(find('.ascribe-form input[name=password]'), MAIN_USER.password); }) .capture('login form filled', (actions, find) => { actions.click(find('.ascribe-form-header')); @@ -97,12 +99,12 @@ gemini.suite('Basic', (suite) => { signUpSuite .setUrl('/signup') .capture('sign up', (actions, find) => { - actions.waitForElementToShow('.ascribe-form', 5000); + actions.waitForElementToShow('.ascribe-form', TIMEOUTS.NORMAL); }) .capture('sign up form filled with focus', (actions, find) => { - actions.sendKeys(find('.ascribe-form input[name=email]'), environment.mainUser.email); - actions.sendKeys(find('.ascribe-form input[name=password]'), environment.mainUser.password); - actions.sendKeys(find('.ascribe-form input[name=password_confirm]'), environment.mainUser.password); + actions.sendKeys(find('.ascribe-form input[name=email]'), MAIN_USER.email); + actions.sendKeys(find('.ascribe-form input[name=password]'), MAIN_USER.password); + actions.sendKeys(find('.ascribe-form input[name=password_confirm]'), MAIN_USER.password); }) .capture('sign up form filled with check', (actions, find) => { actions.click(find('.ascribe-form input[type="checkbox"] ~ .checkbox')); @@ -113,10 +115,10 @@ gemini.suite('Basic', (suite) => { passwordResetSuite .setUrl('/password_reset') .capture('password reset', (actions, find) => { - actions.waitForElementToShow('.ascribe-form', 5000); + actions.waitForElementToShow('.ascribe-form', TIMEOUTS.NORMAL); }) .capture('password reset form filled with focus', (actions, find) => { - actions.sendKeys(find('.ascribe-form input[name="email"]'), environment.mainUser.email); + actions.sendKeys(find('.ascribe-form input[name="email"]'), MAIN_USER.email); }) .capture('password reset form filled', (actions, find) => { actions.click(find('.ascribe-form-header')); @@ -127,7 +129,7 @@ gemini.suite('Basic', (suite) => { coaVerifySuite .setUrl('/coa_verify') .capture('coa verify', (actions, find) => { - actions.waitForElementToShow('.ascribe-form', 5000); + actions.waitForElementToShow('.ascribe-form', TIMEOUTS.NORMAL); }) .capture('coa verify form filled with focus', (actions, find) => { actions.sendKeys(find('.ascribe-form input[name="message"]'), 'sample text'); diff --git a/test/gemini/tests/main/detail.js b/test/gemini/tests/main/detail.js index fd07af6a..39e83d70 100644 --- a/test/gemini/tests/main/detail.js +++ b/test/gemini/tests/main/detail.js @@ -2,8 +2,11 @@ const gemini = require('gemini'); const environment = require('../environment'); -const pieceUrl = `/pieces/${environment.mainPieceId}`; -const editionUrl = `/editions/${environment.mainEditionId}`; +const MAIN_USER = environment.MAIN_USER; +const TIMEOUTS = environment.TIMEOUTS; + +const pieceUrl = `/pieces/${environment.MAIN_PIECE_ID}`; +const editionUrl = `/editions/${environment.MAIN_EDITION_ID}`; /** * Suite of tests against the piece and edition routes. @@ -18,12 +21,12 @@ gemini.suite('Work detail', (suite) => { // also defines a `.before()` // FIXME: use a more generic class for this, like just '.app', // when we can use this file with the whitelabels - actions.waitForElementToShow('.ascribe-default-app', 5000); + actions.waitForElementToShow('.ascribe-default-app', TIMEOUTS.NORMAL); // Wait for the social media buttons to appear - actions.waitForElementToShow('.ascribe-social-button-list .fb-share-button iframe', 20000); - actions.waitForElementToShow('.ascribe-social-button-list .twitter-share-button', 20000); - actions.waitForElementToShow('.ascribe-media-player', 10000); + actions.waitForElementToShow('.ascribe-social-button-list .fb-share-button iframe', TIMEOUTS.SUPER_DUPER_EXTRA_LONG); + actions.waitForElementToShow('.ascribe-social-button-list .twitter-share-button', TIMEOUTS.SUPER_DUPER_EXTRA_LONG); + actions.waitForElementToShow('.ascribe-media-player', TIMEOUTS.LONG); }); gemini.suite('Basic piece', (basicPieceSuite) => { @@ -36,7 +39,7 @@ gemini.suite('Work detail', (suite) => { setCaptureElements('.shmui-wrap') .capture('shmui', (actions, find) => { actions.click(find('.ascribe-media-player')); - actions.waitForElementToShow('.shmui-wrap:not(.loading)', 30000); + actions.waitForElementToShow('.shmui-wrap:not(.loading)', TIMEOUTS.SUPER_DUPER_EXTRA_LONG); // Wait for the transition to end actions.wait(1000); }); @@ -55,14 +58,14 @@ gemini.suite('Work detail', (suite) => { .setUrl('/login') .ignoreElements('.ascribe-body') .before((actions, find) => { - actions.waitForElementToShow('.ascribe-default-app', 5000); + actions.waitForElementToShow('.ascribe-default-app', TIMEOUTS.NORMAL); }) .capture('logged in', (actions, find) => { - actions.sendKeys(find('.ascribe-login-wrapper input[name=email]'), environment.mainUser.email); - actions.sendKeys(find('.ascribe-login-wrapper input[name=password]'), environment.mainUser.password); + actions.sendKeys(find('.ascribe-login-wrapper input[name=email]'), MAIN_USER.email); + actions.sendKeys(find('.ascribe-login-wrapper input[name=password]'), MAIN_USER.password); actions.click(find('.ascribe-login-wrapper button[type=submit]')); - actions.waitForElementToShow('.ascribe-accordion-list:not(.ascribe-loading-position)', 5000); + actions.waitForElementToShow('.ascribe-accordion-list:not(.ascribe-loading-position)', TIMEOUTS.NORMAL); }); }); @@ -122,10 +125,10 @@ gemini.suite('Work detail', (suite) => { .setUrl('/logout') .ignoreElements('.ascribe-body') .before((actions, find) => { - actions.waitForElementToShow('.ascribe-default-app', 5000); + actions.waitForElementToShow('.ascribe-default-app', TIMEOUTS.NORMAL); }) .capture('logout', (actions, find) => { - actions.waitForElementToShow('.ascribe-login-wrapper', 10000); + actions.waitForElementToShow('.ascribe-login-wrapper', TIMEOUTS.LONG); }); }); }); diff --git a/test/gemini/tests/whitelabel/23vivi/23vivi.js b/test/gemini/tests/whitelabel/23vivi/23vivi.js index cafdfc6d..99efb310 100644 --- a/test/gemini/tests/whitelabel/23vivi/23vivi.js +++ b/test/gemini/tests/whitelabel/23vivi/23vivi.js @@ -1,6 +1,8 @@ 'use strict'; const gemini = require('gemini'); +const environment = require('../../environment'); +const TIMEOUTS = environment.TIMEOUTS; /** * Suite of tests against 23vivi specific routes @@ -11,7 +13,7 @@ gemini.suite('23vivi', (suite) => { .setCaptureElements('.ascribe-wallet-app') .before((actions, find) => { // This will be called before every nested suite begins - actions.waitForElementToShow('.ascribe-wallet-app', 5000); + actions.waitForElementToShow('.ascribe-wallet-app', TIMEOUTS.NORMAL); }); gemini.suite('Landing', (landingSuite) => { @@ -19,7 +21,7 @@ gemini.suite('23vivi', (suite) => { .setUrl('/') .capture('landing', (actions, find) => { // Wait for the logo to appear - actions.waitForElementToShow('.vivi23-landing--header-logo', 10000); + actions.waitForElementToShow('.vivi23-landing--header-logo', TIMEOUTS.LONG); }); }); diff --git a/test/gemini/tests/whitelabel/cyland/cyland.js b/test/gemini/tests/whitelabel/cyland/cyland.js index 06709f39..8159f53e 100644 --- a/test/gemini/tests/whitelabel/cyland/cyland.js +++ b/test/gemini/tests/whitelabel/cyland/cyland.js @@ -1,6 +1,8 @@ 'use strict'; const gemini = require('gemini'); +const environment = require('../../environment'); +const TIMEOUTS = environment.TIMEOUTS; /** * Suite of tests against Cyland specific routes @@ -11,7 +13,7 @@ gemini.suite('Cyland', (suite) => { .setCaptureElements('.ascribe-wallet-app') .before((actions, find) => { // This will be called before every nested suite begins - actions.waitForElementToShow('.ascribe-wallet-app', 5000); + actions.waitForElementToShow('.ascribe-wallet-app', TIMEOUTS.NORMAL); }); gemini.suite('Landing', (landingSuite) => { @@ -20,7 +22,7 @@ gemini.suite('Cyland', (suite) => { // Ignore Cyland's logo as it's a gif .ignoreElements('.cyland-landing img') .capture('landing', (actions, find) => { - actions.waitForElementToShow('.cyland-landing img', 10000); + actions.waitForElementToShow('.cyland-landing img', TIMEOUTS.LONG); }); }); diff --git a/test/gemini/tests/whitelabel/ikonotv/ikonotv.js b/test/gemini/tests/whitelabel/ikonotv/ikonotv.js index 5bf019d8..84d743c0 100644 --- a/test/gemini/tests/whitelabel/ikonotv/ikonotv.js +++ b/test/gemini/tests/whitelabel/ikonotv/ikonotv.js @@ -2,6 +2,8 @@ const gemini = require('gemini'); const environment = require('../../environment'); +const MAIN_USER = environment.MAIN_USER; +const TIMEOUTS = environment.TIMEOUTS; /** * Suite of tests against Cyland specific routes @@ -12,7 +14,7 @@ gemini.suite('Ikonotv', (suite) => { .setCaptureElements('.ascribe-wallet-app') .before((actions, find) => { // This will be called before every nested suite begins - actions.waitForElementToShow('.ascribe-wallet-app', 5000); + actions.waitForElementToShow('.ascribe-wallet-app', TIMEOUTS.NORMAL); }); gemini.suite('Landing', (landingSuite) => { @@ -30,7 +32,7 @@ gemini.suite('Ikonotv', (suite) => { }); // Wait for logo to appear - actions.waitForElementToShow('.ikonotv-landing header img', 10000); + actions.waitForElementToShow('.ikonotv-landing header img', TIMEOUTS.LONG); }); }); @@ -44,13 +46,13 @@ gemini.suite('Ikonotv', (suite) => { // also defines a `.before()` // FIXME: use a more generic class for this, like just '.app', // when we can use this file with the whitelabels - actions.waitForElementToShow('.ascribe-wallet-app', 5000); + actions.waitForElementToShow('.ascribe-wallet-app', TIMEOUTS.NORMAL); // Wait for the forms to appear - actions.waitForElementToShow('.ascribe-form', 5000); + actions.waitForElementToShow('.ascribe-form', TIMEOUTS.NORMAL); // Just use a dumb wait because the logo is set as a background image - actions.wait(3000); + actions.wait(TIMEOUTS.SHORT); }); gemini.suite('Login', (loginSuite) => { @@ -69,8 +71,8 @@ gemini.suite('Ikonotv', (suite) => { // Remove hover from sign up link actions.click(emailInput); - actions.sendKeys(emailInput, environment.mainUser.email); - actions.sendKeys(find('.ascribe-form input[name=password]'), environment.mainUser.password); + actions.sendKeys(emailInput, MAIN_USER.email); + actions.sendKeys(find('.ascribe-form input[name=password]'), MAIN_USER.password); }) .capture('login form filled', (actions, find) => { actions.click(find('.ascribe-form-header')); @@ -82,9 +84,9 @@ gemini.suite('Ikonotv', (suite) => { .setUrl('/signup') .capture('sign up') .capture('sign up form filled with focus', (actions, find) => { - actions.sendKeys(find('.ascribe-form input[name=email]'), environment.mainUser.email); - actions.sendKeys(find('.ascribe-form input[name=password]'), environment.mainUser.password); - actions.sendKeys(find('.ascribe-form input[name=password_confirm]'), environment.mainUser.password); + actions.sendKeys(find('.ascribe-form input[name=email]'), MAIN_USER.email); + actions.sendKeys(find('.ascribe-form input[name=password]'), MAIN_USER.password); + actions.sendKeys(find('.ascribe-form input[name=password_confirm]'), MAIN_USER.password); }) .capture('sign up form filled with check', (actions, find) => { actions.click(find('.ascribe-form input[type="checkbox"] ~ .checkbox')); diff --git a/test/gemini/tests/whitelabel/lumenus/lumenus.js b/test/gemini/tests/whitelabel/lumenus/lumenus.js index a9ff53cd..8e8f568d 100644 --- a/test/gemini/tests/whitelabel/lumenus/lumenus.js +++ b/test/gemini/tests/whitelabel/lumenus/lumenus.js @@ -1,6 +1,8 @@ 'use strict'; const gemini = require('gemini'); +const environment = require('../../environment'); +const TIMEOUTS = environment.TIMEOUTS; /** * Suite of tests against lumenus specific routes @@ -11,7 +13,7 @@ gemini.suite('Lumenus', (suite) => { .setCaptureElements('.ascribe-wallet-app') .before((actions, find) => { // This will be called before every nested suite begins - actions.waitForElementToShow('.ascribe-wallet-app', 5000); + actions.waitForElementToShow('.ascribe-wallet-app', TIMEOUTS.NORMAL); }); gemini.suite('Landing', (landingSuite) => { @@ -19,7 +21,7 @@ gemini.suite('Lumenus', (suite) => { .setUrl('/') .capture('landing', (actions, find) => { // Wait for the logo to appear - actions.waitForElementToShow('.wp-landing-wrapper img', 10000); + actions.waitForElementToShow('.wp-landing-wrapper img', TIMEOUTS.LONG); }); }); diff --git a/test/gemini/tests/whitelabel/shared/whitelabel_basic.js b/test/gemini/tests/whitelabel/shared/whitelabel_basic.js index 25713994..0d5ac26b 100644 --- a/test/gemini/tests/whitelabel/shared/whitelabel_basic.js +++ b/test/gemini/tests/whitelabel/shared/whitelabel_basic.js @@ -2,6 +2,8 @@ const gemini = require('gemini'); const environment = require('../../environment'); +const MAIN_USER = environment.MAIN_USER; +const TIMEOUTS = environment.TIMEOUTS; /** * Basic suite of tests against whitelabel routes that do not require authentication. @@ -13,7 +15,7 @@ gemini.suite('Whitelabel basic', (suite) => { // This will be called before every nested suite begins unless that suite // also defines a `.before()` // FIXME: use a more generic class for this, like just '.ascribe-app' - actions.waitForElementToShow('.ascribe-wallet-app', 5000); + actions.waitForElementToShow('.ascribe-wallet-app', TIMEOUTS.NORMAL); // Use a dumb wait in case we're still waiting for other assets, like fonts, to load actions.wait(1000); @@ -25,12 +27,12 @@ gemini.suite('Whitelabel basic', (suite) => { // See Ikono .skip(/Ikono/) .capture('login', (actions, find) => { - actions.waitForElementToShow('.ascribe-form', 5000); + actions.waitForElementToShow('.ascribe-form', TIMEOUTS.NORMAL); // For some reason, the screenshots seem to keep catching the whitelabel login form // on a refresh and without fonts loaded (maybe because they're the first tests run // and the cache isn't hot yet?). // Let's wait a bit and hope they load. - actions.wait(3000); + actions.wait(TIMEOUTS.SHORT); }) .capture('hover on login submit', (actions, find) => { actions.mouseMove(find('.ascribe-form button[type=submit]')); @@ -44,8 +46,8 @@ gemini.suite('Whitelabel basic', (suite) => { // Remove hover from sign up link actions.click(emailInput); - actions.sendKeys(emailInput, environment.mainUser.email); - actions.sendKeys(find('.ascribe-form input[name=password]'), environment.mainUser.password); + actions.sendKeys(emailInput, MAIN_USER.email); + actions.sendKeys(find('.ascribe-form input[name=password]'), MAIN_USER.password); }) .capture('login form filled', (actions, find) => { actions.click(find('.ascribe-form-header')); @@ -58,14 +60,14 @@ gemini.suite('Whitelabel basic', (suite) => { // See Ikono .skip(/Ikono/) .capture('sign up', (actions, find) => { - actions.waitForElementToShow('.ascribe-form', 5000); + actions.waitForElementToShow('.ascribe-form', TIMEOUTS.NORMAL); // Wait in case the form reloads due to other assets loading actions.wait(500); }) .capture('sign up form filled with focus', (actions, find) => { - actions.sendKeys(find('.ascribe-form input[name=email]'), environment.mainUser.email); - actions.sendKeys(find('.ascribe-form input[name=password]'), environment.mainUser.password); - actions.sendKeys(find('.ascribe-form input[name=password_confirm]'), environment.mainUser.password); + actions.sendKeys(find('.ascribe-form input[name=email]'), MAIN_USER.email); + actions.sendKeys(find('.ascribe-form input[name=password]'), MAIN_USER.password); + actions.sendKeys(find('.ascribe-form input[name=password_confirm]'), MAIN_USER.password); }) .capture('sign up form filled with check', (actions, find) => { actions.click(find('.ascribe-form input[type="checkbox"] ~ .checkbox')); @@ -76,12 +78,12 @@ gemini.suite('Whitelabel basic', (suite) => { passwordResetSuite .setUrl('/password_reset') .capture('password reset', (actions, find) => { - actions.waitForElementToShow('.ascribe-form', 5000); + actions.waitForElementToShow('.ascribe-form', TIMEOUTS.NORMAL); // Wait in case the form reloads due to other assets loading actions.wait(500); }) .capture('password reset form filled with focus', (actions, find) => { - actions.sendKeys(find('.ascribe-form input[name="email"]'), environment.mainUser.email); + actions.sendKeys(find('.ascribe-form input[name="email"]'), MAIN_USER.email); }) .capture('password reset form filled', (actions, find) => { actions.click(find('.ascribe-form-header')); @@ -92,7 +94,7 @@ gemini.suite('Whitelabel basic', (suite) => { coaVerifySuite .setUrl('/coa_verify') .capture('coa verify', (actions, find) => { - actions.waitForElementToShow('.ascribe-form', 5000); + actions.waitForElementToShow('.ascribe-form', TIMEOUTS.NORMAL); // Wait in case the form reloads due to other assets loading actions.wait(500); })