More cleanup

mrijk · May 22, 2017 · 5d56e26 · 5d56e26
1 parent f3d4728
commit 5d56e26
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 23 deletions.
diff --git a/test/doubleIn.js b/test/doubleIn.js
@@ -3,7 +3,6 @@ const _ = require('lodash');
 const {expect} = require('chai');
 
 const s = require('../lib/spec');
-const stest = require('../lib/test');
 
 const {exerciseFunc, idemPotent} = require('./utils');
 

diff --git a/test/isInstInRange.js b/test/isInstInRange.js
@@ -1,7 +1,8 @@
 const {expect} = require('chai');
 
 const s = require('../lib/spec');
-const stest = require('../lib/test');
+
+const {check} = require('./utils');
 
 describe('Test isInstInRange function', () => {
     it('should return true if value is within range', () => {
@@ -26,10 +27,6 @@ describe('Test isInstInRange function', () => {
     });
 
     it('should use the spec to test', () => {
-        const instInRange = s.isInstInRange;
-        const specs = require('../specs/instInRange');
-        s.fdef(instInRange, specs);
-
-        expect(stest.check(instInRange)).to.have.property('result').to.equal(true);        
+        expect(check(s.isInstInRange, '../specs/instInRange')).to.have.property('result').to.equal(true);        
     });
 });
diff --git a/test/isIntInRange.js b/test/isIntInRange.js
@@ -1,7 +1,8 @@
 const {expect} = require('chai');
 
 const s = require('../lib/spec');
-const stest = require('../lib/test');
+
+const {check} = require('./utils');
 
 describe('Test isIntInRange? function', () => {
     it('should return true if value is within range', () => {
@@ -17,10 +18,6 @@ describe('Test isIntInRange? function', () => {
     });
 
     it('should use the spec to test', () => {
-        const intInRange = s.isIntInRange;
-        const specs = require('../specs/intInRange');
-        s.fdef(intInRange, specs);
-
-        expect(stest.check(intInRange)).to.have.property('result').to.equal(true);        
+        expect(check(s.isIntInRange, '../specs/intInRange')).to.have.property('result').to.equal(true);        
     });
 });
diff --git a/test/nilable.js b/test/nilable.js
@@ -3,7 +3,6 @@ const _ = require('lodash');
 const {expect} = require('chai');
 
 const s = require('../lib/spec');
-const stest = require('../lib/test');
 
 const {isNull, isString, unknownString} = s.utils;
 

diff --git a/test/question.js b/test/question.js
@@ -3,9 +3,8 @@ const _ = require('lodash');
 const {expect} = require('chai');;
 
 const s = require('../lib/spec');
-const stest = require('../lib/test');
 
-const {exerciseFunc, idemPotent} = require('./utils');
+const {check, exerciseFunc, idemPotent} = require('./utils');
 
 const {isInteger, isNull, isOdd, isString} = s.utils;
 
@@ -40,12 +39,7 @@ describe('Test the question (?) function', () => {
     });
 
     it('should use the spec to test', () => {
-        const question = s.question;
-        const specs = require('../specs/question');
-
-        s.fdef(question, specs);
-
-        expect(stest.check(question)).to.have.property('result').to.equal(true);        
+        expect(check(s.question, '../specs/question')).to.have.property('result').to.equal(true);
     });
 
     it('should exercise the question function', () => {

diff --git a/test/tuple.js b/test/tuple.js
@@ -3,7 +3,6 @@ const _ = require('lodash');
 const {expect} = require('chai');
 
 const s = require('../lib/spec');
-const stest = require('../lib/test');
 
 const {check, exerciseFunc, idemPotent} = require('./utils');