From eff9fc51cb10df87dc66843487469162cd044372 Mon Sep 17 00:00:00 2001
From: hacksalot <hacksalot@indevious.com>
Date: Mon, 4 Jan 2016 19:45:49 -0500
Subject: [PATCH] Integrate fresh-test-resumes module.

---
 package.json             |  3 +--
 test/test-cli.js         | 12 +++++++++---
 test/test-fresh-sheet.js |  4 ++--
 test/test-themes.js      |  4 ++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 5114290..a56199e 100644
--- a/package.json
+++ b/package.json
@@ -76,14 +76,13 @@
   },
   "devDependencies": {
     "chai": "*",
+    "fresh-test-resumes": "^0.1.0",
     "grunt": "*",
     "grunt-cli": "^0.1.13",
     "grunt-contrib-clean": "^0.7.0",
     "grunt-contrib-jshint": "^0.11.3",
     "grunt-contrib-yuidoc": "^0.10.0",
     "grunt-simple-mocha": "*",
-    "jane-q-fullstacker": "fluentdesk/jane-q-fullstacker",
-    "johnny-trouble-resume": "fluentdesk/johnny-trouble-resume",
     "jsonresume-theme-boilerplate": "^0.1.2",
     "jsonresume-theme-classy": "^1.0.9",
     "jsonresume-theme-modern": "0.0.18",
diff --git a/test/test-cli.js b/test/test-cli.js
index 9dda221..71dbd97 100644
--- a/test/test-cli.js
+++ b/test/test-cli.js
@@ -37,16 +37,22 @@ describe('Testing CLI interface', function () {
     run( 'new', ['test/sandbox/new-jrs-1.json', 'test/sandbox/new-jrs-2.json', 'test/sandbox/new-jrs-3.json'], [], opts, ' (multiple JRS resumes)' );
     fail( 'new', [], [], opts, " (when a filename isn't specified)" );
 
-    run( 'validate', ['node_modules/jane-q-fullstacker/resume/jane-resume.json'], [], opts, ' (jane-q-fullstacker|FRESH)' );
-    run( 'validate', ['node_modules/johnny-trouble-resume/src/johnny-trouble.fresh.json'], [], opts, ' (johnny-trouble|FRESH)' );
+    run( 'validate', ['node_modules/fresh-test-resumes/src/jane-fullstacker.fresh.json'], [], opts, ' (jane-q-fullstacker|FRESH)' );
+    run( 'validate', ['node_modules/fresh-test-resumes/src/johnny-trouble.fresh.json'], [], opts, ' (johnny-trouble|FRESH)' );
     run( 'validate', ['test/sandbox/new-fresh-resume.json'], [], opts, ' (new-fresh-resume|FRESH)' );
     run( 'validate', ['test/resumes/jrs-0.0.0/richard-hendriks.json'], [], opts2, ' (richard-hendriks.json|JRS)' );
     run( 'validate', ['test/resumes/jrs-0.0.0/jane-incomplete.json'], [], opts2, ' (jane-incomplete.json|JRS)' );
     run( 'validate', ['test/sandbox/new-1.json','test/sandbox/new-jrs-resume.json','test/sandbox/new-1.json', 'test/sandbox/new-2.json', 'test/sandbox/new-3.json'], [], opts, ' (5|BOTH)' );
 
-    run( 'analyze', ['node_modules/jane-q-fullstacker/resume/jane-resume.json'], [], opts, ' (jane-q-fullstacker|FRESH)' );
+    run( 'analyze', ['node_modules/fresh-test-resumes/src/jane-fullstacker.json'], [], opts, ' (jane-q-fullstacker|FRESH)' );
     run( 'analyze', ['test/resumes/jrs-0.0.0/richard-hendriks.json'], [], opts2, ' (richard-hendriks|JRS)' );
 
+    run( 'build',
+      [ 'node_modules/fresh-test-resumes/src/jane-fullstacker.fresh.json',
+        'node_modules/fresh-test-resumes/src/override/jane-fullstacker-override.fresh.json' ],
+      [ 'test/sandbox/merged/jane-fullstacker-gamedev.fresh.all'], opts, ' (jane-q-fullstacker w/ override|FRESH)'
+    );
+
     function run( verb, src, dst, opts, msg ) {
       msg = msg || '.';
       it( 'The ' + verb.toUpperCase() + ' command should SUCCEED' + msg, function () {
diff --git a/test/test-fresh-sheet.js b/test/test-fresh-sheet.js
index 3e55ed2..cb15c35 100644
--- a/test/test-fresh-sheet.js
+++ b/test/test-fresh-sheet.js
@@ -58,5 +58,5 @@ function testResume(opts) {
 }
 
 var sects = [ 'info', 'employment', 'service', 'skills', 'education', 'writing', 'recognition', 'references' ];
-testResume({ title: 'jane-q-fullstacker', path: 'node_modules/jane-q-fullstacker/resume/jane-resume.json', duration: 7, sections: sects });
-testResume({ title: 'johnny-trouble-resume', path: 'node_modules/johnny-trouble-resume/src/johnny-trouble.fresh.json', duration: 4, sections: sects });
+testResume({ title: 'jane-q-fullstacker', path: 'node_modules/fresh-test-resumes/src/jane-fullstacker.fresh.json', duration: 7, sections: sects });
+testResume({ title: 'johnny-trouble-resume', path: 'node_modules/fresh-test-resumes/src/johnny-trouble.fresh.json', duration: 4, sections: sects });
diff --git a/test/test-themes.js b/test/test-themes.js
index 94bd161..4d96c7d 100644
--- a/test/test-themes.js
+++ b/test/test-themes.js
@@ -76,8 +76,8 @@ function folderContains( needle, haystack ) {
   });
 }
 
-genThemes( 'jane-q-fullstacker', ['node_modules/jane-q-fullstacker/resume/jane-resume.json'], 'FRESH' );
-genThemes( 'johnny-trouble', ['node_modules/johnny-trouble-resume/src/johnny-trouble.fresh.json'], 'FRESH' );
+genThemes( 'jane-q-fullstacker', ['node_modules/fresh-test-resumes/src/jane-fullstacker.fresh.json'], 'FRESH' );
+genThemes( 'johnny-trouble', ['node_modules/fresh-test-resumes/src/johnny-trouble.fresh.json'], 'FRESH' );
 genThemes( 'richard-hendriks', ['test/resumes/jrs-0.0.0/richard-hendriks.json'], 'JRS' );
 
 describe('Verifying generated theme files...', function() {