Changes old test framework to avoid deprecated/ folder, changes deprecated folder required paths to previous ones

dresende · dresende · commit 28bd6550728c · 2013-06-12T16:26:52.000+01:00
diff --git a/test/integration/deprecated/test-settings.js b/test/integration/deprecated/test-settings.js
@@ -1,4 +1,4 @@
-var common     = require('../../common');
+var common     = require('../common');
 var assert     = require('assert');
 
 common.ORM.settings.set("some.sub.object", 123.45);
diff --git a/test/integration/deprecated/test-validators.js b/test/integration/deprecated/test-validators.js
@@ -1,6 +1,6 @@
-var common     = require('../../common');
+var common     = require('../common');
 var assert     = require('assert');
-var Validation = require('../../../lib/Validators');
+var Validation = require('../../lib/Validators');
 var _; // undefined
 
 Validation.rangeNumber(0, 10)(5, checkValidation());
diff --git a/test/run.js b/test/run.js
@@ -3,11 +3,13 @@ var Mocha = require('mocha'),
     path = require('path'),
     mocha = null,
     location = null;
-var options = {};
+var options = {
+  include: new RegExp("integration\\/test\\-.*\\.js$")
+};
 
 function runClassicTests() {
   if (process.env.FILTER) {
-    options.include = new RegExp(process.env.FILTER + '.*\\.js$');
+    options.include = new RegExp("integration\\/test\\-.*" + process.env.FILTER + '.*\\.js$');
   }
   process.stdout.write("\033[1;34m[i] \033[0;34mTesting \033[1;34m" + process.env.ORM_PROTOCOL + "\033[0m\n");
   process.stdout.write("\033[1;34m[i] \033[0;34mURI: \033[1;34m" + require('./common').getConnectionString() + "\033[0m\n");

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var common = require('../../common');`
	`1`	`+var common = require('../common');`
`2`	`2`	`var assert = require('assert');`
`3`	`3`
`4`	`4`	`common.ORM.settings.set("some.sub.object", 123.45);`