tech(systemjs): almost all tests are passing

public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts

@@ -1,10 +1,8 @@
-///<amd-dependency path="app/plugins/datasource/cloudwatch/datasource" />
-///<amd-dependency path="test/specs/helpers" name="helpers" />
 
+import "../datasource";
 import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';
-import moment = require('moment');
-
-declare var helpers: any;
+import moment from 'moment';
+import helpers from 'test/specs/helpers';
 
 describe('CloudWatchDatasource', function() {
   var ctx = new helpers.ServiceTestContext();

public/app/plugins/datasource/elasticsearch/elastic_response.d.ts

@@ -0,0 +1,2 @@
+declare var test: any;
+export default test;

public/app/plugins/datasource/elasticsearch/index_pattern.d.ts

@@ -0,0 +1,2 @@
+declare var test: any;
+export default test;

public/app/plugins/datasource/elasticsearch/query_builder.d.ts

@@ -0,0 +1,2 @@
+declare var test: any;
+export default test;

public/app/plugins/datasource/elasticsearch/query_def.d.ts

@@ -0,0 +1,2 @@
+declare var test: any;
+export default test;

public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts

@@ -1,11 +1,9 @@
-///<amd-dependency path="../datasource" />
-///<amd-dependency path="test/specs/helpers" name="helpers" />
 
+import "../datasource";
 import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';
-import moment  = require('moment');
-import angular = require('angular');
-
-declare var helpers: any;
+import moment from 'moment';
+import angular from 'angular';
+import helpers from 'test/specs/helpers';
 
 describe('ElasticDatasource', function() {
   var ctx = new helpers.ServiceTestContext();

public/app/plugins/datasource/elasticsearch/specs/elastic_response_specs.ts

@@ -1,8 +1,6 @@
-///<amd-dependency path="../elastic_response" name="ElasticResponse"/>
 
 import {describe, beforeEach, it, sinon, expect} from 'test/lib/common';
-
-declare var ElasticResponse: any;
+import ElasticResponse from '../elastic_response';
 
 describe('ElasticResponse', function() {
   var targets;

public/app/plugins/datasource/elasticsearch/specs/index_pattern_specs.ts

@@ -1,10 +1,8 @@
-///<amd-dependency path="../index_pattern" name="IndexPattern"/>
 ///<amd-dependency path="test/specs/helpers" name="helpers" />
 
 import {describe, beforeEach, it, sinon, expect} from 'test/lib/common';
-import moment  = require('moment');
-
-declare var IndexPattern: any;
+import moment from 'moment';
+import IndexPattern from '../index_pattern';
 
 describe('IndexPattern', function() {
 

public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts

@@ -1,8 +1,6 @@
-///<amd-dependency path="../query_builder" name="ElasticQueryBuilder"/>
 
 import {describe, beforeEach, it, sinon, expect} from 'test/lib/common';
-
-declare var ElasticQueryBuilder: any;
+import ElasticQueryBuilder from '../query_builder';
 
 describe('ElasticQueryBuilder', function() {
   var builder;

public/app/plugins/datasource/elasticsearch/specs/query_ctrl_specs.ts

@@ -3,8 +3,7 @@
 ///<amd-dependency path="test/specs/helpers" name="helpers" />
 
 import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';
-
-declare var helpers: any;
+import helpers from 'test/specs/helpers';
 
 describe('ElasticQueryCtrl', function() {
   var ctx = new helpers.ControllerTestContext();

public/app/plugins/datasource/elasticsearch/specs/query_def_specs.ts

@@ -1,16 +1,13 @@
-///<amd-dependency path="../query_def" name="QueryDef" />
-///<amd-dependency path="test/specs/helpers" name="helpers" />
 
 import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';
 
-declare var helpers: any;
-declare var QueryDef: any;
+import * as queryDef from '../query_def';
 
 describe('ElasticQueryDef', function() {
 
   describe('getPipelineAggOptions', function() {
     describe('with zero targets', function() {
-      var response = QueryDef.getPipelineAggOptions([]);
+      var response = queryDef.getPipelineAggOptions([]);
 
       it('should return zero', function() {
         expect(response.length).to.be(0);
@@ -25,7 +22,7 @@ describe('ElasticQueryDef', function() {
         ]
       };
 
-      var response = QueryDef.getPipelineAggOptions(targets);
+      var response = queryDef.getPipelineAggOptions(targets);
 
       it('should return zero', function() {
         expect(response.length).to.be(2);
@@ -40,7 +37,7 @@ describe('ElasticQueryDef', function() {
         ]
       };
 
-      var response = QueryDef.getPipelineAggOptions(targets);
+      var response = queryDef.getPipelineAggOptions(targets);
 
       it('should return one', function() {
         expect(response.length).to.be(1);
@@ -54,7 +51,7 @@ describe('ElasticQueryDef', function() {
         ]
       };
 
-      var response = QueryDef.getPipelineAggOptions(targets);
+      var response = queryDef.getPipelineAggOptions(targets);
 
       it('should return zero', function() {
         expect(response.length).to.be(0);
@@ -64,7 +61,7 @@ describe('ElasticQueryDef', function() {
 
   describe('isPipelineMetric', function() {
     describe('moving_avg', function() {
-      var result = QueryDef.isPipelineAgg('moving_avg');
+      var result = queryDef.isPipelineAgg('moving_avg');
 
       it('is pipe line metric', function() {
         expect(result).to.be(true);
@@ -72,7 +69,7 @@ describe('ElasticQueryDef', function() {
     });
 
     describe('count', function() {
-      var result = QueryDef.isPipelineAgg('count');
+      var result = queryDef.isPipelineAgg('count');
 
       it('is not pipe line metric', function() {
         expect(result).to.be(false);
@@ -83,19 +80,19 @@ describe('ElasticQueryDef', function() {
   describe('pipeline aggs depending on esverison', function() {
       describe('using esversion undefined', function() {
           it('should not get pipeline aggs', function() {
-              expect(QueryDef.getMetricAggTypes(undefined).length).to.be(9);
+              expect(queryDef.getMetricAggTypes(undefined).length).to.be(9);
           });
       });
 
       describe('using esversion 1', function() {
           it('should not get pipeline aggs', function() {
-              expect(QueryDef.getMetricAggTypes(1).length).to.be(9);
+              expect(queryDef.getMetricAggTypes(1).length).to.be(9);
           });
       });
 
       describe('using esversion 2', function() {
           it('should get pipeline aggs', function() {
-              expect(QueryDef.getMetricAggTypes(2).length).to.be(11);
+              expect(queryDef.getMetricAggTypes(2).length).to.be(11);
           });
       });
   });

public/app/plugins/datasource/graphite/gfunc.d.ts

@@ -0,0 +1,2 @@
+declare var test: any;
+export default test;

public/app/plugins/datasource/graphite/specs/datasource_specs.ts

@@ -1,8 +1,7 @@
-///<amd-dependency path="app/plugins/datasource/graphite/datasource" />
-///<amd-dependency path="test/specs/helpers" name="helpers" />
 
+import "../datasource";
 import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';
-declare var helpers: any;
+import helpers from 'test/specs/helpers';
 
 describe('graphiteDatasource', function() {
   var ctx = new helpers.ServiceTestContext();

public/app/plugins/datasource/graphite/specs/gfunc_specs.ts

@@ -1,8 +1,7 @@
 ///<amd-dependency path="app/plugins/datasource/graphite/gfunc" name="gfunc" />
 
 import {describe, beforeEach, it, sinon, expect} from 'test/lib/common';
-
-declare var gfunc: any;
+import gfunc from '../gfunc';
 
 describe('when creating func instance from func names', function() {
   it('should return func instance', function() {

public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts

@@ -1,12 +1,10 @@
-///<amd-dependency path="app/plugins/datasource/graphite/gfunc" name="gfunc"/>
-///<amd-dependency path="app/plugins/datasource/graphite/query_ctrl" />
-///<amd-dependency path="app/core/services/segment_srv" />
-///<amd-dependency path="test/specs/helpers" name="helpers" />
 
+import '../query_ctrl';
+import 'app/core/services/segment_srv';
 import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';
 
-declare var gfunc: any;
-declare var helpers: any;
+import * as gfunc from '../gfunc';
+import helpers from 'test/specs/helpers';
 
 describe('GraphiteQueryCtrl', function() {
   var ctx = new helpers.ControllerTestContext();

public/app/plugins/datasource/influxdb/influx_series.d.ts

@@ -0,0 +1,2 @@
+declare var test: any;
+export default test;

public/app/plugins/datasource/influxdb/query_builder.d.ts

@@ -0,0 +1,2 @@
+declare var test: any;
+export default test;

public/app/plugins/datasource/influxdb/query_ctrl.js

@@ -11,6 +11,9 @@ function (angular, _, InfluxQueryBuilder, InfluxQuery, queryPart) {
 
   var module = angular.module('grafana.controllers');
 
+  InfluxQuery = InfluxQuery.default;
+  queryPart = queryPart.default;
+
   module.controller('InfluxQueryCtrl', function($scope, templateSrv, $q, uiSegmentSrv) {
 
     $scope.init = function() {

public/app/plugins/datasource/influxdb/specs/influx_query_specs.ts

@@ -1,6 +1,6 @@
 import {describe, beforeEach, it, sinon, expect} from 'test/lib/common';
 
-import InfluxQuery = require('../influx_query');
+import InfluxQuery from '../influx_query';
 
 describe('InfluxQuery', function() {
 

public/app/plugins/datasource/influxdb/specs/influx_series_specs.ts

@@ -1,8 +1,5 @@
-///<amd-dependency path="app/plugins/datasource/influxdb/influx_series" name="InfluxSeries"/>
-
 import {describe, beforeEach, it, sinon, expect} from 'test/lib/common';
-
-declare var InfluxSeries: any;
+import InfluxSeries from '../influx_series';
 
 describe('when generating timeseries from influxdb response', function() {
 

public/app/plugins/datasource/influxdb/specs/query_builder_specs.ts

@@ -1,8 +1,5 @@
-///<amd-dependency path="app/plugins/datasource/influxdb/query_builder" name="InfluxQueryBuilder"/>
-
 import {describe, beforeEach, it, sinon, expect} from 'test/lib/common';
-
-declare var InfluxQueryBuilder: any;
+import InfluxQueryBuilder from '../query_builder';
 
 describe('InfluxQueryBuilder', function() {
 

public/app/plugins/datasource/influxdb/specs/query_ctrl_specs.ts

@@ -1,10 +1,7 @@
-///<amd-dependency path="app/plugins/datasource/influxdb/query_ctrl"/>
-///<amd-dependency path="app/core/services/segment_srv" />
-///<amd-dependency path="test/specs/helpers" name="helpers" />
-
+import '../query_ctrl';
+import 'app/core/services/segment_srv';
 import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';
-
-declare var helpers: any;
+import helpers from 'test/specs/helpers';
 
 describe('InfluxDBQueryCtrl', function() {
   var ctx = new helpers.ControllerTestContext();

public/app/plugins/datasource/influxdb/specs/query_part_specs.ts

@@ -1,7 +1,7 @@
 
 import {describe, beforeEach, it, sinon, expect} from 'test/lib/common';
 
-import queryPart = require('../query_part');
+import queryPart from '../query_part';
 
 describe('InfluxQueryPart', () => {
 

public/app/plugins/datasource/prometheus/specs/datasource_specs.ts

@@ -1,9 +1,7 @@
-///<amd-dependency path="app/plugins/datasource/prometheus/datasource" />
-///<amd-dependency path="test/specs/helpers" name="helpers" />
-
+import '../datasource';
 import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';
-import moment  = require('moment');
-declare var helpers: any;
+import moment from 'moment';
+import helpers from 'test/specs/helpers';
 
 describe('PrometheusDatasource', function() {