[Tests] Optimizations; paths now stored centrally.

Author: nabil1337

tests/before.js

@@ -18,8 +18,9 @@ function createExampleProject(skip) {
 
     console.log('Trying to setup example project...');
 
+    var paths       = require('./paths');
     var TestProject = require('./helper/project.js');
-    var tp          = new TestProject('/tmp/greppy/');
+    var tp          = new TestProject(paths.exampleProject);
     var code;
 
     tp.showOutput = false;

tests/greppy/lib/app/workerTests.js

@@ -7,6 +7,7 @@
 var should = require('should');
 var path   = require('path');
 var root   = path.resolve(__dirname + '/../../../../');
+var paths  = require(root + '/tests/paths');
 var Worker = require(root + '/lib/app/worker');
 var wr     = null;
 
@@ -16,7 +17,7 @@ describe.skip('Worker', function() {
     var cwdBak = process.cwd();
 
     before(function() {
-        process.chdir('/tmp/greppy/project/');
+        process.chdir(paths.exampleProject);
         greppy = require(root + '/lib/greppy');
     });
 

tests/greppy/lib/configTests.js

@@ -10,12 +10,13 @@ var fs     = require('fs');
 var es     = require('execSync');
 var extend = require('extend');
 var root   = path.resolve(__dirname + '/../../../');
+var paths  = require(root + '/tests/paths');
 var Config = require(root + '/lib/config');
 var cg     = null;
 
 describe('Config', function() {
 
-    var configPath    = '/tmp/greppy/';
+    var configPath    = paths.temp + '/';
     var configFile    = 'config.js';
     var configMockup  = {
         propOne: {
@@ -273,7 +274,7 @@ describe('Config', function() {
         });
 
         it('should deep-merge a user defined config over the default config if deep is set to true', function() {
-            
+
             var expected = extend(true, {}, defaultMockup, userConfig);
 
             cg = new Config({

tests/greppy/lib/helper/projectTests.js

@@ -7,6 +7,7 @@
 var should         = require('should');
 var path           = require('path');
 var root           = path.resolve(__dirname + '/../../../../');
+var paths          = require(root + '/tests/paths');
 var validAppPath   = path.resolve('templates/project');
 var invalidAppPath = path.resolve('templates');
 var Project        = require(root + '/lib/helper/project');
@@ -111,7 +112,7 @@ describe('ProjectHelper', function() {
         var cwdBak        = process.cwd();
 
         beforeEach(function() {
-            curAppPath = '/tmp/greppy/project/';
+            curAppPath = paths.exampleProject;
 
             // create contextObject mockup
             contextObject = pt.listContexts(curAppPath);

tests/greppy/lib/helper/test/projectTests.js

@@ -7,47 +7,45 @@
 var should      = require('should');
 var path        = require('path');
 var fs          = require('fs');
-var root   = path.resolve(__dirname + '/../../../../../');
+var root        = path.resolve(__dirname + '/../../../../../');
 var TestProject = require(root + '/tests/helper/project');
 var tp          = null;
 
 describe('ProjectHelper for tests', function() {
 
-    describe('creating a test project', function() {
-        this.timeout(0);
+    this.timeout(0);
 
-        it('should have a default path configured', function() {
+    it('should have a default path configured', function() {
 
-            tp = new TestProject();
+        tp = new TestProject();
 
-            tp.path.should.be.a('string');
-            tp.path.should.match(/\/$/);
-        });
+        tp.path.should.be.a('string');
+        tp.path.should.match(/\/$/);
+    });
 
-        it('should init a default directory if no folder was specified', function(done) {
+    it('should init a default directory if no folder was specified', function(done) {
 
-            tp = new TestProject();
+        tp = new TestProject();
 
-            var path = tp.getTargetPath();
+        var pPath = tp.getPath();
 
-            // somehow, exists only seems to work when called more than once (at least on my system)
-            // so this needs to be reworked in the future
-            var result = fs.existsSync(path);
-            fs.exists(path, function(exists) {
-                exists.should.be.true;
-                done();
-            });
+        // somehow, exists only seems to work when called more than once (at least on my system)
+        // so this needs to be reworked in the future
+        var result = fs.existsSync(pPath);
+        fs.exists(pPath, function(exists) {
+            exists.should.be.true;
+            done();
         });
+    });
 
-        it('should create a test-project', function(done) {
+    it('should create a test-project', function(done) {
 
-            tp = new TestProject();
+        tp = new TestProject();
 
-            tp.createProject(function(exitCode) {
-                exitCode.should.equal(0);
-                tp.remove();
-                done();
-            });
+        tp.createProject(function(exitCode) {
+            exitCode.should.equal(0);
+            tp.remove();
+            done();
         });
     });
 });

tests/helper/loader/plain.js

@@ -1,6 +1,6 @@
 /**
  * The plain-loader is responsible for loading test-files
- * without special settings
+ * without special settings.
  *
  * @module greppy/helper/test/loader
  * @author Nabil Krause <nabil.krause@silberlicht.eu>

tests/helper/project.js

@@ -8,39 +8,33 @@
 var fs            = require('fs');
 var cp            = require('child_process');
 var es            = require('execSync');
-var greppyBinPath = __dirname + '/../../bin/greppy';
+var path          = require('path');
+var root          = path.resolve(__dirname + '/../../');
+var paths         = require(root + '/tests/paths');
+var greppyBinPath = root + '/bin/greppy';
 
 /**
  * @constructor
+ *
+ * @param {String} [path] The path used for creating the project
  */
 var Project = function(path)
 {
-    this.path          = path || '/tmp/greppy-test/';
-    this.directoryName = 'project';
+    this.path          = path || paths.temp + '/test-project/';
     this.showOutput    = false;
 
     // Create the given path
-    (require('node-fs')).mkdirSync(this.getTargetPath(), '0744', true);
-};
-
-/**
- * Get the name of the project directory.
- *
- * @returns {String}
- */
-Project.prototype.getDirectoryName = function()
-{
-    return this.directoryName;
+    (require('node-fs')).mkdirSync(this.getPath(), '0744', true);
 };
 
 /**
  * Get the builded target path.
  *
  * @returns {String}
  */
-Project.prototype.getTargetPath = function()
+Project.prototype.getPath = function()
 {
-    return this.path + this.directoryName + '/';
+    return path.resolve(this.path) + '/';
 };
 
 /**
@@ -50,7 +44,7 @@ Project.prototype.getTargetPath = function()
  */
 Project.prototype.exists = function()
 {
-    return fs.existsSync(this.getTargetPath());
+    return fs.existsSync(this.getPath());
 };
 
 /**
@@ -60,7 +54,7 @@ Project.prototype.exists = function()
  */
 Project.prototype.remove = function()
 {
-    es.run('rm -rf ' + this.getTargetPath());
+    es.run('rm -rf ' + this.getPath());
 };
 
 /**
@@ -70,8 +64,8 @@ Project.prototype.remove = function()
  */
 Project.prototype.clean = function()
 {
-    es.run('rm -rf ' + this.getTargetPath());
-    es.run('mkdir ' + this.getTargetPath());
+    es.run('rm -rf ' + this.getPath());
+    es.run('mkdir ' + this.getPath());
 };
 
 /**
@@ -88,7 +82,7 @@ Project.prototype.createProject = function(callback)
     }
 
     var ps = cp.spawn(greppyBinPath, ['--new=.'], {
-        cwd: this.getTargetPath()
+        cwd: this.getPath()
     });
 
     if (this.showOutput) {
@@ -120,7 +114,7 @@ Project.prototype.createProjectSync = function()
     var cwd = process.cwd();
     var result;
 
-    process.chdir(this.getTargetPath());
+    process.chdir(this.getPath());
     result = es[cmd](greppyBinPath + ' --new=.');
     result = (cmd === 'run') ? result : result.code;
     process.chdir(cwd);

tests/paths.js

@@ -0,0 +1,15 @@
+/**
+ * Relevant paths for tests or their helpers.
+ *
+ * @author Nabil Krause <nabil.krause@silberlicht.eu>
+ */
+
+var temp      = '/tmp/greppy-tests';
+var exProject = 'example-project'
+
+var paths = {
+    temp           : temp,
+    exampleProject : temp + '/' + exProject
+};
+
+module.exports = paths;

tests/start.js

@@ -17,10 +17,10 @@ var mocha = new Mocha({
 
 var tm    = new Manager(mocha, metas, testPath);
 
-//tm.setBefore(execBefore);
-//tm.setAfter(execAfter);
-//tm.enable('testTests');
-//tm.enable('hasTestProject');
+tm.setBefore(execBefore);
+tm.setAfter(execAfter);
+tm.enable('testTests');
+tm.enable('hasTestProject');
 
 tm.run();