yield tests and fixes

SomeKittens · May 9, 2014 · 7283a89 · 7283a89
1 parent 9a9aec1
commit 7283a89
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 19 deletions.
diff --git a/lib/yield.js b/lib/yield.js
@@ -1,5 +1,7 @@
 'use strict';
 
+/* jshint esnext: true */
+
 // In separate file to avoid syntax errors in older versions of node
 // Currently only works when starting at one.
 
@@ -21,10 +23,15 @@ var buzz = function *() {
   }
 };
 
-var fizzGen = fizz()
-  , buzzGen = buzz();
+var fizzGen, buzzGen;
+
+var reset = function() {
+  fizzGen = fizz();
+  buzzGen = buzz();
+};
 
 module.exports = function fizzbuzz(e, s, out) {
+  reset();
   if (e - 1 % 3 !== 0) {
     console.error('Yield method only works with numbers in the sequence 1, 4, 7...');
     process.exit(1);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "interview",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "A collection of command line tools for snarky answers to generic interview questions",
   "main": "bin/fizzbuzz",
   "bin": {
@@ -9,7 +9,7 @@
   },
   "preferGlobal": true,
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "mocha --harmony"
   },
   "repository": {
     "type": "git",

diff --git a/test/fizz.js b/test/fizz.js
@@ -4,7 +4,8 @@ var should = require('should');
 
 var oneto100 = require('./ans/1-100.json');
 
-var standard = require('../lib/standard');
+var standardFizz = require('../lib/standard')
+  , yieldFizz = require('../lib/yield');
 
 describe('fizzbuzz', function() {
   var results = []
@@ -14,20 +15,42 @@ describe('fizzbuzz', function() {
   beforeEach(function() {
     results = [];
   });
-  it('should run through the basic fizzbuzz test', function() {
-    standard(1, 100, addToResults);
 
-    results.length.should.eql(100);
-    for (var i = 0; i < 100; i++) {
-      results[i].should.eql(oneto100[i]);
-    }
+  describe('standard', function() {
+    it('should run through the basic fizzbuzz test', function() {
+      standardFizz(1, 100, addToResults);
+
+      results.length.should.eql(100);
+      for (var i = 0; i < 100; i++) {
+        results[i].should.eql(oneto100[i]);
+      }
+    });
+    it('works on numbers other than 1-100', function() {
+      standardFizz(1, 10, addToResults);
+
+      results.length.should.eql(10);
+      for (var i = 0; i < 10; i++) {
+        results[i].should.eql(oneto100[i]);
+      }
+    });
+  });
+
+  describe('yield', function() {
+    it('should run through the basic fizzbuzz test', function() {
+      yieldFizz(1, 100, addToResults);
+
+      results.length.should.eql(100);
+      for (var i = 0; i < 100; i++) {
+        results[i].should.eql(oneto100[i]);
+      }
+    });
+    it('works on numbers other than 1-100', function() {
+      yieldFizz(1, 10, addToResults);
+
+      results.length.should.eql(10);
+      for (var i = 0; i < 10; i++) {
+        results[i].should.eql(oneto100[i]);
+      }
+    });
   });
-  it('works on numbers other than 1-100', function() {
-    standard(1, 10, addToResults);
-
-    results.length.should.eql(10);
-    for (var i = 0; i < 10; i++) {
-      results[i].should.eql(oneto100[i]);
-    }
-  })
 });