Browser test passing

Author: dignifiedquire

.gitignore

@@ -1,2 +1,4 @@
-node_modules/
+node_modules
 .DS_Store
+
+*.log

.travis.yml

@@ -1,13 +1,17 @@
 language: node_js
 node_js:
-  - '4'
-  - '5'
+  - "0.10"
+  - 4
+  - 5
   - stable
 
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
 
+addons:
+  firefox: "latest"
+
 script:
   - npm run lint
   - npm test

karma.conf.js

@@ -9,6 +9,10 @@ module.exports = function (karma) {
       debug: true,
       transform: ['brfs']
     },
-    browsers: process.env.TRAVIS ? ['Firefox', 'PhantomJS'] : ['Chrome'/*, 'PhantomJS'*/]
+    reporters: ['mocha-own'],
+    mochaOwnReporter: {
+      reporter: 'spec'
+    },
+    browsers: process.env.TRAVIS ? ['Firefox', 'PhantomJS'] : ['Chrome', 'PhantomJS']
   })
 }

npm-debug.log

@@ -20,6 +20,7 @@
     "karma-chrome-launcher": "^0.2.3",
     "karma-firefox-launcher": "^0.1.7",
     "karma-mocha": "^0.2.2",
+    "karma-mocha-own-reporter": "^1.1.2",
     "karma-phantomjs-launcher": "^1.0.0",
     "mocha": "^2.4.5",
     "phantomjs-prebuilt": "^2.1.7",

package.json

@@ -42,7 +42,7 @@ Zlib.prototype.init = function (windowBits, level, memLevel, strategy, dictionar
   this.level = level
   this.memLevel = memLevel
   this.strategy = strategy
-  // dictionary not supported.
+  this.dictionary = dictionary
 
   if (this.mode === exports.GZIP || this.mode === exports.GUNZIP) {
     this.windowBits += 16
@@ -193,7 +193,7 @@ Zlib.prototype._write = function (flush, input, in_off, in_len, out, out_off, ou
   }
 
   if (status !== exports.Z_STREAM_END && status !== exports.Z_OK) {
-    this._error(status)
+    this._error(status, flush)
   }
 
   this.write_in_progress = false
@@ -235,8 +235,33 @@ Zlib.prototype.reset = function () {
   }
 }
 
-Zlib.prototype._error = function (status) {
-  this.onerror(msg[status] + ': ' + this.strm.msg, status)
+Zlib.prototype._error = function (status, flush) {
+  var errMsg
+
+  switch (status) {
+    case exports.Z_OK:
+    case exports.Z_BUF_ERROR:
+      if (this.strm.avail_out !== 0 && flush === exports.Z_FINISH) {
+        errMsg = 'unexpected end of file'
+      } else {
+        errMsg = msg[status]
+      }
+      break
+    case exports.Z_STREAM_END:
+      // normal statuses, not fatal
+      break
+    case exports.Z_NEED_DICT:
+      if (!this.dictionary) {
+        errMsg = 'Missing dictionary'
+      } else {
+        errMsg = 'Bad dictionary'
+      }
+      break
+    default:
+      errMsg = status[msg]
+  }
+
+  this.onerror(errMsg, status)
 
   this.write_in_progress = false
   if (this.pending_close) {

src/binding.js

@@ -3,8 +3,8 @@
 
 var zlib = require('../')
 
-describe('zlib', function () {
-  it('closes after write', function (done) {
+describe('zlib - close after write', function () {
+  it('works', function (done) {
     zlib.gzip('hello', function (err, out) {
       if (err) throw err
       var unzip = zlib.createGunzip()

test/test-zlib-close-after-write.js

@@ -5,7 +5,7 @@ var assert = require('assert')
 var common = require('./common')
 var zlib = require('../')
 
-describe.skip('zlib - dictionary fails', function () {
+describe('zlib - dictionary fails', function () {
   it('should fail on missing dictionary', function (done) {
     // Should raise an error, not trigger an assertion in src/node_zlib.cc
     var stream = zlib.createInflate()

test/test-zlib-dictionary-fail.js

@@ -1,15 +1,14 @@
 /* eslint-env mocha */
 'use strict'
 
-var common = require('./common')
 var assert = require('assert')
 var zlib = require('../')
 var path = require('path')
 var fs = require('fs')
 
 describe.skip('zlib - flush', function () {
   it('works', function (done) {
-    var file = fs.readFileSync(path.resolve(common.fixturesDir, 'person.jpg'))
+    var file = fs.readFileSync(path.join(__dirname, 'fixtures', 'person.jpg'))
     var chunkSize = 16
     var opts = { level: 0 }
     var deflater = zlib.createDeflate(opts)

test/test-zlib-flush.js

@@ -15,7 +15,7 @@ describe.skip('zlib - from concatenated gzip', function () {
 
     assert.equal(zlib.gunzipSync(data).toString(), 'abcdef')
 
-    zlib.gunzip(data, common.mustCall((err, result) => {
+    zlib.gunzip(data, common.mustCall(function (err, result) {
       assert.ifError(err)
       assert.equal(result, 'abcdef', 'result should match original string')
       done()