diff --git a/package-overrides/npm/jquery@2.1.0.json b/package-overrides/npm/jquery@2.1.0.json
new file mode 100644
index 0000000..7585f92
--- /dev/null
+++ b/package-overrides/npm/jquery@2.1.0.json
@@ -0,0 +1,5 @@
+{
+ "directories": {
+ "dist": "dist"
+ }
+}
diff --git a/test/config.js b/test/config.js
index 38e2022..bcc6f1f 100644
--- a/test/config.js
+++ b/test/config.js
@@ -1,19 +1,26 @@
System.paths['tests/*'] = 'tests/*.js';
+System.paths['npm:*'] = 'jspm_packages/npm/*.js';
+System.paths['github:*'] = 'jspm_packages/github/*.js';
System.map = {
- 'text': 'github:systemjs/plugin-text@master',
'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',
'npm:mocha@1.17.1': {
'css': 'github:systemjs/plugin-css@master'
}
};
System.versions = {
- 'github:systemjs/plugin-text': 'master',
'github:angular/bower-angular': '1.2.12',
'npm:mocha': '1.17.1',
- 'github:systemjs/plugin-css': 'master'
+ 'github:systemjs/plugin-css': 'master',
+ 'github:systemjs/plugin-text': 'master',
+ 'github:twbs/bootstrap': '3.1.1',
+ 'github:components/jquery': '2.1.0'
};
diff --git a/test/package.json b/test/package.json
index 0681df6..c21584d 100644
--- a/test/package.json
+++ b/test/package.json
@@ -7,8 +7,11 @@
"configFile": "config.js",
"registry": "jspm",
"dependencies": {
- "text": "master",
"angular": "^1.2.12",
- "mocha": "^1.17.1"
+ "mocha": "^1.17.1",
+ "text": "master",
+ "bootstrap": "^3.1.1",
+ "jquery": "^2.1.0",
+ "css": "master"
}
}
\ No newline at end of file
diff --git a/test/test.html b/test/test.html
index 19a0956..07b799f 100644
--- a/test/test.html
+++ b/test/test.html
@@ -1,5 +1,6 @@
-
+
+
diff --git a/test/tests/angular.js b/test/tests/angular.js
index c10fd66..2b5a663 100644
--- a/test/tests/angular.js
+++ b/test/tests/angular.js
@@ -4,20 +4,4 @@ exports['load test'] = function(done) {
System.import('angular').then(function() {
done();
});
-}
-
-exports['another test'] = function(done) {
- System.import('angular').then(function(angular) {
-
- document.querySelector("#sandbox").innerHTML = someHTML;
-
- if (!angular)
- throw 'Test failed...';
-
- setTimeout(done, 1000);
- });
-}
-
-exports['last test'] = function(done) {
- done();
}
\ No newline at end of file
diff --git a/test/tests/bootstrap.html b/test/tests/bootstrap.html
new file mode 100644
index 0000000..550fb05
--- /dev/null
+++ b/test/tests/bootstrap.html
@@ -0,0 +1,23 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/test/tests/bootstrap.js b/test/tests/bootstrap.js
new file mode 100644
index 0000000..4c9f888
--- /dev/null
+++ b/test/tests/bootstrap.js
@@ -0,0 +1,11 @@
+var $ = require('bootstrap');
+require('bootstrap/css/bootstrap.css!');
+var template = require('./bootstrap.html!text');
+
+exports['modal test'] = function(done) {
+ $("#sandbox").html(template);
+ $('#myModal').on('shown.bs.modal', function() {
+ done();
+ });
+ $('#sandbox .btn').click();
+}
\ No newline at end of file
diff --git a/test/tests/jquery.js b/test/tests/jquery.js
new file mode 100644
index 0000000..141c271
--- /dev/null
+++ b/test/tests/jquery.js
@@ -0,0 +1,6 @@
+var $ = require('jquery');
+
+exports['simple test'] = function(done) {
+ $('#sandbox').html('jquery');
+ done();
+}
\ No newline at end of file
diff --git a/test/tests/tests.js b/test/tests/tests.js
index 0b123bd..1d2d812 100644
--- a/test/tests/tests.js
+++ b/test/tests/tests.js
@@ -1,2 +1,4 @@
- exports['Angular'] = require('tests/angular');
+ // exports['Angular'] = require('tests/angular');
+ exports['Bootstrap'] = require('tests/bootstrap');
+ exports['jQuery'] = require('tests/jquery');