moved tests next to related source files

.jshintrc

@@ -1,6 +1,20 @@
 {
   // for files at project root
   "node": true,
+  "browser": true,
+  "mocha": true,
+
+  "predef": {
+    "inject": true,
+    "module": true,
+    "define": true,
+    "console": false,
+    "-event": true,
+    "-name": true,
+    "-Promise": true,
+    "-Worker": true,
+    "-status": true
+  },
 
   // shared with .jshintrc files for browser and node
   "unused": false,

.jshintrc.browser

@@ -1,16 +0,0 @@
-{
-  "extends": "./.jshintrc",
-  "node": false,
-  "browser": true,
-  "esnext": false,
-
-  "predef": {
-    // require.js
-    "define": true,
-    "require": true,
-    "console": false,
-    "-event": true,
-    "-name": true,
-    "module": true
-  }
-}

.jshintrc.node

@@ -1,10 +0,0 @@
-{
-  "extends": "./.jshintrc",
-  "node": true,
-  "esnext": true,
-
-  "globals": {
-    "Promise": true,
-    "status": true
-  }
-}

src/cli/.jshintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "../../.jshintrc.node"
-}

src/plugins/.jshintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "../../.jshintrc.node"
-}

src/plugins/appSwitcher/public/.jshintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "../../../../.jshintrc.browser"
-}

src/plugins/devMode/public/.jshintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "../../../../.jshintrc.browser"
-}

src/plugins/kbn_vislib_vis_types/public/.jshintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "../../../../.jshintrc.browser"
-}

src/plugins/kibana/public/.jshintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "../../../../.jshintrc.browser"
-}

src/plugins/kibana/public/discover/__tests__/directives/discover_field.js

@@ -3,6 +3,7 @@ define(function (require) {
   var $ = require('jquery');
   var _ = require('lodash');
   var sinon = require('test_utils/auto_release_sinon');
+  var expect = require('expect.js');
 
   // Load the kibana app dependencies.
   require('ui/private');
@@ -79,4 +80,4 @@ define(function (require) {
       });
     });
   });
-});
+});

src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js

@@ -1,6 +1,7 @@
 define(function (require) {
   var _ = require('lodash');
   var fieldCalculator = require('plugins/discover/components/field_chooser/lib/field_calculator');
+  var expect = require('expect.js');
 
   // Load the kibana app dependencies.
   require('ui/private');

src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js

@@ -3,6 +3,7 @@ define(function (require) {
   var $ = require('jquery');
   var _ = require('lodash');
   var sinon = require('test_utils/auto_release_sinon');
+  var expect = require('expect.js');
 
   // Load the kibana app dependencies.
   require('ui/private');

src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js

@@ -1,5 +1,6 @@
 define(function (require) {
   var _ = require('lodash');
+  var expect = require('expect.js');
 
   require('angular').module('hitSortFunctionTests', ['kibana']);
 
@@ -72,4 +73,4 @@ define(function (require) {
       ]);
     });
   });
-});
+});

src/plugins/kibana/public/doc/__tests__/doc.js

@@ -2,7 +2,7 @@ define(function (require) {
 
   // Load the kibana app dependencies.
   require('angular-route');
-
+  var expect = require('expect.js');
   require('plugins/doc/index');
 
   var $scope, createController, timefilter;

src/plugins/kibana/public/settings/__tests__/get_val_type.js

@@ -1,5 +1,7 @@
 define(function (require) {
   var getValType = require('plugins/settings/sections/advanced/lib/get_val_type');
+  var expect = require('expect.js');
+
   describe('Settings', function () {
     describe('Advanced', function () {
       describe('getValType(def, val)', function () {

src/plugins/kibana/public/visualize/editor/__tests__/agg.js

@@ -2,6 +2,7 @@ define(function (require) {
   var angular = require('angular');
   var $ = require('jquery');
   var _ = require('lodash');
+  var expect = require('expect.js');
 
 
   require('plugins/visualize/editor/agg');

src/plugins/markdown_vis/public/.jshintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "../../../../.jshintrc.browser"
-}

src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js

@@ -1,6 +1,7 @@
 define(function (require) {
   describe('markdown vis controller', function () {
     var $scope, $el;
+    var expect = require('expect.js');
 
     beforeEach(module('kibana/markdown_vis'));
     beforeEach(inject(function ($rootScope, $controller) {
@@ -22,4 +23,4 @@ define(function (require) {
       expect($scope.html.toString().indexOf('<a href')).to.be.greaterThan(-1);
     });
   });
-});
+});

src/plugins/metric_vis/public/.jshintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "../../../../.jshintrc.browser"
-}

src/plugins/metric_vis/public/__tests__/metric_vis_controller.js

@@ -1,6 +1,7 @@
 define(function (require) {
   describe('metric vis', function () {
     var $scope;
+    var expect = require('expect.js');
 
     var formatter = function (value) {
       return value.toFixed(3);
@@ -58,4 +59,4 @@ define(function (require) {
       expect($scope.metrics[1].value).to.be('445842.463');
     });
   });
-});
+});

src/plugins/spyModes/public/.jshintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "../../../../.jshintrc.browser"
-}

src/plugins/statusPage/public/.jshintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "../../../../.jshintrc.browser"
-}

src/plugins/table_vis/public/.jshintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "../../../../.jshintrc.browser"
-}

src/plugins/table_vis/public/__tests__/_table_vis.js

@@ -2,6 +2,7 @@ define(function (require) {
   return ['Integration', function () {
     var $ = require('jquery');
     var _ = require('lodash');
+    var expect = require('expect.js');
     var sinon = require('test_utils/auto_release_sinon');
 
     var $rootScope;
@@ -130,4 +131,4 @@ define(function (require) {
       expect($err.text().trim()).to.be('No results found');
     });
   }];
-});
+});

src/plugins/table_vis/public/__tests__/_table_vis_controller.js

@@ -2,6 +2,7 @@ define(function (require) {
   return ['Controller', function () {
     var $ = require('jquery');
     var _ = require('lodash');
+    var expect = require('expect.js');
     var sinon = require('test_utils/auto_release_sinon');
 
     var $rootScope;
@@ -167,4 +168,4 @@ define(function (require) {
       expect(spiedTabify.firstCall.args[2]).to.have.property('partialRows', false);
     });
   }];
-});
+});

src/server/.jshintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "../../.jshintrc.node"
-}

src/server/plugins/load.js

@@ -2,6 +2,7 @@ module.exports = function (kbnServer, server, config) {
   var _ = require('lodash');
   var resolve = require('bluebird').resolve;
   var inspect = require('util').inspect;
+  var Promise = require('bluebird');
 
   var Plugins = require('./Plugins');
   var plugins = kbnServer.plugins = new Plugins(kbnServer);

src/ui/.jshintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "../../.jshintrc.browser"
-}

src/ui/agg_response/geo_json/__tests__/geo_json.js

@@ -1,5 +1,6 @@
 define(function (require) {
   var _ = require('lodash');
+  var expect = require('expect.js');
 
   describe('GeoJson Agg Response Converter', function () {
     var vis;

src/ui/agg_response/hierarchical/__tests__/array_to_linked_list.js

@@ -1,5 +1,6 @@
 define(function (require) {
   var arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list');
+  var expect = require('expect.js');
   describe('buildHierarchicalData()', function () {
     describe('arrayToLinkedList', function () {
 

src/ui/agg_response/hierarchical/__tests__/build_hierarchical_data.js

@@ -2,6 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   var fixtures = require('fixtures/fake_hierarchical_data');
   var sinon = require('test_utils/auto_release_sinon');
+  var expect = require('expect.js');
 
   var Vis;
   var Notifier;

src/ui/agg_response/hierarchical/__tests__/collect_branch.js

@@ -1,6 +1,7 @@
 define(function (require) {
   var _ = require('lodash');
   var collectBranch = require('ui/agg_response/hierarchical/_collect_branch');
+  var expect = require('expect.js');
   describe('collectBranch()', function () {
     var results;
     var convert = function (name) {

src/ui/agg_response/hierarchical/__tests__/create_raw_data.js

@@ -3,6 +3,7 @@ define(function (require) {
   var fixtures = require('fixtures/fake_hierarchical_data');
   var createRawData = require('ui/agg_response/hierarchical/_create_raw_data');
   var arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list');
+  var expect = require('expect.js');
 
   var AggConfigs;
   var Vis;

src/ui/agg_response/hierarchical/__tests__/extract_buckets.js

@@ -1,5 +1,6 @@
 define(function (require) {
   var extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets');
+  var expect = require('expect.js');
 
   describe('buildHierarchicalData()', function () {
     describe('extractBuckets()', function () {

src/ui/agg_response/hierarchical/__tests__/transform_aggregation.js

@@ -2,6 +2,7 @@ define(function (require) {
   describe('buildHierarchicalData()', function () {
     describe('transformAggregation()', function () {
       var _ = require('lodash');
+      var expect = require('expect.js');
       var transform;
       var fixture;
 

src/ui/agg_response/point_series/__tests__/_add_to_siri.js

@@ -1,6 +1,6 @@
 define(function (require) {
   return ['addToSiri', function () {
-
+    var expect = require('expect.js');
     var addToSiri;
 
     beforeEach(module('kibana'));
@@ -53,4 +53,4 @@ define(function (require) {
       expect(series[id].values[0]).to.be(point);
     });
   }];
-});
+});

src/ui/agg_response/point_series/__tests__/_fake_x_aspect.js

@@ -6,6 +6,7 @@ define(function (require) {
     var AggType;
     var AggConfig;
     var indexPattern;
+    var expect = require('expect.js');
 
     beforeEach(module('kibana'));
     beforeEach(inject(function (Private) {
@@ -41,4 +42,4 @@ define(function (require) {
         .and.to.have.property('label', aspect.agg.makeLabel());
     });
   }];
-});
+});

src/ui/agg_response/point_series/__tests__/_get_aspects.js

@@ -2,6 +2,7 @@ define(function (require) {
   return ['getAspects', function () {
     var _ = require('lodash');
     var moment = require('moment');
+    var expect = require('expect.js');
 
     var Vis;
     var Table;
@@ -148,4 +149,4 @@ define(function (require) {
 
     });
   }];
-});
+});

src/ui/agg_response/point_series/__tests__/_get_point.js

@@ -1,6 +1,9 @@
+
 define(function (require) {
   return ['getPoint', function () {
     var _ = require('lodash');
+    var expect = require('expect.js');
+
     var getPoint;
 
     var truthFormatted = { fieldFormatter: _.constant(_.constant(true)) };

src/ui/agg_response/point_series/__tests__/_get_series.js

@@ -1,6 +1,7 @@
 define(function (require) {
   return ['getSeries', function () {
     var _ = require('lodash');
+    var expect = require('expect.js');
     var getSeries;
 
     var agg = { fieldFormatter: _.constant(_.identity) };

src/ui/agg_response/point_series/__tests__/_init_x_axis.js

@@ -1,6 +1,7 @@
 define(function (require) {
   return ['initXAxis', function () {
     var _ = require('lodash');
+    var expect = require('expect.js');
 
     var initXAxis;
 
@@ -63,4 +64,4 @@ define(function (require) {
         .and.have.property('interval', 10);
     });
   }];
-});
+});

src/ui/agg_response/point_series/__tests__/_init_y_axis.js

@@ -1,6 +1,7 @@
 define(function (require) {
   return ['initYAxis', function () {
     var _ = require('lodash');
+    var expect = require('expect.js');
 
     var initYAxis;
 
@@ -65,4 +66,4 @@ define(function (require) {
       });
     });
   }];
-});
+});

src/ui/agg_response/point_series/__tests__/_main.js

@@ -5,6 +5,7 @@ define(function (require) {
     var _ = require('lodash');
     var moment = require('moment');
     var AggConfigResult = require('ui/vis/AggConfigResult');
+    var expect = require('expect.js');
 
     var pointSeriesChartDataFromTable;
     var indexPattern;

src/ui/agg_response/point_series/__tests__/_ordered_date_axis.js

@@ -3,6 +3,7 @@ define(function (require) {
     var moment = require('moment');
     var _ = require('lodash');
     var sinon = require('test_utils/auto_release_sinon');
+    var expect = require('expect.js');
 
     var baseArgs = {
       vis: {
@@ -87,4 +88,4 @@ define(function (require) {
       });
     });
   }];
-});
+});

src/ui/agg_response/point_series/__tests__/_tooltip_formatter.js

@@ -2,6 +2,7 @@ define(function (require) {
   return ['tooltipFormatter', function () {
     var _ = require('lodash');
     var $ = require('jquery');
+    var expect = require('expect.js');
 
     var tooltipFormatter;
 

src/ui/agg_response/tabify/__tests__/_buckets.js

@@ -1,6 +1,7 @@
 define(function (require) {
   return ['Buckets wrapper', function () {
     var Buckets;
+    var expect = require('expect.js');
 
     beforeEach(module('kibana'));
     beforeEach(inject(function (Private, $injector) {
@@ -56,4 +57,4 @@ define(function (require) {
       test(aggResp, count, keys);
     });
   }];
-});
+});

src/ui/agg_response/tabify/__tests__/_get_columns.js

@@ -3,6 +3,7 @@ define(function (require) {
     var getColumns;
     var Vis;
     var indexPattern;
+    var expect = require('expect.js');
 
     beforeEach(module('kibana'));
     beforeEach(inject(function (Private, $injector) {
@@ -121,4 +122,4 @@ define(function (require) {
       }
     });
   }];
-});
+});

src/ui/agg_response/tabify/__tests__/_integration.js

@@ -2,6 +2,7 @@ define(function (require) {
   return ['tabifyAggResponse Integration', function () {
     var _ = require('lodash');
     var fixtures = require('fixtures/fake_hierarchical_data');
+    var expect = require('expect.js');
 
     var Vis;
     var Buckets;
@@ -261,4 +262,4 @@ define(function (require) {
       });
     });
   }];
-});
+});

src/ui/agg_response/tabify/__tests__/_response_writer.js

@@ -2,6 +2,7 @@ define(function (require) {
   return ['ResponseWriter class', function () {
     var _ = require('lodash');
     var sinon = require('test_utils/auto_release_sinon');
+    var expect = require('expect.js');
 
     var Vis;
     var Table;

src/ui/agg_response/tabify/__tests__/_table.js

@@ -1,6 +1,7 @@
 define(function (require) {
   return ['Table class', function () {
     var _ = require('lodash');
+    var expect = require('expect.js');
 
     var Table;
 
@@ -79,4 +80,4 @@ define(function (require) {
       });
     });
   }];
-});
+});

src/ui/agg_response/tabify/__tests__/_table_group.js

@@ -1,6 +1,7 @@
 define(function (require) {
   return ['Table Group class', function () {
     var TableGroup;
+    var expect = require('expect.js');
 
     beforeEach(module('kibana'));
     beforeEach(inject(function (Private, $injector) {
@@ -15,4 +16,4 @@ define(function (require) {
       expect(tableGroup.title).to.be(null);
     });
   }];
-});
+});

src/ui/agg_table/__tests__/_group.js

@@ -2,6 +2,7 @@ define(function (require) {
   return ['AggTableGroup Directive', function () {
     var _ = require('lodash');
     var $ = require('jquery');
+    var expect = require('expect.js');
     var fixtures = require('fixtures/fake_hierarchical_data');
 
     var $rootScope;
@@ -85,4 +86,4 @@ define(function (require) {
       });
     });
   }];
-});
+});

src/ui/agg_table/__tests__/_table.js

@@ -2,6 +2,7 @@ define(function (require) {
   return ['AggTable Directive', function () {
     var _ = require('lodash');
     var $ = require('jquery');
+    var expect = require('expect.js');
     var fixtures = require('fixtures/fake_hierarchical_data');
     var sinon = require('test_utils/auto_release_sinon');
 
@@ -181,4 +182,4 @@ define(function (require) {
       });
     });
   }];
-});
+});

src/ui/agg_types/__tests__/_agg_params.js

@@ -1,6 +1,7 @@
 define(function (require) {
   return ['AggParams class', function () {
     var _ = require('lodash');
+    var expect = require('expect.js');
 
     var AggParams;
     var BaseAggParam;
@@ -99,4 +100,4 @@ define(function (require) {
       });
     });
   }];
-});
+});

src/ui/agg_types/__tests__/_agg_type.js

@@ -1,6 +1,7 @@
 define(function (require) {
   return ['AggType Class', function () {
     var _ = require('lodash');
+    var expect = require('expect.js');
     var sinon = require('test_utils/auto_release_sinon');
     var AggType;
     var AggParams;
@@ -171,4 +172,4 @@ define(function (require) {
     });
 
   }];
-});
+});

src/ui/agg_types/__tests__/_bucket_count_between.js

@@ -1,6 +1,7 @@
 define(function (require) {
   return ['bucketCountBetween util', function () {
     var _ = require('lodash');
+    var expect = require('expect.js');
     var indexPattern;
     var Vis;
     var visTypes;
@@ -202,4 +203,4 @@ define(function (require) {
     it('can count with elements after', countTest(false, true));
     it('can count with elements before and after', countTest(true, true));
   }];
-});
+});

src/ui/agg_types/__tests__/buckets/_histogram.js

@@ -1,6 +1,7 @@
 define(function (require) {
   return ['Histogram Agg', function () {
     var _ = require('lodash');
+    var expect = require('expect.js');
 
     describe('ordered', function () {
       var histogram;
@@ -110,4 +111,4 @@ define(function (require) {
       });
     });
   }];
-});
+});

src/ui/agg_types/__tests__/buckets/create_filter/date_histogram.js

@@ -5,6 +5,7 @@ define(function (require) {
       var moment = require('moment');
       var sinon = require('test_utils/auto_release_sinon');
       var aggResp = require('fixtures/agg_resp/date_histogram');
+      var expect = require('expect.js');
 
       var vis;
       var agg;

src/ui/agg_types/__tests__/buckets/create_filter/date_range.js

@@ -1,5 +1,6 @@
 define(function (require) {
   var moment = require('moment');
+  var expect = require('expect.js');
   describe('AggConfig Filters', function () {
     describe('Date range', function () {
       var AggConfig;

src/ui/agg_types/__tests__/buckets/create_filter/filters.js

@@ -1,5 +1,6 @@
 define(function (require) {
   var _ = require('lodash');
+  var expect = require('expect.js');
   describe('AggConfig Filters', function () {
     describe('filters', function () {
       var AggConfig;

src/ui/agg_types/__tests__/buckets/create_filter/histogram.js

@@ -1,5 +1,6 @@
 define(function (require) {
   var _ = require('lodash');
+  var expect = require('expect.js');
 
   describe('AggConfig Filters', function () {
     describe('histogram', function () {

src/ui/agg_types/__tests__/buckets/create_filter/ip_range.js

@@ -1,5 +1,6 @@
 define(function (require) {
   describe('AggConfig Filters', function () {
+    var expect = require('expect.js');
     describe('IP range', function () {
       var AggConfig;
       var indexPattern;

src/ui/agg_types/__tests__/buckets/create_filter/range.js

@@ -1,5 +1,6 @@
 define(function (require) {
   describe('AggConfig Filters', function () {
+    var expect = require('expect.js');
     describe('range', function () {
       var AggConfig;
       var indexPattern;