diff --git a/test/config.js b/test/config.js index bcc6f1f..b03feef 100644 --- a/test/config.js +++ b/test/config.js @@ -4,23 +4,36 @@ System.paths['npm:*'] = 'jspm_packages/npm/*.js'; System.paths['github:*'] = 'jspm_packages/github/*.js'; System.map = { - 'angular': 'github:angular/bower-angular@^1.2.12', 'mocha': 'npm:mocha@^1.17.1', 'text': 'github:systemjs/plugin-text@master', 'bootstrap': 'github:twbs/bootstrap@^3.1.1', - 'jquery': 'github:components/jquery@^2.1.0', 'css': 'github:systemjs/plugin-css@master', + 'jquery': 'npm:jquery@^2.1.0', + 'd3': 'github:mbostock/d3@^3.4.1', + 'angular': 'github:angular/bower-angular@^1.2.13', 'npm:mocha@1.17.1': { 'css': 'github:systemjs/plugin-css@master' + }, + 'github:jspm/nodelibs@0.0.2': { + 'inherits': 'npm:inherits@^2.0.1', + 'ieee754': 'npm:ieee754@^1.1.1', + 'Base64': 'npm:Base64@^0.2.0', + 'base64-js': 'npm:base64-js@^0.0.4' } }; System.versions = { - 'github:angular/bower-angular': '1.2.12', + 'github:angular/bower-angular': '1.2.13', 'npm:mocha': '1.17.1', 'github:systemjs/plugin-css': 'master', 'github:systemjs/plugin-text': 'master', 'github:twbs/bootstrap': '3.1.1', - 'github:components/jquery': '2.1.0' + 'npm:jquery': '2.1.0', + 'github:jspm/nodelibs': '0.0.2', + 'npm:inherits': '2.0.1', + 'npm:ieee754': '1.1.2', + 'npm:Base64': '0.2.0', + 'npm:base64-js': '0.0.4', + 'github:mbostock/d3': '3.4.1' }; diff --git a/test/package.json b/test/package.json index c21584d..07bd604 100644 --- a/test/package.json +++ b/test/package.json @@ -7,11 +7,12 @@ "configFile": "config.js", "registry": "jspm", "dependencies": { - "angular": "^1.2.12", "mocha": "^1.17.1", "text": "master", "bootstrap": "^3.1.1", + "css": "master", "jquery": "^2.1.0", - "css": "master" + "d3": "^3.4.1", + "angular": "^1.2.13" } } \ No newline at end of file diff --git a/test/test.html b/test/test.html index 07b799f..19a0956 100644 --- a/test/test.html +++ b/test/test.html @@ -1,6 +1,5 @@ - - +
diff --git a/test/tests/angular.js b/test/tests/angular.js index 2b5a663..711eaca 100644 --- a/test/tests/angular.js +++ b/test/tests/angular.js @@ -1,7 +1,6 @@ -var someHTML = require('./angular.html!text'); +var angular = require('angular'); exports['load test'] = function(done) { - System.import('angular').then(function() { + if (angular) done(); - }); } \ No newline at end of file diff --git a/test/tests/d3.js b/test/tests/d3.js new file mode 100644 index 0000000..fdcd505 --- /dev/null +++ b/test/tests/d3.js @@ -0,0 +1,7 @@ +var d3 = require('d3'); + +exports['style test'] = function(done) { + document.querySelector('#sandbox').innerHTML = 'd3
'; + d3.selectAll("p").style("color", "red"); + done(); +} \ No newline at end of file diff --git a/test/tests/tests.js b/test/tests/tests.js index 1d2d812..d659289 100644 --- a/test/tests/tests.js +++ b/test/tests/tests.js @@ -2,3 +2,5 @@ // exports['Angular'] = require('tests/angular'); exports['Bootstrap'] = require('tests/bootstrap'); exports['jQuery'] = require('tests/jquery'); + exports['d3'] = require('tests/d3'); + exports['angular'] = require('tests/angular');