Move utils from test to lib

mrijk · Apr 13, 2017 · 6cfd9dc · 6cfd9dc
1 parent ac1372f
commit 6cfd9dc
Show file tree

Hide file tree

Showing 30 changed files with 30 additions and 40 deletions.
diff --git a/lib/spec.js b/lib/spec.js
@@ -41,5 +41,6 @@ module.exports = {
     question: require('./question'),
     star: require('./star'),
     test: require('./test'),
-    tuple: require('./tuple')
+    tuple: require('./tuple'),
+    utils: require('./utils')
 };
diff --git a/test/utils.js → lib/utils.js b/test/utils.js → lib/utils.js
@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 
 const isBoolean = _.isBoolean;

diff --git a/specs/intIn.js b/specs/intIn.js
@@ -1,6 +1,6 @@
 const s = require('../lib/spec');
 
-const {isInteger} = require('../test/utils');
+const {isInteger} = s.utils;
 
 module.exports = {
     args: s.cat(':start', isInteger, ':end', isInteger)

diff --git a/specs/intInRange.js b/specs/intInRange.js
@@ -1,6 +1,6 @@
 const s = require('../lib/spec');
 
-const {isBoolean, isInteger} = require('../test/utils');
+const {isBoolean, isInteger} = s.utils;
 
 module.exports = {
     args: s.cat('start', isInteger, 'end', isInteger, 'val', isInteger),

diff --git a/test/alt.js b/test/alt.js
@@ -1,12 +1,10 @@
-'use strict';
-
 const _ = require('lodash');
 
 const {expect} = require('chai');;
 
 const s = require('../lib/spec');
 
-const {isBoolean, isString} = require('./utils');
+const {isBoolean, isString} = s.utils;
 
 describe('Test the alt function', () => {
     s.def('::bool-or-string', s.alt(':s', isString, ':b', isBoolean));

diff --git a/test/amp.js b/test/amp.js
@@ -6,7 +6,7 @@ const {expect} = require('chai');
 
 const s = require('../lib/spec');
 
-const {isEven, isString} = require('./utils');
+const {isEven, isString} = s.utils;
 
 describe('Test the amp (&) function', () => {
     s.def('::even-strings', s.amp(s.star(isString), x => isEven(x.length)));

diff --git a/test/and.js b/test/and.js
@@ -4,7 +4,7 @@ const {expect} = require('chai');;
 
 const s = require('../lib/spec');
 
-const {isEven, isInteger, invalidString} = require('./utils');
+const {isEven, isInteger, invalidString} = s.utils;
 
 describe('Test the and function', () => {
     it('should test the and of 1 spec', () => {

diff --git a/test/assert.js b/test/assert.js
@@ -4,7 +4,7 @@ const {expect} = require('chai');;
 
 const s = require('../lib/spec');
 
-const {isString} = require('./utils');
+const {isString} = s.utils;
 
 describe('Test the assert functions', () => {
 

diff --git a/test/cat.js b/test/cat.js
@@ -6,7 +6,7 @@ const {expect} = require('chai');;
 
 const s = require('../lib/spec');
 
-const {isInteger, isNumber, isString} = require('./utils');
+const {isInteger, isNumber, isString} = s.utils;
 
 describe('Test the cat function', () => {
     s.def('::ingredient', s.cat(':quantity', isNumber, ':unit', isString));

diff --git a/test/collOf.js b/test/collOf.js
@@ -6,7 +6,7 @@ const {expect} = require('chai');
 
 const s = require('../lib/spec');
 
-const {isInteger, isNumber, isSet, isString, isVector} = require('./utils');
+const {isInteger, isNumber, isSet, isString, isVector} = s.utils;
 
 describe('Test the collOf function', () => {
     s.def('::vnum3', s.collOf(isNumber, {kind: isVector, count: 3, distinct: true}));

diff --git a/test/conform.js b/test/conform.js
@@ -4,7 +4,7 @@ const {expect} = require('chai');
 
 const s = require('../lib/spec');
 
-const {isInteger} = require('./utils');
+const {isInteger} = s.utils;
 
 describe('Test the conform function', () => {
     s.def('::a', isInteger);

diff --git a/test/doubleIn.js b/test/doubleIn.js
@@ -6,7 +6,7 @@ const {expect} = require('chai');
 
 const s = require('../lib/spec');
 
-const {isDouble} = require('./utils');
+const {isDouble} = s.utils;
 
 describe('Test the doubleIn function', () => {
     s.def('::percentage', s.doubleIn({min: 0.0, max: 100.0}));

diff --git a/test/every.js b/test/every.js
@@ -6,7 +6,5 @@ const {expect} = require('chai');
 
 const s = require('../lib/spec');
 
-const {isInteger, isNumber, isSet, isString, isVector} = require('./utils');
-
 describe('Test the every function', () => {
 });
diff --git a/test/everyKv.js b/test/everyKv.js
@@ -6,7 +6,5 @@ const {expect} = require('chai');
 
 const s = require('../lib/spec');
 
-const {isInteger, isNumber, isSet, isString, isVector} = require('./utils');
-
 describe('Test the everyKv function', () => {
 });
diff --git a/test/exercise.js b/test/exercise.js
@@ -6,7 +6,7 @@ const {expect} = require('chai');;
 
 const s = require('../lib/spec');
 
-const {isInteger, isNull, isString, isBoolean} = require('./utils');
+const {isInteger, isNull, isString, isBoolean} = s.utils;
 
 describe('Test the exercise function', () => {
     it('should generate 10 integers', () => {

diff --git a/test/exerciseFn.js b/test/exerciseFn.js
@@ -4,7 +4,7 @@ const {expect} = require('chai');;
 
 const s = require('../lib/spec');
 
-const {isInteger} = require('./utils');
+const {isInteger} = s.utils;
 
 describe('Test the exerciseFn function', () => {
     it('call function', () => {

diff --git a/test/explain.js b/test/explain.js
@@ -4,7 +4,7 @@ const {expect} = require('chai');;
 
 const s = require('../lib/spec');
 
-const {isString} = require('./utils');
+const {isString} = s.utils;
 
 describe('Test the explain function', () => {
     it('should return the explanation string success', () => {

diff --git a/test/gen.js b/test/gen.js
@@ -2,9 +2,9 @@
 
 const {expect} = require('chai')
 
-const {isInt, isString} = require('./utils');
-
 const s = require('../lib/spec');
+const {isInt, isString} = s.utils;
+
 const gen = require('../lib/gen');
 
 describe('Test node.spec.gen functions', () => {

diff --git a/test/isValid.js b/test/isValid.js
@@ -4,7 +4,7 @@ const {expect} = require('chai');;
 
 const s = require('../lib/spec');
 
-const {isInteger, isOdd} = require('./utils');
+const {isInteger, isOdd} = s.utils;
 
 describe('Test the isValid function', () => {
     it('should return true when a value meets a spec', () => {

diff --git a/test/keys.js b/test/keys.js
@@ -6,7 +6,7 @@ const {expect} = require('chai');
 
 const s = require('../lib/spec');
 
-const {isString} = require('./utils');
+const {isString} = s.utils;
 
 describe('Test the keys function', () => {
     const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,63}$/

diff --git a/test/mapOf.js b/test/mapOf.js
@@ -6,7 +6,7 @@ const {expect} = require('chai');
 
 const s = require('../lib/spec');
 
-const {isInteger, isString} = require('./utils');
+const {isInteger, isString} = s.utils;
 
 describe('Test the mapOf function', () => {
     s.def('::scores', s.mapOf(isString, isInteger));

diff --git a/test/merge.js b/test/merge.js
@@ -4,7 +4,7 @@ const {expect} = require('chai');;
 
 const s = require('../lib/spec');
 
-const {isBoolean, isString} = require('./utils');
+const {isBoolean, isString} = s.utils;
 
 describe('Test the merge function', () => {
     it('should merge a spec', () => {

diff --git a/test/nilable.js b/test/nilable.js
@@ -6,7 +6,7 @@ const {expect} = require('chai');
 
 const s = require('../lib/spec');
 
-const {isNull, isString} = require('./utils');
+const {isNull, isString} = s.utils;
 
 describe('Test the nilable function', () => {
     it('should create a spec that allows null as a valid value', () => {

diff --git a/test/or.js b/test/or.js
@@ -6,7 +6,7 @@ const {expect} = require('chai');;
 
 const s = require('../lib/spec');
 
-const {isInt, isInteger, isString} = require('./utils');
+const {isInt, isInteger, isString} = s.utils;
 
 describe('Test the or function', () => {
 

diff --git a/test/plus.js b/test/plus.js
@@ -6,7 +6,7 @@ const {expect} = require('chai');
 
 const s = require('../lib/spec');
 
-const {isInteger, isOdd, invalidString} = require('./utils');
+const {isInteger, isOdd, invalidString} = s.utils;
 
 describe('Test the plus (+) function', () => {
     s.def('::odd?', s.and(isInteger, isOdd));

diff --git a/test/question.js b/test/question.js
@@ -6,7 +6,7 @@ const {expect} = require('chai');;
 
 const s = require('../lib/spec');
 
-const {isInteger, isNull, isOdd, isString} = require('./utils');
+const {isInteger, isNull, isOdd, isString} = s.utils;
 
 describe('Test the question (?) function', () => {
     s.def('::odd?', s.and(isInteger, isOdd));

diff --git a/test/spec.js b/test/spec.js
@@ -1,12 +1,9 @@
-'use strict';
-
 const {expect} = require('chai');
 
-const {isOdd, isInteger, isString, invalidString} = require('./utils');
+const s = require('../lib/spec');
+const {isOdd, isInteger, isString, invalidString} = s.utils;
 
 describe('Test node.spec functions', () => {
-    const s = require('../lib/spec');
-
     const suit = [':club', ':diamond', ':heart', ':spade'];
 
     describe('Test the define function', () => {

diff --git a/test/star.js b/test/star.js
@@ -6,7 +6,7 @@ const {expect} = require('chai');
 
 const s = require('../lib/spec');
 
-const {isInteger, isOdd} = require('./utils');
+const {isInteger, isOdd} = s.utils;
 
 describe('Test the star (*) function', () => {
     s.def('::odd?', s.and(isInteger, isOdd));

diff --git a/test/test/check.js b/test/test/check.js
@@ -5,7 +5,7 @@ const {expect} = require('chai');;
 const s = require('../../lib/spec');
 const stest = require('../../lib/test');
 
-const {isInteger} = require('../utils');
+const {isInteger} = s.utils;
 
 describe('Test check function', () => {
     it('should have result ok when the function is called with valid parameters and return value', () => {

diff --git a/test/tuple.js b/test/tuple.js
@@ -6,7 +6,7 @@ const {expect} = require('chai');
 
 const s = require('../lib/spec');
 
-const {isDouble, isInteger, isString} = require('./utils');
+const {isDouble, isInteger, isString} = s.utils;
 
 describe('Test the tuple function', () => {
     s.def('::point', s.tuple(isDouble, isDouble, isDouble));