Bugfix

mrijk · Apr 14, 2017 · 12b7679 · 12b7679
1 parent 4c8db7c
commit 12b7679
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/TODO b/TODO
@@ -1,7 +1,6 @@
 Still to implement:
 
 - create generators for all operators:
-  - and: fails on test '::even?', 0
   - keys
   - ...
 - conformKeys for mapOf

diff --git a/lib/conform.js b/lib/conform.js
@@ -17,7 +17,7 @@ function conform(spec, value) {
         if (_.isBoolean(result)) {
             return result ? value : invalidString;
         } else {
-            return result ? result : invalidString;
+            return result !== null ? result : invalidString;
         }
     }
 }

diff --git a/lib/exercise.js b/lib/exercise.js
@@ -5,7 +5,7 @@ const {sampleFromSpec} = require('./gen');
 
 function exercise(spec, n = 10) {
     const samples = [...sampleFromSpec(spec, n)];
-    
+
     return _.map(samples, sample => [sample, conform(spec, sample)]);
 }
 

diff --git a/test/and.js b/test/and.js
@@ -1,4 +1,4 @@
-'use strict';
+const _ = require('lodash');
 
 const {expect} = require('chai');;
 
@@ -15,7 +15,7 @@ describe('Test the and function', () => {
 
     it('should test the and of 2 specs', () => {
         s.def('::even?', s.and(isInteger, isEven));        
-        expect(s.conform('::even?', 12)).to.equal(12);
+        expect(s.conform('::even?', 0)).to.equal(0);
         expect(s.conform('::even?', 13)).to.equal(invalidString);
     });
 
@@ -26,8 +26,8 @@ describe('Test the and function', () => {
 
     it('should implement a generator', () => {
         s.def('::even?', s.and(isInteger, isEven));
-        console.log(s.exercise('::even?', 7));
-        expect(s.exercise('::even?', 7)).to.have.length(7);
+        expect(s.exercise('::even?', 7)).to.have.length(7)
+            .to.satisfy(sample => _.every(sample, ([v]) => isInteger(v) && isEven(v)));
     });
 });