From a968707134dd948c83de672b736fb556f06c58e1 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Fri, 2 Oct 2015 15:39:49 +0200
Subject: [PATCH] Fix foxx-manager test for running in arangosh

---
 ...ghtly.js => shell-foxx-manager-nightly-spec.js} |  2 +-
 js/common/modules/org/arangodb/testrunner.js       | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename js/client/tests/{shell-foxx-manager-spec-nightly.js => shell-foxx-manager-nightly-spec.js} (98%)

diff --git a/js/client/tests/shell-foxx-manager-spec-nightly.js b/js/client/tests/shell-foxx-manager-nightly-spec.js
similarity index 98%
rename from js/client/tests/shell-foxx-manager-spec-nightly.js
rename to js/client/tests/shell-foxx-manager-nightly-spec.js
index 318505bf2e..74911994b3 100644
--- a/js/client/tests/shell-foxx-manager-spec-nightly.js
+++ b/js/client/tests/shell-foxx-manager-nightly-spec.js
@@ -33,7 +33,7 @@
 var FoxxManager = require("org/arangodb/foxx/manager");
 var fs = require("fs");
 var db = require("internal").db;
-var basePath = fs.makeAbsolute(fs.join(module.startupPath(), "common", "test-data", "apps"));
+var basePath = fs.makeAbsolute(fs.join(require("internal").startupPath, "common", "test-data", "apps"));
 var arango = require("org/arangodb").arango;
 var originalEndpoint = arango.getEndpoint().replace(/localhost/, '127.0.0.1');
 
diff --git a/js/common/modules/org/arangodb/testrunner.js b/js/common/modules/org/arangodb/testrunner.js
index 80063e3ae4..3f35546dc7 100644
--- a/js/common/modules/org/arangodb/testrunner.js
+++ b/js/common/modules/org/arangodb/testrunner.js
@@ -14,13 +14,13 @@ function runJSUnityTests(tests) {
   var allResults = [];
   var res;
 
+  // find out whether we're on server or client...
+  var runenvironment = "arangod";
+  if (typeof(require('internal').arango) === 'object') {
+    runenvironment = "arangosh";
+  }
+  
   _.each(tests, function (file) {
-    // find out whether we're on server or client...
-    var runenvironment = "arangod";
-    if (typeof(require('internal').arango) === 'object') {
-      runenvironment = "arangosh";
-    }
-
     if (result) {
       print("\n" + Date() + " " + runenvironment + ": Running JSUnity test from file '" + file + "'");
     } else {
@@ -69,7 +69,7 @@ function runCommandLineTests(opts) {
     options = opts || {},
     jasmineReportFormat = options.jasmineReportFormat || 'progress',
     unitTests = internal.unitTests(),
-    isSpecRegEx = /.+spec\.js/,
+    isSpecRegEx = /.+-spec.*\.js/,
     isSpec = function (unitTest) {
       return isSpecRegEx.test(unitTest);
     },