Update sinon to 2.1.0 and eslint to 3.19.0

Also update clean-css

Makefile

@@ -9,7 +9,7 @@ PHANTOMJS       ?= ./node_modules/.bin/phantomjs
 RJS             ?= ./node_modules/.bin/r.js
 PO2JSON         ?= ./node_modules/.bin/po2json
 SASS            ?= ./.bundle/bin/sass
-CLEANCSS        ?= ./node_modules/.bin/cleancss
+CLEANCSS        ?= ./node_modules/clean-css-cli/bin/cleancss
 SPHINXBUILD     ?= ./bin/sphinx-build
 SPHINXOPTS      =
 

docs/CHANGES.md

@@ -2,8 +2,13 @@
 
 ## 3.0.2 (Unreleased)
 
-- Update Jasmine from 1.3.1 to 2.5.3 and Phantomjs from 1.9.7-1 to 2.1.14 [jcbrand]
-- Update moment.js to 2.18.1 [jcbrand]
+Dependency updates:
+- Jasmine 2.5.3
+- Phantomjs 2.1.14
+- moment 2.18.1
+- sinon 2.1.0
+- eslint 3.19.0
+
 
 ## 3.0.1 (2017-04-04)
 

package.json

@@ -39,9 +39,9 @@
     "backbone.overview": "0.0.3",
     "bootstrap": "^3.3.7",
     "bourbon": "^4.3.2",
-    "clean-css": "^3.4.19",
+    "clean-css-cli": "^4.0.10",
     "es6-promise": "^4.1.0",
-    "eslint": "^3.16.1",
+    "eslint": "^3.19.0",
     "eslint-plugin-lodash": "^2.3.3",
     "font-awesome": "^4.7.0",
     "greenkeeper": "^4.1.0",
@@ -65,7 +65,7 @@
     "pluggable.js": "1.0.0",
     "po2json": "^0.4.4",
     "requirejs": "2.3.3",
-    "sinon": "^1.17.3",
+    "sinon": "^2.1.0",
     "snyk": "^1.21.2",
     "strophe.js": "1.2.13",
     "strophejs-plugin-disco": "0.0.1",

tests/runner.js

@@ -4,7 +4,7 @@
 config.paths.mock = "tests/mock";
 config.paths['wait-until-promise'] = "node_modules/wait-until-promise/index";
 config.paths['test-utils'] = "tests/utils";
-config.paths.sinon = "node_modules/sinon/lib/sinon";
+config.paths.sinon = "node_modules/sinon/pkg/sinon";
 config.paths.transcripts = "converse-logs/converse-logs";
 config.paths.jasmine = "node_modules/jasmine-core/lib/jasmine-core/jasmine";
 config.paths.boot = "node_modules/jasmine-core/lib/jasmine-core/boot";