Merge pull request #5 from DNAinfo/improvement/handle-put-arrays

Improvement/handle put arrays
timbuckley · Feb 3, 2017 · c69b324 · c69b324
2 parents 770877e + 4429f7b
commit c69b324
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/src/index.js b/src/index.js
@@ -6,6 +6,13 @@ const bool = o => !!o
 
 const isPut = obj => bool(obj && Object.keys(obj).includes('PUT'))
 
+const isNestedPut = arr => bool(
+  arr &&
+  arr.every &&
+  arr.length > 0 &&
+  arr.every(element => isPut(element))
+)
+
 const isNestedArray = arr => bool(
   arr &&
   arr.every && // Is an array
@@ -60,7 +67,7 @@ function sagaTestEngine(genFunc, envMapping, ...initialArgs) {
     const isFirstLoop = counter === 0
     const nextValFound = nextVal !== undefined
     const yieldedUndefined = val === undefined
-    const yieldedEffectIsPut = isPut(val)
+    const yieldedEffectIsPut = isPut(val) || isNestedPut(val)
     assert(
       (isFirstLoop || nextValFound || yieldedUndefined || yieldedEffectIsPut),
       `Env Mapping is missing a value for ${JSON.stringify(val, null, 2)}`)
@@ -78,4 +85,4 @@ function sagaTestEngine(genFunc, envMapping, ...initialArgs) {
   return puts
 }
 
-module.exports = { sagaTestEngine, isPut, isNestedArray, getNextVal, assert }
+module.exports = { sagaTestEngine, isPut, isNestedPut, isNestedArray, getNextVal, assert }
diff --git a/tests/index.js b/tests/index.js
@@ -5,6 +5,7 @@ const {
   sagaTestEngine,
   isPut,
   isNestedArray,
+  isNestedPut,
 } = require('../src')
 const {
   favSagaWorker,
@@ -31,6 +32,28 @@ test('isPut correctly identifies a PUT Saga Effect', t => {
 })
 
 
+test('isNestedPut correctly identifies an array of PUT Saga Effects', t => {
+  t.false(isNestedPut())
+  t.false(isNestedPut({}))
+  t.false(isNestedPut([]))
+  t.false(isNestedPut(put))
+  t.false(isNestedPut(call))
+  t.false(isNestedPut(select))
+  t.false(isNestedPut(call(() => 'call')))
+  t.false(isNestedPut(select(() => 'select')))
+  t.false(isNestedPut({CALL: 'someting'}))
+  t.false(isNestedPut(put({})))
+  t.false(isNestedPut({PUT: 'someting'}))
+
+  t.true(isNestedPut([{PUT: 'someting'}]))
+  t.true(isNestedPut([put({})]))
+  t.true(isNestedPut([put({}), put({}), put({})]))
+
+  t.false(isNestedPut([call(() => 1)]))
+  t.false(isNestedPut([put({}), select(() => 1), put({})]))
+})
+
+
 test('isNestedArray correctly identifies a nested array', t => {
   t.false(isNestedArray())
   t.false(isNestedArray(1))
@@ -101,6 +124,18 @@ test('sagaTestEngine throws under bad conditions', t => {
   const goodMapping3 = [[undefined, undefined]]
   t.notThrows(() => sagaTestEngine(f3, goodMapping3))
 
+  const f4 = function*() {
+    yield [put({a: 1})]
+  }
+  t.notThrows(
+    () => sagaTestEngine(f4, goodMapping3),
+    'Correctly handles nested array of puts'
+  )
+
+  const f5 = function*() {
+    yield [select(() => 1)]
+  }
+  t.throws(() => sagaTestEngine(f5, goodMapping3))
 })