test: Fixing tests after rebase

index.js

@@ -4,7 +4,8 @@ var EventEmitter = require('events').EventEmitter
 
 var assign = require('lodash/assign')
 
-var handleChanges = require('./lib/helpers/handle-changes')
+var internals = Store.internals = {}
+internals.handleChanges = require('./lib/helpers/handle-changes')
 
 function Store (dbName, options) {
   if (!(this instanceof Store)) return new Store(dbName, options)
@@ -64,7 +65,7 @@ function Store (dbName, options) {
 
   state.api = api
 
-  handleChanges(state)
+  internals.handleChanges(state)
 
   return api
 }

lib/helpers/add-one.js

@@ -5,8 +5,9 @@ var PouchDBErrors = require('pouchdb-errors')
 var Promise = require('lie')
 var uuid = require('pouchdb-utils').uuid
 
-var addTimestamps = require('../utils/add-timestamps')
-var put = require('./db-put')
+var internals = addOne.internals = {}
+internals.addTimestamps = require('../utils/add-timestamps')
+internals.put = require('./db-put')
 
 function addOne (state, doc, prefix) {
   if (typeof doc !== 'object') {
@@ -25,7 +26,7 @@ function addOne (state, doc, prefix) {
 
   delete doc.hoodie
 
-  return put(state, addTimestamps(doc))
+  return internals.put(state, internals.addTimestamps(doc))
 
   .catch(function (error) {
     if (error.status === 409) {

lib/helpers/db-bulk-docs.js

@@ -1,5 +1,7 @@
 module.exports = bulkDocs
 
+var internals = bulkDocs.internals = {}
+
 // we wrap PouchDB’s .bulkDocs method in order to guarantee that the events get
 // emmited before the Promise gets resolved. This is how the rest of Hoodie’s
 // APIs behave. Also it avoids confusion that listening to events after adding
@@ -36,7 +38,7 @@ function bulkDocs (state, docs) {
       }
 
       scope.result = result
-        .map(toNormalisedError.bind(null, scope))
+        .map(internals.toNormalisedError.bind(null, scope))
         .map(function (result, i) {
           if (!result.rev) {
             return result
@@ -57,7 +59,7 @@ function toRev (result) {
   return result.rev
 }
 
-function toNormalisedError (scope, result, i) {
+internals.toNormalisedError = function toNormalisedError (scope, result, i) {
   if (result instanceof Error) {
     if (result.status === 409) {
       var conflict = new Error('Document with id "' + scope.docs[i]._id + '" already exists')

tests/index.js

@@ -23,7 +23,7 @@ require('./integration/update-or-add')
 require('./integration/update')
 require('./integration/with-id-prefix')
 
-require('./unit/add-many-test')
 require('./unit/add-one-test')
+require('./unit/bulkdocs-test')
 require('./unit/connect-test')
 require('./unit/disconnect-test')

tests/integration/constructor.js

@@ -139,13 +139,16 @@ test('Store.defaults with defaults', function (t) {
     remote: 'test-db-remote',
     foo: 'baz'
   }
+  simple.mock(Store.internals, 'handleChanges').callFn(function () {})
 
   var defaults = Store.defaults(options)
 
   defaults('test-db')
 
   t.is(pouchStub.callCount, 1, 'use default value when no value is provided')
 
+  simple.restore()
+
   t.end()
 })
 
@@ -157,6 +160,7 @@ test('Store.defaults overriden', function (t) {
     remote: 'test-db-remote',
     foo: 'baz'
   }
+  simple.mock(Store.internals, 'handleChanges').callFn(function () {})
 
   var defaults = Store.defaults(options)
 
@@ -165,5 +169,7 @@ test('Store.defaults overriden', function (t) {
   t.is(pouchDefaultStub.callCount, 0, 'default value is overridden')
   t.is(pouchOverrideStub.callCount, 1, 'overridden value is used')
 
+  simple.restore()
+
   t.end()
 })

tests/unit/add-one-test.js

@@ -7,20 +7,21 @@ test('add-one non-409 error', function (t) {
   t.plan(1)
 
   var non409Error = new Error('not a 409 error')
-  var state = {
-    db: {
-      put: simple.stub().rejectWith(non409Error)
-    }
-  }
+
+  simple.mock(addOne.internals, 'put').rejectWith(non409Error)
   simple.mock(addOne.internals, 'addTimestamps')
 
-  addOne(state, {})
+  var state = {}
+  var doc = {}
+  addOne(state, doc)
 
   .then(function () {
     t.fail('should throw an error')
   })
 
   .catch(function (error) {
     t.is(error, non409Error)
+
+    simple.restore()
   })
 })

tests/unit/bulkdocs-test.js

@@ -0,0 +1,14 @@
+var test = require('tape').test
+
+var bulkDocs = require('../../lib/helpers/db-bulk-docs')
+
+test('toNormalisedError non-409 error', function (t) {
+  var scope = {} // scope is not checked in this test, so it can be empty
+  var non409Error = new Error('not a 409 error')
+
+  var error = bulkDocs.internals.toNormalisedError(scope, non409Error, 0)
+
+  t.is(error, non409Error, 'a non-409 error is returned untouched')
+
+  t.end()
+})