diff --git a/test/fixtures/__tests__/scenarioManager.js b/test/fixtures/__tests__/scenario_manager.js similarity index 98% rename from test/fixtures/__tests__/scenarioManager.js rename to test/fixtures/__tests__/scenario_manager.js index bccce64e7ade9..144f6c1cfaa80 100644 --- a/test/fixtures/__tests__/scenarioManager.js +++ b/test/fixtures/__tests__/scenario_manager.js @@ -2,7 +2,7 @@ var expect = require('expect.js'); var sinon = require('sinon'); var Promise = require('bluebird'); -var ScenarioManager = require('../scenarioManager'); +var ScenarioManager = require('../scenario_manager'); describe('scenario manager', function () { var manager = new ScenarioManager('http://localhost:9200'); diff --git a/test/fixtures/scenarioManager.js b/test/fixtures/scenario_manager.js similarity index 100% rename from test/fixtures/scenarioManager.js rename to test/fixtures/scenario_manager.js diff --git a/test/functional/apps/discover/_collapse_expand.js b/test/functional/apps/discover/_collapse_expand.js index 25f4260b3e35f..5e271d29724bc 100644 --- a/test/functional/apps/discover/_collapse_expand.js +++ b/test/functional/apps/discover/_collapse_expand.js @@ -1,8 +1,8 @@ define(function (require) { - var Common = require('../../../support/pages/Common'); - var HeaderPage = require('../../../support/pages/HeaderPage'); + var Common = require('../../../support/pages/common'); + var HeaderPage = require('../../../support/pages/header_page'); var SettingsPage = require('../../../support/pages/settings_page'); - var DiscoverPage = require('../../../support/pages/DiscoverPage'); + var DiscoverPage = require('../../../support/pages/discover_page'); var expect = require('intern/dojo/node!expect.js'); return function (bdd, scenarioManager) { diff --git a/test/functional/apps/discover/_discover.js b/test/functional/apps/discover/_discover.js index b0cf63a0748d2..44525ad24d45c 100644 --- a/test/functional/apps/discover/_discover.js +++ b/test/functional/apps/discover/_discover.js @@ -1,8 +1,8 @@ define(function (require) { - var Common = require('../../../support/pages/Common'); - var HeaderPage = require('../../../support/pages/HeaderPage'); + var Common = require('../../../support/pages/common'); + var HeaderPage = require('../../../support/pages/header_page'); var SettingsPage = require('../../../support/pages/settings_page'); - var DiscoverPage = require('../../../support/pages/DiscoverPage'); + var DiscoverPage = require('../../../support/pages/discover_page'); var expect = require('intern/dojo/node!expect.js'); return function (bdd, scenarioManager) { diff --git a/test/functional/apps/discover/_field_data.js b/test/functional/apps/discover/_field_data.js index e50f65678ca29..c36ae8e0fcae6 100644 --- a/test/functional/apps/discover/_field_data.js +++ b/test/functional/apps/discover/_field_data.js @@ -1,8 +1,8 @@ define(function (require) { - var Common = require('../../../support/pages/Common'); - var HeaderPage = require('../../../support/pages/HeaderPage'); + var Common = require('../../../support/pages/common'); + var HeaderPage = require('../../../support/pages/header_page'); var SettingsPage = require('../../../support/pages/settings_page'); - var DiscoverPage = require('../../../support/pages/DiscoverPage'); + var DiscoverPage = require('../../../support/pages/discover_page'); var expect = require('intern/dojo/node!expect.js'); return function (bdd, scenarioManager) { diff --git a/test/functional/apps/discover/_shared_links.js b/test/functional/apps/discover/_shared_links.js index e446109c5c566..f590cc2dd44c6 100644 --- a/test/functional/apps/discover/_shared_links.js +++ b/test/functional/apps/discover/_shared_links.js @@ -1,8 +1,8 @@ define(function (require) { - var Common = require('../../../support/pages/Common'); - var HeaderPage = require('../../../support/pages/HeaderPage'); + var Common = require('../../../support/pages/common'); + var HeaderPage = require('../../../support/pages/header_page'); var SettingsPage = require('../../../support/pages/settings_page'); - var DiscoverPage = require('../../../support/pages/DiscoverPage'); + var DiscoverPage = require('../../../support/pages/discover_page'); var expect = require('intern/dojo/node!expect.js'); return function (bdd, scenarioManager) { diff --git a/test/functional/apps/discover/index.js b/test/functional/apps/discover/index.js index 176d6cacbc2b6..c81f441ba4d0d 100644 --- a/test/functional/apps/discover/index.js +++ b/test/functional/apps/discover/index.js @@ -2,7 +2,7 @@ define(function (require) { var bdd = require('intern!bdd'); var config = require('intern').config; var url = require('intern/dojo/node!url'); - var ScenarioManager = require('intern/dojo/node!../../../fixtures/scenarioManager'); + var ScenarioManager = require('intern/dojo/node!../../../fixtures/scenario_manager'); var discoverTest = require('./_discover'); var fieldData = require('./_field_data'); var sharedLinks = require('./_shared_links'); diff --git a/test/functional/apps/settings/_advanced_settings.js b/test/functional/apps/settings/_advanced_settings.js index edf14b1914426..6a39e5654b528 100644 --- a/test/functional/apps/settings/_advanced_settings.js +++ b/test/functional/apps/settings/_advanced_settings.js @@ -1,5 +1,5 @@ define(function (require) { - var Common = require('../../../support/pages/Common'); + var Common = require('../../../support/pages/common'); var SettingsPage = require('../../../support/pages/settings_page'); var expect = require('intern/dojo/node!expect.js'); diff --git a/test/functional/apps/settings/_creation_form_changes.js b/test/functional/apps/settings/_creation_form_changes.js index 932756d153363..b6451f9b0159a 100644 --- a/test/functional/apps/settings/_creation_form_changes.js +++ b/test/functional/apps/settings/_creation_form_changes.js @@ -1,5 +1,5 @@ define(function (require) { - var Common = require('../../../support/pages/Common'); + var Common = require('../../../support/pages/common'); var SettingsPage = require('../../../support/pages/settings_page'); var expect = require('intern/dojo/node!expect.js'); diff --git a/test/functional/apps/settings/_index_pattern_create_delete.js b/test/functional/apps/settings/_index_pattern_create_delete.js index 9c8d27b810cb3..294e187a61708 100644 --- a/test/functional/apps/settings/_index_pattern_create_delete.js +++ b/test/functional/apps/settings/_index_pattern_create_delete.js @@ -1,5 +1,5 @@ define(function (require) { - var Common = require('../../../support/pages/Common'); + var Common = require('../../../support/pages/common'); var SettingsPage = require('../../../support/pages/settings_page'); var expect = require('intern/dojo/node!expect.js'); diff --git a/test/functional/apps/settings/_index_pattern_popularity.js b/test/functional/apps/settings/_index_pattern_popularity.js index a8c36e91194a3..42ec83f3e814a 100644 --- a/test/functional/apps/settings/_index_pattern_popularity.js +++ b/test/functional/apps/settings/_index_pattern_popularity.js @@ -1,5 +1,5 @@ define(function (require) { - var Common = require('../../../support/pages/Common'); + var Common = require('../../../support/pages/common'); var SettingsPage = require('../../../support/pages/settings_page'); var expect = require('intern/dojo/node!expect.js'); diff --git a/test/functional/apps/settings/_index_pattern_results_sort.js b/test/functional/apps/settings/_index_pattern_results_sort.js index c9f42ae95aff7..e91c0ebf6ac5d 100644 --- a/test/functional/apps/settings/_index_pattern_results_sort.js +++ b/test/functional/apps/settings/_index_pattern_results_sort.js @@ -1,6 +1,6 @@ define(function (require) { var config = require('intern').config; - var Common = require('../../../support/pages/Common'); + var Common = require('../../../support/pages/common'); var SettingsPage = require('../../../support/pages/settings_page'); var expect = require('intern/dojo/node!expect.js'); diff --git a/test/functional/apps/settings/_initial_state.js b/test/functional/apps/settings/_initial_state.js index cd6a3bca70866..a7d4f2b872ebd 100644 --- a/test/functional/apps/settings/_initial_state.js +++ b/test/functional/apps/settings/_initial_state.js @@ -1,6 +1,6 @@ define(function (require) { var expect = require('intern/dojo/node!expect.js'); - var Common = require('../../../support/pages/Common'); + var Common = require('../../../support/pages/common'); var SettingsPage = require('../../../support/pages/settings_page'); return function (bdd, scenarioManager) { diff --git a/test/functional/apps/settings/index.js b/test/functional/apps/settings/index.js index 83a1bb576c428..467ee268377aa 100644 --- a/test/functional/apps/settings/index.js +++ b/test/functional/apps/settings/index.js @@ -2,7 +2,7 @@ define(function (require) { var bdd = require('intern!bdd'); var config = require('intern').config; var url = require('intern/dojo/node!url'); - var ScenarioManager = require('intern/dojo/node!../../../fixtures/scenarioManager'); + var ScenarioManager = require('intern/dojo/node!../../../fixtures/scenario_manager'); var initialStateTest = require('./_initial_state'); var creationChangesTest = require('./_creation_form_changes'); diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js index 8251cec57d8c6..a456dfec3ed74 100644 --- a/test/functional/apps/visualize/_area_chart.js +++ b/test/functional/apps/visualize/_area_chart.js @@ -1,9 +1,9 @@ define(function (require) { - var Common = require('../../../support/pages/Common'); - var HeaderPage = require('../../../support/pages/HeaderPage'); + var Common = require('../../../support/pages/common'); + var HeaderPage = require('../../../support/pages/header_page'); var SettingsPage = require('../../../support/pages/settings_page'); - var DiscoverPage = require('../../../support/pages/DiscoverPage'); - var VisualizePage = require('../../../support/pages/VisualizePage'); + var DiscoverPage = require('../../../support/pages/discover_page'); + var VisualizePage = require('../../../support/pages/visualize_page'); var expect = require('intern/dojo/node!expect.js'); return function (bdd, scenarioManager) { diff --git a/test/functional/apps/visualize/_chart_types.js b/test/functional/apps/visualize/_chart_types.js index ee0243159e742..6da1462ec25f6 100644 --- a/test/functional/apps/visualize/_chart_types.js +++ b/test/functional/apps/visualize/_chart_types.js @@ -1,7 +1,7 @@ define(function (require) { - var Common = require('../../../support/pages/Common'); + var Common = require('../../../support/pages/common'); var SettingsPage = require('../../../support/pages/settings_page'); - var VisualizePage = require('../../../support/pages/VisualizePage'); + var VisualizePage = require('../../../support/pages/visualize_page'); var expect = require('intern/dojo/node!expect.js'); return function (bdd, scenarioManager) { diff --git a/test/functional/apps/visualize/_data_table.js b/test/functional/apps/visualize/_data_table.js index 72a23b032246e..0f4e3a4faaa79 100644 --- a/test/functional/apps/visualize/_data_table.js +++ b/test/functional/apps/visualize/_data_table.js @@ -1,9 +1,9 @@ define(function (require) { - var Common = require('../../../support/pages/Common'); - var HeaderPage = require('../../../support/pages/HeaderPage'); + var Common = require('../../../support/pages/common'); + var HeaderPage = require('../../../support/pages/header_page'); var SettingsPage = require('../../../support/pages/settings_page'); - var DiscoverPage = require('../../../support/pages/DiscoverPage'); - var VisualizePage = require('../../../support/pages/VisualizePage'); + var DiscoverPage = require('../../../support/pages/discover_page'); + var VisualizePage = require('../../../support/pages/visualize_page'); var expect = require('intern/dojo/node!expect.js'); return function (bdd, scenarioManager) { diff --git a/test/functional/apps/visualize/_line_chart.js b/test/functional/apps/visualize/_line_chart.js index a6c817d20e8c8..539758e69bb6b 100644 --- a/test/functional/apps/visualize/_line_chart.js +++ b/test/functional/apps/visualize/_line_chart.js @@ -1,9 +1,9 @@ define(function (require) { - var Common = require('../../../support/pages/Common'); - var HeaderPage = require('../../../support/pages/HeaderPage'); + var Common = require('../../../support/pages/common'); + var HeaderPage = require('../../../support/pages/header_page'); var SettingsPage = require('../../../support/pages/settings_page'); - var DiscoverPage = require('../../../support/pages/DiscoverPage'); - var VisualizePage = require('../../../support/pages/VisualizePage'); + var DiscoverPage = require('../../../support/pages/discover_page'); + var VisualizePage = require('../../../support/pages/visualize_page'); var expect = require('intern/dojo/node!expect.js'); return function (bdd, scenarioManager) { diff --git a/test/functional/apps/visualize/_metric_chart.js b/test/functional/apps/visualize/_metric_chart.js index fa04e6c9c0158..728784784507b 100644 --- a/test/functional/apps/visualize/_metric_chart.js +++ b/test/functional/apps/visualize/_metric_chart.js @@ -1,9 +1,9 @@ define(function (require) { - var Common = require('../../../support/pages/Common'); - var HeaderPage = require('../../../support/pages/HeaderPage'); + var Common = require('../../../support/pages/common'); + var HeaderPage = require('../../../support/pages/header_page'); var SettingsPage = require('../../../support/pages/settings_page'); - var DiscoverPage = require('../../../support/pages/DiscoverPage'); - var VisualizePage = require('../../../support/pages/VisualizePage'); + var DiscoverPage = require('../../../support/pages/discover_page'); + var VisualizePage = require('../../../support/pages/visualize_page'); var expect = require('intern/dojo/node!expect.js'); return function (bdd, scenarioManager) { diff --git a/test/functional/apps/visualize/_pie_chart.js b/test/functional/apps/visualize/_pie_chart.js index 6ff9096069479..5490fe6af3a1c 100644 --- a/test/functional/apps/visualize/_pie_chart.js +++ b/test/functional/apps/visualize/_pie_chart.js @@ -1,9 +1,9 @@ define(function (require) { - var Common = require('../../../support/pages/Common'); - var HeaderPage = require('../../../support/pages/HeaderPage'); + var Common = require('../../../support/pages/common'); + var HeaderPage = require('../../../support/pages/header_page'); var SettingsPage = require('../../../support/pages/settings_page'); - var DiscoverPage = require('../../../support/pages/DiscoverPage'); - var VisualizePage = require('../../../support/pages/VisualizePage'); + var DiscoverPage = require('../../../support/pages/discover_page'); + var VisualizePage = require('../../../support/pages/visualize_page'); var expect = require('intern/dojo/node!expect.js'); return function (bdd, scenarioManager) { diff --git a/test/functional/apps/visualize/_tile_map.js b/test/functional/apps/visualize/_tile_map.js index 75044876c2acf..bea797df399ed 100644 --- a/test/functional/apps/visualize/_tile_map.js +++ b/test/functional/apps/visualize/_tile_map.js @@ -1,9 +1,9 @@ define(function (require) { - var Common = require('../../../support/pages/Common'); - var HeaderPage = require('../../../support/pages/HeaderPage'); + var Common = require('../../../support/pages/common'); + var HeaderPage = require('../../../support/pages/header_page'); var SettingsPage = require('../../../support/pages/settings_page'); - var DiscoverPage = require('../../../support/pages/DiscoverPage'); - var VisualizePage = require('../../../support/pages/VisualizePage'); + var DiscoverPage = require('../../../support/pages/discover_page'); + var VisualizePage = require('../../../support/pages/visualize_page'); var expect = require('intern/dojo/node!expect.js'); return function (bdd, scenarioManager) { diff --git a/test/functional/apps/visualize/_vertical_bar_chart.js b/test/functional/apps/visualize/_vertical_bar_chart.js index 88ee497427da5..7f9d942deb0a5 100644 --- a/test/functional/apps/visualize/_vertical_bar_chart.js +++ b/test/functional/apps/visualize/_vertical_bar_chart.js @@ -1,9 +1,9 @@ define(function (require) { - var Common = require('../../../support/pages/Common'); - var HeaderPage = require('../../../support/pages/HeaderPage'); + var Common = require('../../../support/pages/common'); + var HeaderPage = require('../../../support/pages/header_page'); var SettingsPage = require('../../../support/pages/settings_page'); - var DiscoverPage = require('../../../support/pages/DiscoverPage'); - var VisualizePage = require('../../../support/pages/VisualizePage'); + var DiscoverPage = require('../../../support/pages/discover_page'); + var VisualizePage = require('../../../support/pages/visualize_page'); var expect = require('intern/dojo/node!expect.js'); return function (bdd, scenarioManager) { diff --git a/test/functional/apps/visualize/index.js b/test/functional/apps/visualize/index.js index c2c014dc6877a..4492d165c3af4 100644 --- a/test/functional/apps/visualize/index.js +++ b/test/functional/apps/visualize/index.js @@ -4,9 +4,9 @@ define(function (require) { var config = require('intern').config; var url = require('intern/dojo/node!url'); var _ = require('intern/dojo/node!lodash'); - var Common = require('../../../support/pages/Common'); - var ScenarioManager = require('intern/dojo/node!../../../fixtures/scenarioManager'); - var HeaderPage = require('../../../support/pages/HeaderPage'); + var Common = require('../../../support/pages/common'); + var ScenarioManager = require('intern/dojo/node!../../../fixtures/scenario_manager'); + var HeaderPage = require('../../../support/pages/header_page'); var SettingsPage = require('../../../support/pages/settings_page'); var chartTypeTest = require('./_chart_types'); diff --git a/test/functional/status_page/index.js b/test/functional/status_page/index.js index 8abad70f7a551..c5bff5ff7c9e7 100644 --- a/test/functional/status_page/index.js +++ b/test/functional/status_page/index.js @@ -2,7 +2,7 @@ define(function (require) { var bdd = require('intern!bdd'); var expect = require('intern/dojo/node!expect.js'); var config = require('intern').config; - var Common = require('../../support/pages/Common'); + var Common = require('../../support/pages/common'); bdd.describe('status page', function () { var common; diff --git a/test/support/pages/Common.js b/test/support/pages/common.js similarity index 99% rename from test/support/pages/Common.js rename to test/support/pages/common.js index a48f06f3ecc51..60212a0c9982e 100644 --- a/test/support/pages/Common.js +++ b/test/support/pages/common.js @@ -1,4 +1,4 @@ -// in test/support/pages/Common.js +// in test/support/pages/common.js define(function (require) { var config = require('intern').config; var Promise = require('bluebird'); diff --git a/test/support/pages/DiscoverPage.js b/test/support/pages/discover_page.js similarity index 98% rename from test/support/pages/DiscoverPage.js rename to test/support/pages/discover_page.js index 84b887b77ea17..2a180cdb4bc90 100644 --- a/test/support/pages/DiscoverPage.js +++ b/test/support/pages/discover_page.js @@ -1,7 +1,7 @@ -// in test/support/pages/DiscoverPage.js +// in test/support/pages/discover_page.js define(function (require) { var config = require('intern').config; - var Common = require('./Common'); + var Common = require('./common'); var defaultTimeout = config.timeouts.default; var common; diff --git a/test/support/pages/HeaderPage.js b/test/support/pages/header_page.js similarity index 99% rename from test/support/pages/HeaderPage.js rename to test/support/pages/header_page.js index 5a78ebb7736e1..50c5bcd570b98 100644 --- a/test/support/pages/HeaderPage.js +++ b/test/support/pages/header_page.js @@ -1,7 +1,7 @@ // in test/support/pages/HeaderPage.js define(function (require) { var config = require('intern').config; - var Common = require('./Common'); + var Common = require('./common'); var common; diff --git a/test/support/pages/settings_page.js b/test/support/pages/settings_page.js index 8e1fa69aa4993..871d7081a9d35 100644 --- a/test/support/pages/settings_page.js +++ b/test/support/pages/settings_page.js @@ -2,7 +2,7 @@ define(function (require) { var config = require('intern').config; var Promise = require('bluebird'); - var Common = require('./Common'); + var Common = require('./common'); var defaultTimeout = config.timeouts.default; var common; diff --git a/test/support/pages/VisualizePage.js b/test/support/pages/visualize_page.js similarity index 99% rename from test/support/pages/VisualizePage.js rename to test/support/pages/visualize_page.js index e72248a9d4493..2ac4fbb2484d6 100644 --- a/test/support/pages/VisualizePage.js +++ b/test/support/pages/visualize_page.js @@ -2,7 +2,7 @@ define(function (require) { var config = require('intern').config; var registerSuite = require('intern!object'); - var Common = require('./Common'); + var Common = require('./common'); var defaultTimeout = config.timeouts.default; var common;