[Pkg-javascript-commits] [node-mocha] 01/03: Imported Upstream version 1.20.1

[Leo Iannacone]

This is an automated email from the git hooks/post-receive script.

l3on-guest pushed a commit to branch master
in repository node-mocha.

commit 3a21037cbd66fe8a926fc24eab9e0f0e766d1526
Author: Leo Iannacone <l3on at ubuntu.com>
Date:   Sun Jun 15 16:35:59 2014 +0200

    Imported Upstream version 1.20.1
---
 History.md              |  5 +++++
 bower.json              |  7 +++++--
 component.json          |  2 +-
 package.json            | 16 ++++++++--------
 test/acceptance/http.js |  2 +-
 test/http.meta.2.js     |  2 +-
 test/http.meta.js       |  2 +-
 test/runner.js          | 16 ++++++++--------
 8 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/History.md b/History.md
index 2724b0f..7ab50bd 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,8 @@
+1.20.1 / 2014-06-03
+==================
+
+  * update: should dependency to ~4.0.0 (#1231)
+
 1.20.0 / 2014-05-28
 ==================
 
diff --git a/bower.json b/bower.json
index 0660904..b6e3fd7 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,10 @@
 {
   "name": "mocha",
-  "version": "1.20.0",
-  "main": "mocha.js",
+  "version": "1.20.1",
+  "main": [
+    "mocha.js",
+    "mocha.css"
+  ],
   "ignore": [
     "bin",
     "editors",
diff --git a/component.json b/component.json
index 59d08a3..59820ac 100644
--- a/component.json
+++ b/component.json
@@ -1,6 +1,6 @@
 {
   "name": "mocha",
-  "version": "1.20.0",
+  "version": "1.20.1",
   "repo": "visionmedia/mocha",
   "description": "simple, flexible, fun test framework",
   "keywords": [
diff --git a/package.json b/package.json
index 8a20af7..89770c8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mocha",
-  "version": "1.20.0",
+  "version": "1.20.1",
   "description": "simple, flexible, fun test framework",
   "keywords": [
     "mocha",
@@ -36,8 +36,8 @@
     "glob": "3.2.3"
   },
   "devDependencies": {
-    "should": ">= 2.0.x",
-    "coffee-script": "1.2"
+    "coffee-script": "1.2",
+    "should": "~4.0.0"
   },
   "files": [
     "bin",
@@ -49,9 +49,9 @@
     "LICENSE"
   ],
   "licenses": [
-      {
-        "type": "MIT",
-        "url": "https://raw.github.com/visionmedia/mocha/master/LICENSE"
-      }
-    ]
+    {
+      "type": "MIT",
+      "url": "https://raw.github.com/visionmedia/mocha/master/LICENSE"
+    }
+  ]
 }
diff --git a/test/acceptance/http.js b/test/acceptance/http.js
index 750d108..00406e6 100644
--- a/test/acceptance/http.js
+++ b/test/acceptance/http.js
@@ -10,7 +10,7 @@ server.listen(8888);
 describe('http', function(){
   it('should provide an example', function(done){
     http.get({ path: '/', port: 8888 }, function(res){
-      res.should.have.status(200);
+      res.should.have.property('statusCode', 200);
       done();
     })
   })
diff --git a/test/http.meta.2.js b/test/http.meta.2.js
index c0568ff..bcc6b6b 100644
--- a/test/http.meta.2.js
+++ b/test/http.meta.2.js
@@ -29,7 +29,7 @@ function get(url) {
   function request(done) {
     http.get({ path: url, port: 8899, headers: header }, function(res){
       var buf = '';
-      res.should.have.status(200);
+      res.should.have.property('statusCode', 200);
       res.setEncoding('utf8');
       res.on('data', function(chunk){ buf += chunk });
       res.on('end', function(){
diff --git a/test/http.meta.js b/test/http.meta.js
index 1ab6767..9ae90d8 100644
--- a/test/http.meta.js
+++ b/test/http.meta.js
@@ -25,7 +25,7 @@ function get(url, body, header) {
   return function(done){
     http.get({ path: url, port: 8889, headers: header }, function(res){
       var buf = '';
-      res.should.have.status(200);
+      res.should.have.property('statusCode', 200);
       res.setEncoding('utf8');
       res.on('data', function(chunk){ buf += chunk });
       res.on('end', function(){
diff --git a/test/runner.js b/test/runner.js
index 5a75899..f5ee8cc 100644
--- a/test/runner.js
+++ b/test/runner.js
@@ -53,12 +53,12 @@ describe('Runner', function(){
   describe('.globalProps()', function(){
     it('should include common non enumerable globals', function() {
       var props = runner.globalProps();
-      props.should.include('setTimeout');
-      props.should.include('clearTimeout');
-      props.should.include('setInterval');
-      props.should.include('clearInterval');
-      props.should.include('Date');
-      props.should.include('XMLHttpRequest');
+      props.should.containEql('setTimeout');
+      props.should.containEql('clearTimeout');
+      props.should.containEql('setInterval');
+      props.should.containEql('clearInterval');
+      props.should.containEql('Date');
+      props.should.containEql('XMLHttpRequest');
     });
   });
 
@@ -69,8 +69,8 @@ describe('Runner', function(){
 
     it('should white-list globals', function(){
       runner.globals(['foo', 'bar']);
-      runner.globals().should.include('foo');
-      runner.globals().should.include('bar');
+      runner.globals().should.containEql('foo');
+      runner.globals().should.containEql('bar');
     })
   })
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-mocha.git