Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

snake_case all filenames #6326

Merged
merged 20 commits into from
Mar 15, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2422a98
[rename] rename all files to snake_case
spalger Feb 24, 2016
d3c8003
Merge branch 'master' of github.com:elastic/kibana into renameAllFiles
spalger Feb 24, 2016
ba19a81
testUtils -> test_utils
spalger Feb 24, 2016
506c993
[npm] remove requirefrom package
spalger Feb 24, 2016
07b32d7
Merge branch 'chore/removeRequireFrom' into renameAllFiles
spalger Feb 24, 2016
c1c8607
[rename] process previously dynamic imports
spalger Feb 24, 2016
af9ebba
[rename] hunt down remaining non-snake path refs
spalger Feb 24, 2016
3e75120
Merge branch 'master' of github.com:elastic/kibana into renameAllFiles
spalger Feb 26, 2016
36cdae8
[plugins] change plugin ids to be snakecase
spalger Feb 26, 2016
00bf02a
Merge branch 'master' of github.com:elastic/kibana into renameAllFiles
spalger Mar 7, 2016
07e2093
[grunt/config] rename config for snake_cased tasks
spalger Mar 7, 2016
4fe8bba
[scenarioManager] snake_case baseDirs for scenarios
spalger Mar 7, 2016
8358ca4
[test] ngMock -> ng_mock
spalger Mar 7, 2016
0574f59
[grunt] require opt-into different task name
spalger Mar 10, 2016
7a1e055
Merge branch 'master' of github.com:elastic/kibana into renameAllFiles
spalger Mar 10, 2016
8d497f6
[es6ify] gruntfile
spalger Mar 10, 2016
ea7b9f6
Merge branch 'master' of github.com:elastic/kibana into renameAllFiles
spalger Mar 11, 2016
f724032
Merge branch 'master' of github.com:elastic/kibana into renameAllFiles
spalger Mar 11, 2016
caf7331
[filenames] allow rule-breaking in docs, tasks/config, and webpackShims
spalger Mar 11, 2016
d77de4e
Merge branch 'master' of github.com:elastic/kibana into renameAllFiles
spalger Mar 15, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[rename] hunt down remaining non-snake path refs
  • Loading branch information
spalger committed Feb 24, 2016
commit af9ebba958c0726f3120af9bb336417d98de5f21
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require('babel/register')(require('./src/optimize/babelOptions').node);
require('babel/register')(require('./src/optimize/babel_options').node);

module.exports = function (grunt) {
// set the config once before calling load-grunt-config
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/dev_mode/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = (kibana) => {
return new kibana.Plugin({
uiExports: {
spyModes: [
'plugins/devMode/visDebugSpyPanel'
'plugins/dev_mode/vis_debug_spy_panel'
]
}
});
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import pkg from '../../../../utils/package_json';
let version = pkg.version;

describe('plugins/elasticsearch', function () {
describe('lib/isUpgradeable', function () {
describe('lib/is_upgradeable', function () {
let server = {
config: _.constant({
get: function (key) {
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/elasticsearch/lib/__tests__/routes.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import expect from 'expect.js';
import util from 'util';
import kbnTestServer from '../../../../../test/utils/kbn_server';
import * as kbnTestServer from '../../../../../test/utils/kbn_server';

const format = util.format;

Expand Down
4 changes: 2 additions & 2 deletions src/plugins/spy_modes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ module.exports = function (kibana) {
return new kibana.Plugin({
uiExports: {
spyModes: [
'plugins/spyModes/tableSpyMode',
'plugins/spyModes/reqRespStatsSpyMode'
'plugins/spy_modes/table_spy_mode',
'plugins/spy_modes/req_resp_stats_spy_mode'
]
}
});
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/status_page/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = function (kibana) {
uiExports: {
app: {
title: 'Server Status',
main: 'plugins/statusPage/statusPage',
main: 'plugins/status_page/status_page',
hidden: true,
url: '/status'
}
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/tests_bundle/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export default (kibana) => {
},

modules: {
ngMock$: fromRoot('src/plugins/devMode/public/ngMock'),
ngMock$: fromRoot('src/plugins/dev_mode/public/ngMock'),
fixtures: fromRoot('src/fixtures'),
test_utils: fromRoot('src/test_utils'),
'angular-mocks': {
Expand Down
2 changes: 1 addition & 1 deletion src/server/__tests__/base_path.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { resolve } from 'path';
import { fromNode as fn } from 'bluebird';
import expect from 'expect.js';

import kbnTestServer from '../../../test/utils/kbn_server';
import * as kbnTestServer from '../../../test/utils/kbn_server';
const basePath = '/kibana';

describe('Server basePath config', function () {
Expand Down
2 changes: 1 addition & 1 deletion src/server/http/__tests__/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import expect from 'expect.js';
import kbnTestServer from '../../../../test/utils/kbn_server';
import * as kbnTestServer from '../../../../test/utils/kbn_server';

describe('cookie validation', function () {
let kbnServer;
Expand Down
2 changes: 1 addition & 1 deletion src/server/http/__tests__/xsrf.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import expect from 'expect.js';
import { fromNode as fn } from 'bluebird';
import { resolve } from 'path';
import kbnTestServer from '../../../../test/utils/kbn_server';
import * as kbnTestServer from '../../../../test/utils/kbn_server';

const nonDestructiveMethods = ['GET'];
const destructiveMethods = ['POST', 'PUT', 'DELETE'];
Expand Down
2 changes: 1 addition & 1 deletion src/server/http/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ module.exports = async function (kbnServer, server, config) {
path: '/',
method: 'GET',
handler: function (req, reply) {
return reply.view('rootRedirect', {
return reply.view('root_redirect', {
hashRoute: `${config.get('server.basePath')}/app/kibana`,
defaultRoute: getDefaultRoute(kbnServer),
});
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/directives/validate_ip.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import _ from 'lodash';
import Ipv4Address from 'ui/utils/ipv4Address';
import Ipv4Address from 'ui/utils/ipv4_address';
import uiModules from 'ui/modules';

uiModules
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/routes/__tests__/_route_manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var chainableMethods = [
];

var $rp;
describe('routes/RouteManager', function () {
describe('routes/route_manager', function () {
beforeEach(ngMock.module('kibana', function ($routeProvider) {
$rp = $routeProvider;
sinon.stub($rp, 'otherwise');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ipv4Address from 'ui/utils/ipv4Address';
import Ipv4Address from 'ui/utils/ipv4_address';
import expect from 'expect.js';

describe('Ipv4Address', function () {
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/utils/cidr_mask.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ipv4Address from 'ui/utils/ipv4Address';
import Ipv4Address from 'ui/utils/ipv4_address';
var NUM_BITS = 32;

function throwError(mask) {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/ui/ui_bundler_env.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ module.exports = class UiBundlerEnv {
// webpack aliases, like require paths, mapping a prefix to a directory
this.aliases = {
ui: fromRoot('src/ui/public'),
testHarness: fromRoot('src/testHarness/public')
test_harness: fromRoot('src/test_harness/public')
};

// map of which plugins created which aliases
Expand Down
4 changes: 2 additions & 2 deletions tasks/build/babel_options.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = function (grunt) {

var srcFile = 'build/kibana/src/optimize/babelOptions.js';
var buildFile = 'build/kibana/src/optimize/babelOptions.build.js';
var srcFile = 'build/kibana/src/optimize/babel_options.js';
var buildFile = 'build/kibana/src/optimize/babel_options.build.js';
var rename = require('fs').renameSync;
var unlink = require('fs').unlinkSync;

Expand Down
2 changes: 1 addition & 1 deletion tasks/config/intern.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = function (grunt) {
api: {
options: {
runType: 'client',
config: 'test/apiIntern'
config: 'test/api_intern'
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion tasks/config/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = function (grunt) {
let {resolve} = require('path');
let root = p => resolve(__dirname, '../../', p);
let binScript = /^win/.test(platform) ? '.\\bin\\kibana.bat' : './bin/kibana';
let uiConfig = require(root('test/serverConfig'));
let uiConfig = require(root('test/server_config'));

const stdDevArgs = [
'--env.name=development',
Expand Down
12 changes: 6 additions & 6 deletions test/fixtures/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,35 @@ module.exports = {
baseDir: path.join(rootDir, 'makelogs'),
bulk: [{
indexName: 'logstash-2015.09.17',
indexDefinition: 'makelogsIndexDefinition.js',
indexDefinition: 'makelogs_index_definition.js',
source: 'logstash-2015.09.17.js'
}, {
indexName: 'logstash-2015.09.18',
indexDefinition: 'makelogsIndexDefinition.js',
indexDefinition: 'makelogs_index_definition.js',
source: 'logstash-2015.09.18.js'
}]
},
emptyKibana: {
baseDir: path.join(rootDir, 'emptyKibana'),
bulk: [{
indexName: '.kibana',
indexDefinition: 'kibanaDefinition.js',
indexDefinition: 'kibana_definition.js',
source: 'kibana.js',
haltOnFailure: false
}]
},
logstashFunctional: {
baseDir: path.join(rootDir, 'logstashFunctional'),
bulk: [{
indexDefinition: 'makelogsIndexDefinition.js',
indexDefinition: 'makelogs_index_definition.js',
indexName: 'logstash-2015.09.20',
source: 'logstash-2015.09.20.js'
}, {
indexDefinition: 'makelogsIndexDefinition.js',
indexDefinition: 'makelogs_index_definition.js',
indexName: 'logstash-2015.09.21',
source: 'logstash-2015.09.21.js'
}, {
indexDefinition: 'makelogsIndexDefinition.js',
indexDefinition: 'makelogs_index_definition.js',
indexName: 'logstash-2015.09.22',
source: 'logstash-2015.09.22.js'
}]
Expand Down
2 changes: 1 addition & 1 deletion test/intern.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
define(function (require) {
var serverConfig = require('intern/dojo/node!./serverConfig');
var serverConfig = require('intern/dojo/node!./server_config');
var _ = require('intern/dojo/node!lodash');

return _.assign({
Expand Down
2 changes: 1 addition & 1 deletion test/support/pages/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ define(function (require) {
var Promise = require('bluebird');
var moment = require('moment');
var testSubjSelector = require('intern/dojo/node!@spalger/test-subj-selector');
var getUrl = require('intern/dojo/node!../../utils/getUrl');
var getUrl = require('intern/dojo/node!../../utils/get_url');
var fs = require('intern/dojo/node!fs');
var _ = require('intern/dojo/node!lodash');
var parse = require('intern/dojo/node!url').parse;
Expand Down
2 changes: 1 addition & 1 deletion test/unit/api/ingest/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
define(function (require) {
var bdd = require('intern!bdd');
var serverConfig = require('intern/dojo/node!../../../serverConfig');
var serverConfig = require('intern/dojo/node!../../../server_config');
var ScenarioManager = require('intern/dojo/node!../../../fixtures/scenario_manager');
var request = require('intern/dojo/node!supertest-as-promised');
var url = require('intern/dojo/node!url');
Expand Down
2 changes: 1 addition & 1 deletion webpackShims/jquery.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
var $ = window.jQuery = window.$ = module.exports = require('node_modules/jquery/dist/jquery');
require('ui/jquery/findTestSubject')($);
require('ui/jquery/find_test_subject')($);