Skip to content

Commit

Permalink
Merge pull request #6042 from LeeDr/snake_case_v4.x
Browse files Browse the repository at this point in the history 
Snake case v4.x backport #6038
  • Loading branch information
LeeDr committed Jan 29, 2016
2 parents 39a7330 + 87be63f commit a03f67a
Show file tree
Hide file tree
Showing 29 changed files with 61 additions and 61 deletions.
2 changes: 1 addition & 1 deletion test/fixtures/__tests__/scenarioManager.js → test/fixtures/__tests__/scenario_manager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
0 test/fixtures/scenarioManager.js → test/fixtures/scenario_manager.js
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions test/functional/apps/discover/_collapse_expand.js
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions test/functional/apps/discover/_discover.js
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions test/functional/apps/discover/_field_data.js
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions test/functional/apps/discover/_shared_links.js
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/discover/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/settings/_advanced_settings.js
View file
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/settings/_creation_form_changes.js
View file
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/settings/_index_pattern_create_delete.js
View file
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/settings/_index_pattern_popularity.js
View file
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/settings/_index_pattern_results_sort.js
View file
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/settings/_initial_state.js
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/settings/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
8 changes: 4 additions & 4 deletions test/functional/apps/visualize/_area_chart.js
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions test/functional/apps/visualize/_chart_types.js
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions test/functional/apps/visualize/_data_table.js
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions test/functional/apps/visualize/_line_chart.js
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions test/functional/apps/visualize/_metric_chart.js
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions test/functional/apps/visualize/_pie_chart.js
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions test/functional/apps/visualize/_tile_map.js
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions test/functional/apps/visualize/_vertical_bar_chart.js
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions test/functional/apps/visualize/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion test/functional/status_page/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion test/support/pages/Common.js → test/support/pages/common.js
View file
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
4 changes: 2 additions & 2 deletions test/support/pages/DiscoverPage.js → test/support/pages/discover_page.js
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion test/support/pages/HeaderPage.js → test/support/pages/header_page.js
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion test/support/pages/settings_page.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion test/support/pages/VisualizePage.js → test/support/pages/visualize_page.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit a03f67a

Please sign in to comment.