Improved tests.

Author: ezzatron

lib/CouchBuilder.js

@@ -1,40 +1,36 @@
 path = require 'path'
 Promise = require 'bluebird'
-readdirp = require 'readdirp'
 
 module.exports = class CouchBuilder
 
-    constructor: (@handlers = []) ->
+    constructor: (@handlers = [], @_readdirp = require 'readdirp') ->
 
     build: (root) -> new Promise (resolve, reject) =>
         closeError = null
         entries = []
 
-        stream = readdirp root: root, entryType: 'files'
+        stream = @_readdirp root: root, entryType: 'files'
 
         stream.on 'data', (entry) ->
             entries.push entry
 
             return
 
-        stream.on 'warn', (error) ->
-            closeError = error
-            stream.destroy()
+        stream.on 'end', =>
+            @_processEntries entries
+            .then (result) -> return resolve result
+            .catch (error) -> return reject error
 
             return
 
-        stream.on 'error', (error) ->
-            return reject error
-
-        stream.on 'end', =>
-            @_processEntries entries
-            .then (result) ->
-                return resolve result
+        stream.on 'warn', (error) ->
+            closeError = error
+            stream.destroy()
 
             return
 
-        stream.on 'close', ->
-            return reject closeError
+        stream.on 'close', -> return reject closeError
+        stream.on 'error', (error) -> return reject error
 
         return
 
@@ -58,6 +54,7 @@ module.exports = class CouchBuilder
                     @_set result, atoms, results[i][1].toString()
 
             return resolve result
+        .catch (error) -> return reject error
 
         return
 
@@ -66,10 +63,9 @@ module.exports = class CouchBuilder
 
         Promise.all(handler filePath for handler in @handlers)
         .then (results) ->
-            for result in results when result?
-                return resolve result
-
+            return resolve result for result in results when result?
             return resolve null
+        .catch (error) -> return reject error
 
         return
 

src/CouchBuilder.coffee

@@ -7,43 +7,91 @@ CouchBuilder = require '../../src/CouchBuilder'
 describe 'CouchBuilder', ->
 
     beforeEach ->
-        @handlers = [
-            (filePath) -> new Promise (resolve, reject) ->
-                return resolve null unless path.basename(filePath).match /^file-a/
-
-                fs.readFile filePath, (error, data) ->
-                    return reject error if error
-
-                    resolve [path.basename(filePath), "(handler a) #{data.toString()}"]
-
-            (filePath) -> new Promise (resolve, reject) ->
-                return resolve null unless path.basename(filePath).match /^file-b/
-
-                fs.readFile filePath, (error, data) ->
-                    return reject error if error
-
-                    resolve [path.basename(filePath), "(handler b) #{data.toString()}"]
-        ]
-        @subject = new CouchBuilder @handlers
-
-    it 'builds a result using the correct handlers', ->
-        filePath = "#{__dirname}/../fixture/tree"
-        expected =
-            'directory-a':
-                'directory-a-a':
-                    'file-a-a-a': '(handler a) a-a-a\n'
-                    'file-a-a-b': '(handler a) a-a-b\n'
-                'directory-a-b':
-                    'file-a-b-a': '(handler a) a-b-a\n'
-                    'file-a-b-b': '(handler a) a-b-b\n'
-                'file-a-a': '(handler a) a-a\n'
-                'file-a-b': '(handler a) a-b\n'
-            'directory-b':
-                'file-b-a': '(handler b) b-a\n'
-                'file-b-b': '(handler b) b-b\n'
-            'file-a': '(handler a) a\n'
-            'file-b': '(handler b) b\n'
-
-        return @subject.build filePath
-        .then (actual) ->
-            assert.deepEqual actual, expected
+        @handlerA = (filePath) -> new Promise (resolve, reject) ->
+            return resolve null unless path.basename(filePath).match /^file-a/
+
+            fs.readFile filePath, (error, data) ->
+                return reject error if error
+
+                resolve [path.basename(filePath), "(handler a) #{data.toString()}"]
+
+        @handlerB = (filePath) -> new Promise (resolve, reject) ->
+            return resolve null unless path.basename(filePath).match /^file-b/
+
+            fs.readFile filePath, (error, data) ->
+                return reject error if error
+
+                resolve [path.basename(filePath), "(handler b) #{data.toString()}"]
+
+        @filePath = "#{__dirname}/../fixture/tree"
+
+    describe 'under normal conditions', ->
+
+        beforeEach ->
+            @subject = new CouchBuilder [@handlerA, @handlerB]
+
+        it 'builds a result using the correct handlers', ->
+            expected =
+                'directory-a':
+                    'directory-a-a':
+                        'file-a-a-a': '(handler a) a-a-a\n'
+                        'file-a-a-b': '(handler a) a-a-b\n'
+                    'directory-a-b':
+                        'file-a-b-a': '(handler a) a-b-a\n'
+                        'file-a-b-b': '(handler a) a-b-b\n'
+                    'file-a-a': '(handler a) a-a\n'
+                    'file-a-b': '(handler a) a-b\n'
+                'directory-b':
+                    'file-b-a': '(handler b) b-a\n'
+                    'file-b-b': '(handler b) b-b\n'
+                'file-a': '(handler a) a\n'
+                'file-b': '(handler b) b\n'
+
+            return @subject.build @filePath
+            .then (actual) ->
+                assert.deepEqual actual, expected
+
+    describe 'under handler error conditions', ->
+
+        beforeEach ->
+            @error = 'error'
+            @handlerX = (filePath) => new Promise (resolve, reject) =>
+                return reject @error
+            @subject = new CouchBuilder [@handlerA, @handlerX]
+
+        it 'handles the handler error', ->
+            return @subject.build @filePath
+            .catch (actual) =>
+                assert.deepEqual actual, @error
+
+    describe 'under file tree traversal error conditions', ->
+
+        beforeEach ->
+            @streamHandlers = {}
+            @stream =
+                on: (event, handler) => @streamHandlers[event] = handler
+                destroy: => @streamHandlers.close()
+            @readdirp = sinon.stub()
+            @readdirp.returns @stream
+
+            @subject = new CouchBuilder [], @readdirp
+
+        it 'handles warnings', ->
+            expected = 'warning'
+            promise = @subject.build 'filePath'
+            .catch (actual) ->
+                assert.strictEqual actual, expected
+
+            @streamHandlers.warn expected
+
+            return promise
+
+        it 'handles errors', ->
+            expected = 'error'
+            promise = @subject.build 'filePath'
+            .catch (actual) ->
+                assert.strictEqual actual, expected
+
+            @streamHandlers.error expected
+
+            return promise