From 172ec0b39912d65fd779109537acd05043a0ae57 Mon Sep 17 00:00:00 2001 From: LeeDr Date: Fri, 4 Dec 2015 15:23:20 -0600 Subject: [PATCH] Add check for UTC timezone before each visualize test with data. --- test/functional/apps/visualize/_area_chart.js | 10 +++++ test/functional/apps/visualize/_data_table.js | 10 +++++ test/functional/apps/visualize/_line_chart.js | 10 +++++ .../apps/visualize/_metric_chart.js | 10 +++++ test/functional/apps/visualize/_pie_chart.js | 10 +++++ test/functional/apps/visualize/_tile_map.js | 10 +++++ .../apps/visualize/_vertical_bar_chart.js | 10 +++++ test/intern.js | 6 +-- test/support/pages/SettingsPage.js | 44 +------------------ 9 files changed, 75 insertions(+), 45 deletions(-) diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js index 0a955c0df586..934696e2dc1f 100644 --- a/test/functional/apps/visualize/_area_chart.js +++ b/test/functional/apps/visualize/_area_chart.js @@ -37,6 +37,16 @@ define(function (require) { common.debug('createIndexPattern'); return settingsPage.createIndexPattern(); }) + .then(function () { + return settingsPage.clickAdvancedTab(); + }) + .then(function GetAdvancedSetting() { + common.debug('check for required UTC timezone'); + return settingsPage.getAdvancedSettings('dateFormat:tz'); + }) + .then(function (advancedSetting) { + expect(advancedSetting).to.be('UTC'); + }) .then(function () { common.debug('navigateToApp visualize'); return common.navigateToApp('visualize'); diff --git a/test/functional/apps/visualize/_data_table.js b/test/functional/apps/visualize/_data_table.js index b14c731ebe9b..dbc0dd7e2fbe 100644 --- a/test/functional/apps/visualize/_data_table.js +++ b/test/functional/apps/visualize/_data_table.js @@ -37,6 +37,16 @@ define(function (require) { common.debug('createIndexPattern'); return settingsPage.createIndexPattern(); }) + .then(function () { + return settingsPage.clickAdvancedTab(); + }) + .then(function GetAdvancedSetting() { + common.debug('check for required UTC timezone'); + return settingsPage.getAdvancedSettings('dateFormat:tz'); + }) + .then(function (advancedSetting) { + expect(advancedSetting).to.be('UTC'); + }) .then(function () { common.debug('navigateToApp visualize'); return common.navigateToApp('visualize'); diff --git a/test/functional/apps/visualize/_line_chart.js b/test/functional/apps/visualize/_line_chart.js index b921ddb71f69..e7f0fbabc1fa 100644 --- a/test/functional/apps/visualize/_line_chart.js +++ b/test/functional/apps/visualize/_line_chart.js @@ -34,6 +34,16 @@ define(function (require) { common.debug('createIndexPattern'); return settingsPage.createIndexPattern(); }) + .then(function () { + return settingsPage.clickAdvancedTab(); + }) + .then(function GetAdvancedSetting() { + common.debug('check for required UTC timezone'); + return settingsPage.getAdvancedSettings('dateFormat:tz'); + }) + .then(function (advancedSetting) { + expect(advancedSetting).to.be('UTC'); + }) .then(function () { common.debug('navigateToApp visualize'); return common.navigateToApp('visualize'); diff --git a/test/functional/apps/visualize/_metric_chart.js b/test/functional/apps/visualize/_metric_chart.js index 3fafbea9355e..7758efb97748 100644 --- a/test/functional/apps/visualize/_metric_chart.js +++ b/test/functional/apps/visualize/_metric_chart.js @@ -41,6 +41,16 @@ define(function (require) { common.debug('createIndexPattern'); return settingsPage.createIndexPattern(); }) + .then(function () { + return settingsPage.clickAdvancedTab(); + }) + .then(function GetAdvancedSetting() { + common.debug('check for required UTC timezone'); + return settingsPage.getAdvancedSettings('dateFormat:tz'); + }) + .then(function (advancedSetting) { + expect(advancedSetting).to.be('UTC'); + }) .then(function () { common.debug('navigateToApp visualize'); return common.navigateToApp('visualize'); diff --git a/test/functional/apps/visualize/_pie_chart.js b/test/functional/apps/visualize/_pie_chart.js index b697896b728f..7ff4bfed0181 100644 --- a/test/functional/apps/visualize/_pie_chart.js +++ b/test/functional/apps/visualize/_pie_chart.js @@ -34,6 +34,16 @@ define(function (require) { common.debug('createIndexPattern'); return settingsPage.createIndexPattern(); }) + .then(function () { + return settingsPage.clickAdvancedTab(); + }) + .then(function GetAdvancedSetting() { + common.debug('check for required UTC timezone'); + return settingsPage.getAdvancedSettings('dateFormat:tz'); + }) + .then(function (advancedSetting) { + expect(advancedSetting).to.be('UTC'); + }) .then(function () { common.debug('navigateToApp visualize'); return common.navigateToApp('visualize'); diff --git a/test/functional/apps/visualize/_tile_map.js b/test/functional/apps/visualize/_tile_map.js index c2439ae30706..49885af032ef 100644 --- a/test/functional/apps/visualize/_tile_map.js +++ b/test/functional/apps/visualize/_tile_map.js @@ -36,6 +36,16 @@ define(function (require) { common.debug('createIndexPattern'); return settingsPage.createIndexPattern(); }) + .then(function () { + return settingsPage.clickAdvancedTab(); + }) + .then(function GetAdvancedSetting() { + common.debug('check for required UTC timezone'); + return settingsPage.getAdvancedSettings('dateFormat:tz'); + }) + .then(function (advancedSetting) { + expect(advancedSetting).to.be('UTC'); + }) .then(function () { common.debug('navigateToApp visualize'); return common.navigateToApp('visualize'); diff --git a/test/functional/apps/visualize/_vertical_bar_chart.js b/test/functional/apps/visualize/_vertical_bar_chart.js index 43b42bd0a579..be5f615100af 100644 --- a/test/functional/apps/visualize/_vertical_bar_chart.js +++ b/test/functional/apps/visualize/_vertical_bar_chart.js @@ -36,6 +36,16 @@ define(function (require) { common.debug('createIndexPattern'); return settingsPage.createIndexPattern(); }) + .then(function () { + return settingsPage.clickAdvancedTab(); + }) + .then(function GetAdvancedSetting() { + common.debug('check for required UTC timezone'); + return settingsPage.getAdvancedSettings('dateFormat:tz'); + }) + .then(function (advancedSetting) { + expect(advancedSetting).to.be('UTC'); + }) .then(function () { common.debug('navigateToApp visualize'); return common.navigateToApp('visualize'); diff --git a/test/intern.js b/test/intern.js index 870375644324..1f5ea51e39b5 100644 --- a/test/intern.js +++ b/test/intern.js @@ -13,9 +13,9 @@ define(function (require) { }], tunnelOptions: serverConfig.servers.webdriver, functionalSuites: [ - 'test/functional/status_page/index', - 'test/functional/apps/settings/index', - 'test/functional/apps/discover/index', + // 'test/functional/status_page/index', + // 'test/functional/apps/settings/index', + // 'test/functional/apps/discover/index', 'test/functional/apps/visualize/index' ], excludeInstrumentation: /(fixtures|node_modules)\//, diff --git a/test/support/pages/SettingsPage.js b/test/support/pages/SettingsPage.js index 273a2abf6522..952ff764b0df 100644 --- a/test/support/pages/SettingsPage.js +++ b/test/support/pages/SettingsPage.js @@ -16,7 +16,7 @@ define(function (require) { constructor: SettingsPage, clickAdvancedTab: function () { - console.log('in clickAdvancedTab'); + common.debug('in clickAdvancedTab'); return common.findTestSubject('settingsNav advanced').click(); }, @@ -39,7 +39,7 @@ define(function (require) { getAdvancedSettings: function getAdvancedSettings(propertyName) { var self = this; - console.log('in setAdvancedSettings'); + common.debug('in setAdvancedSettings'); return common.findTestSubject('advancedSetting&' + propertyName + ' currentValue') .getVisibleText(); }, @@ -49,46 +49,6 @@ define(function (require) { return common.navigateToApp('settings'); }, - setAdvancedSetting2: function (propertyName, propertyValue) { - var self = this; - // assumes we're on Settings tab already - //click Advanced sub-tab - return this.remote.setFindTimeout(defaultTimeout) - .findByLinkText('Advanced').click() - .then(function () { - //.table - return self.remote.findByCssSelector('tr') - .then(function (table) { - common.log('table.rows = ' + table.length); // undefined - common.log('table.rows = ' + table.size); // undefined - common.log('table.rows = ' + table.count); // undefined - common.log('table.getProperty(rows).length = ' + table.getProperty('rows').length); // undefined - common.log('table.getProperty(rows) = ' + table.getProperty('rows')); // [object Object] - common.log('table.getProperty(rows).size = ' + table.getProperty('rows').size); // undefined - // common.log('table.getProperty(rows).size = ' + table.getProperty('rows').size()); // exception - }); - }); - - }, - - setAdvancedSetting: function (propertyName, propertyValue) { - var self = this; - // assumes we're on Settings tab already - //click Advanced sub-tab - return this.remote.setFindTimeout(defaultTimeout) - .findByLinkText('Advanced').click() - .then(function () { - return self.remote.findByCssSelector('tr > td > b:contains("' + propertyName + '")') - .then(function (foundit) { - console.log('foundit)'); - }); - }); - // }, - // .ng-binding - // tr.ng-scope:nth-child(4) > td:nth-child(1) - // tr.ng-scope:nth-child(4) > td:nth-child(3) > button:nth-child(1) (the edit button) - // .findByCssSelector('input[ng-model="index.isTimeBased"]'); - }, getTimeBasedEventsCheckbox: function () { return this.remote.setFindTimeout(defaultTimeout)