Skip to content

Commit

Permalink
Merge pull request #1954 from spenceralger/auto-spec-list
Browse files Browse the repository at this point in the history
[test infra] auto spec list
  • Loading branch information
w33ble committed Nov 18, 2014
2 parents c62ec6c + f616bfc commit 9ea6b75
Show file tree
Hide file tree
Showing 39 changed files with 41 additions and 497 deletions.
1 change: 0 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"gridster": "~0.5.0",
"inflection": "~1.3.5",
"jquery": "~2.1.0",
"jsonpath": "*",
"leaflet": "0.7.3",
"lesshat": "~3.0.2",
"lodash": "~2.4.1",
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
"request": "^2.40.0",
"requirejs": "~2.1.14",
"rjs-build-analysis": "0.0.3",
"tar": "^1.0.1"
"tar": "^1.0.1",
"glob": "~4.1.3"
},
"scripts": {
"test": "grunt test --use-jruby",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ define(function (require) {
var app = require('modules').get('apps/discover');
var html = require('text!plugins/discover/components/field_chooser/field_chooser.html');
var _ = require('lodash');
var jsonPath = require('jsonpath');
var rison = require('utils/rison');
var qs = require('utils/query_string');
var fieldCalculator = require('plugins/discover/components/field_chooser/lib/field_calculator');
Expand Down
4 changes: 0 additions & 4 deletions src/kibana/require.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ require.config({
gridster: 'bower_components/gridster/dist/jquery.gridster',
inflection: 'bower_components/inflection/lib/inflection',
jquery: 'bower_components/jquery/dist/jquery',
jsonpath: 'bower_components/jsonpath/lib/jsonpath',
leaflet: 'bower_components/leaflet/dist/leaflet',
lodash_src: 'bower_components/lodash/dist/lodash',
moment: 'bower_components/moment/moment',
Expand All @@ -41,9 +40,6 @@ require.config({
deps: ['jquery'],
exports: 'angular'
},
jsonpath: {
exports: 'jsonPath'
},
gridster: ['jquery', 'css!bower_components/gridster/dist/jquery.gridster.css'],
'angular-chosen': ['jquery', 'chosen'],
'angular-route': ['angular'],
Expand Down
93 changes: 7 additions & 86 deletions test/unit/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
baseUrl: '/',
paths: {
config: '/config',
specList: '/specs',
test_utils: '../../test/utils',
fixtures: '../../test/unit/fixtures',
vislib_fixtures: '../../test/unit/specs/vislib/fixture',
Expand Down Expand Up @@ -75,98 +76,18 @@

function runTests() {
require([
'text!specList',
'kibana',
'sinon/sinon',
'angular'
], loadSpecs);
}

function loadSpecs(kibana, sinon) {
require([
'specs/apps/discover/hit_sort_fn',
'specs/apps/discover/directives/table',
'specs/apps/discover/directives/discover_field',
'specs/apps/discover/directives/field_chooser',
'specs/apps/discover/directives/field_calculator',
'specs/apps/discover/segmented_fetch',
'specs/directives/confirm-click',
'specs/directives/css_truncate',
'specs/directives/timepicker',
'specs/directives/truncate',
'specs/directives/typeahead',
'specs/directives/spinner',
'specs/directives/validate_query',
'specs/directives/validate_json',
'specs/filters/field_type',
'specs/filters/uriescape',
'specs/filters/moment',
'specs/filters/rison',
'specs/filters/short_dots',
'specs/filters/start_from',
'specs/services/debounce',
'specs/services/storage',
'specs/services/persisted_log',
'specs/services/url',
'specs/utils/datemath',
'specs/utils/interval',
'specs/utils/versionmath',
'specs/utils/routes/index',
'specs/utils/sequencer',
'specs/utils/html_escape',
'specs/courier/search_source/_get_normalized_sort',
'specs/factories/base_object',
'specs/state_management/state',
'specs/state_management/global_state',
'specs/state_management/app_state',
'specs/utils/diff_object',
'specs/factories/events',
'specs/vislib/components/color',
'specs/vislib/components/zero_injection',
'specs/vislib/components/labels',
'specs/vislib/components/tooltip/index',
'specs/vislib/lib/x_axis',
'specs/vislib/lib/y_axis',
'specs/vislib/lib/axis_title',
'specs/vislib/lib/chart_title',
'specs/vislib/lib/layout_types',
'specs/vislib/lib/splits',
'specs/vislib/lib/layout',
'specs/vislib/lib/handler',
'specs/vislib/lib/_error_handler',
'specs/vislib/lib/data',
'specs/vislib/lib/column_layout',
'specs/vislib/lib/resize_checker',
'specs/vislib/visualizations/_chart',
'specs/vislib/visualizations/vis_types',
'specs/vislib/index',
'specs/vislib/vis',
'specs/utils/diff_time_picker_vals',
'specs/factories/events',
'specs/index_patterns/_flatten_search_response',
'specs/utils/indexed_array/index',
'specs/directives/filter_bar',
'specs/components/agg_types/index',
'specs/components/agg_types/param_types/index',
'specs/components/index_pattern/_pattern_to_wildcard',
'specs/components/vis/index',
'specs/components/reflow_watcher',
'specs/registry/index',
'specs/components/clipboard',
'specs/components/agg_response/hierarchical/_build_hierarchical_data',
'specs/components/agg_response/hierarchical/_extract_buckets',
'specs/components/agg_response/hierarchical/_transform_aggregation',
'specs/components/agg_response/hierarchical/_create_raw_data',
'specs/components/agg_response/hierarchical/_array_to_linked_list',
'specs/components/agg_response/hierarchical/_collect_branch',
'specs/components/agg_response/tabify/tabify',
'specs/components/agg_table/index',
'specs/plugins/vis_types/index',
'specs/utils/slugify_id',
'specs/plugins/table_vis/index',
'specs/plugins/metric_vis/metric_vis_controller'
], function () {
bootstrap(kibana, sinon);
});
function loadSpecs(specListJson) {
var deps = JSON.parse(specListJson);
deps.unshift('sinon/sinon');
deps.unshift('kibana');
require(deps, bootstrap);
}

function bootstrap(kibana, sinon) {
Expand Down
144 changes: 0 additions & 144 deletions test/unit/specs/apps/dashboard/directives/grid.js

This file was deleted.

56 changes: 0 additions & 56 deletions test/unit/specs/apps/dashboard/directives/panel.js

This file was deleted.

Loading

0 comments on commit 9ea6b75

Please sign in to comment.