Merge pull request #466 from busterjs/update-deps

Update deps
busterjs · Jan 6, 2016 · 6debdbd · 6debdbd
2 parents 46d1d19 + 78b7885
commit 6debdbd
Show file tree

Hide file tree

Showing 19 changed files with 599 additions and 457 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,6 +1,6 @@
 *.log
 node_modules
-resources/buster-test.js
+# resources/buster-test.js # gitignored, but publishable
 .idea
 .cache-require-paths.json
 

diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,28 @@
 language: node_js
 sudo: false
-node_js:
-  - "0.10"
-  - "0.12"
-  - "4"
-  - "5"
+env:
+  global:
+    - CXX=g++-4.8
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - g++-4.8
+matrix:
+  include:
+    - node_js: "0.10"
+      env: JSDOM=3
+    - node_js: "0.12"
+      env: JSDOM=3
+    - node_js: "4"
+      env: JSDOM=3
+    - node_js: "4"
+      env: JSDOM=7
+    - node_js: "5"
+      env: JSDOM=3
+    - node_js: "5"
+      env: JSDOM=7
 before_install:
   - npm i -g npm
+  - npm i jsdom@$JSDOM # becomes extraneous, but overrides buster-test dependency
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,14 +1,24 @@
 environment:
+  NO_INTEGRATION: 1
   matrix:
   - nodejs_version: "0.10"
+    jsdom_version: "3"
   - nodejs_version: "0.12"
+    jsdom_version: "3"
   - nodejs_version: "4"
+    jsdom_version: "3"
+  - nodejs_version: "4"
+    jsdom_version: "7"
+  - nodejs_version: "5"
+    jsdom_version: "3"
   - nodejs_version: "5"
+    jsdom_version: "7"
 
 install:
   - ps: Install-Product node $env:nodejs_version
-  - npm install -g npm
-  - npm install
+  - npm i -g npm
+  - npm i jsdom@%jsdom_version%
+  - npm i
 
 test_script:
   - node --version

diff --git a/bin/buster-test b/bin/buster-test
@@ -3,7 +3,7 @@ var path = require("path");
 var testCli = require("buster-test-cli");
 
 process.on("uncaughtException", function (err) {
-    console.log(err.stack);
+    console.error("Uncaught exception:", err.stack ? err.stack : err);
 });
 
 var busterPath = path.join(__dirname, "..", "lib", "buster");
@@ -27,5 +27,7 @@ testCli.create(process.stdout, process.stderr, {
         ]
     }
 }).run(process.argv.slice(2), function (err) {
-    if (err) { setTimeout(process.exit.bind(null, 1), 5); }
+    if (err) {
+        console.error("buster-test run failed:", err.stack ? err.stack : err);
+    }
 });
diff --git a/build b/build
@@ -44,8 +44,8 @@ function finish() {
 
 var fileNames = [
     // buster/bundle-0.x.js
-    "when/when",
-    "lodash/dist/lodash",
+    "when/dist/browser/when.js",
+    "lodash/index",
     "async/lib/async",
     "platform/platform",
     "lib/buster/amd-shim.js",

diff --git a/jsTestDriver.conf b/jsTestDriver.conf
diff --git a/lib/buster/framework-extension.js b/lib/buster/framework-extension.js
@@ -1,5 +1,7 @@
 // WHOA! This will change before 1.0
 
+var BUSTER_VERSION = require("../../package.json").version;
+
 function resolveModules(resourceSet, modules) {
     return modules.map(function (module) {
         var moduleName = module[0];
@@ -22,8 +24,8 @@ var NO_CACHE_HEADERS = {
 function loadTestFramework(configuration) {
     configuration.on("load:framework", function (rs) {
         var files = resolveModules(rs, [
-            ["when/", "when.js"],
-            ["lodash/dist/", "lodash.js"],
+            ["when/", "dist/browser/when.js"],
+            ["lodash/", "index.js"],
             ["async/lib/", "async.js"],
             ["platform/", "platform.js"],
             ["../", "buster/amd-shim.js"],
@@ -33,20 +35,7 @@ function loadTestFramework(configuration) {
             ["referee/lib/", "expect.js"],
             ["referee/lib/", "referee.js"],
             ["formatio/lib/", "formatio.js"],
-            ["sinon/lib/", "sinon.js"],
-            ["sinon/lib/", "sinon/spy.js"],
-            ["sinon/lib/", "sinon/call.js"],
-            ["sinon/lib/", "sinon/behavior.js"],
-            ["sinon/lib/", "sinon/stub.js"],
-            ["sinon/lib/", "sinon/mock.js"],
-            ["sinon/lib/", "sinon/collection.js"],
-            ["sinon/lib/", "sinon/sandbox.js"],
-            ["sinon/lib/", "sinon/match.js"],
-            ["sinon/lib/", "sinon/util/event.js"],
-            ["sinon/lib/", "sinon/util/fake_xml_http_request.js"],
-            ["sinon/lib/", "sinon/util/fake_timers.js"],
-            ["sinon/lib/", "sinon/util/fake_server.js"],
-            ["sinon/lib/", "sinon/util/fake_server_with_clock.js"],
+            ["sinon/pkg/", "sinon.js"],
             ["buster-test/lib/", "seedrandom.js"],
             ["buster-test/lib/", "browser-env.js"],
             ["buster-test/lib/", "test-context.js"],
@@ -63,12 +52,11 @@ function loadTestFramework(configuration) {
         ]);
 
         var ieFiles = resolveModules(rs, [
-            ["sinon/lib/", "sinon/util/timers_ie.js"],
-            ["sinon/lib/", "sinon/util/xhr_ie.js"]
+            ["sinon/pkg/", "sinon-ie.js"]
         ]);
 
-        var compatResourceName = "/buster/compat-0.7.js";
-        var bundleResourceName = "/buster/bundle-0.7.js";
+        var compatResourceName = "/buster/compat-" + BUSTER_VERSION + ".js";
+        var bundleResourceName = "/buster/bundle-" + BUSTER_VERSION + ".js";
 
         when.all([
             rs.addResource({
@@ -81,10 +69,10 @@ function loadTestFramework(configuration) {
                 combine: files,
                 headers: NO_CACHE_HEADERS
             })
-        ], function () {
+        ]).then(function () {
             rs.loadPath.prepend(compatResourceName);
             rs.loadPath.prepend(bundleResourceName);
-        }.bind(this));
+        });
     }.bind(this));
 }
 

diff --git a/package.json b/package.json
@@ -1,63 +1,72 @@
 {
-    "name": "buster",
-    "version": "0.7.18",
-    "main": "./lib/buster",
-    "description": "Buster.JS JavaScript Test framework. Meta package that pieces together various sub-projects.",
-    "homepage": "http://busterjs.org/",
-    "author": { "name": "August Lilleaas and Christian Johansen" },
-    "contributors": [{
-        "name": "August Lilleaas",
-        "email": "august.lilleaas@gmail.com",
-        "url": "http://augustl.com"
-    }, {
-        "name": "Christian Johansen",
-        "email": "christian@cjohansen.no",
-        "url": "http://cjohansen.no"
-    }, {
-        "name": "Daniel Wittner",
-        "email": "d.wittner@gmx.de",
-        "url": "https://github.com/dwittner"
-    }],
-    "license": "BSD-3-Clause",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/busterjs/buster.git"
+  "name": "buster",
+  "version": "0.7.18",
+  "main": "./lib/buster",
+  "description": "Buster.JS JavaScript Test framework. Meta package that pieces together various sub-projects.",
+  "homepage": "http://busterjs.org/",
+  "author": {
+    "name": "August Lilleaas and Christian Johansen"
+  },
+  "contributors": [
+    {
+      "name": "August Lilleaas",
+      "email": "august.lilleaas@gmail.com",
+      "url": "http://augustl.com"
     },
-    "bin": {
-        "buster": "./bin/buster",
-        "buster-test": "./bin/buster-test",
-        "buster-server": "./bin/buster-server",
-        "buster-autotest": "./bin/buster-autotest",
-        "buster-static": "./bin/buster-static",
-        "buster-ci": "./bin/buster-ci"
+    {
+      "name": "Christian Johansen",
+      "email": "christian@cjohansen.no",
+      "url": "http://cjohansen.no"
     },
-    "scripts": {
-        "test": "node run-tests.js",
-        "test-debug": "node --debug-brk run-tests.js"
-    },
-    "dependencies": {
-        "bane": "~1.0",
-        "evented-logger": "~1.0",
-        "referee": "~1.1",
-        "formatio": "~1.0",
-        "sinon": "~1.9",
-        "buster-test": "~0.7",
-        "buster-sinon": "~0.7",
-        "referee-sinon": "~1.0",
-        "buster-test-cli": "~0.8",
-        "buster-server-cli": "~0.3",
-        "buster-static": "~0.6",
-        "buster-autotest": "~0.5",
-        "buster-ci": "~0.2",
-        "buster-syntax": "~0.4.2",
-        "when": "https://github.com/cujojs/when/tarball/1.8.1",
-        "lodash": "~1.0",
-        "async": "~0.2",
-        "platform": "~1.2",
-        "stack-filter": "~1.0",
-        "samsam": "~1.1"
-    },
-    "devDependencies": {
-        "uglify-js": "~1.2.5"
+    {
+      "name": "Daniel Wittner",
+      "email": "d.wittner@gmx.de",
+      "url": "https://github.com/dwittner"
     }
+  ],
+  "license": "BSD-3-Clause",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/busterjs/buster.git"
+  },
+  "bin": {
+    "buster": "./bin/buster",
+    "buster-test": "./bin/buster-test",
+    "buster-server": "./bin/buster-server",
+    "buster-autotest": "./bin/buster-autotest",
+    "buster-static": "./bin/buster-static",
+    "buster-ci": "./bin/buster-ci"
+  },
+  "scripts": {
+    "test": "node run-tests.js && node run-integration-tests.js",
+    "test-debug": "node --debug-brk run-tests.js"
+  },
+  "dependencies": {
+    "async": "1.x",
+    "bane": "1.x",
+    "buster-autotest": "0.6.x",
+    "buster-ci": "0.3.x",
+    "buster-server-cli": "0.4.x",
+    "buster-sinon": "0.7.x",
+    "buster-static": "0.7.x",
+    "buster-syntax": "0.5.x",
+    "buster-test": "0.8.x",
+    "buster-test-cli": "0.9.x",
+    "evented-logger": "1.x",
+    "formatio": "1.x",
+    "lodash": "3.x",
+    "platform": "1.x",
+    "referee": "1.x",
+    "referee-sinon": "1.x",
+    "samsam": "1.x",
+    "sinon": "1.x",
+    "stack-filter": "1.x",
+    "when": "3.x >=3.7.6"
+  },
+  "devDependencies": {
+    "buster-amd": "0.3.x",
+    "buster-html-doc": "2.x",
+    "phantomjs": "1.x",
+    "uglify-js": "2.x"
+  }
 }