diff --git a/js/common/bootstrap/modules.js b/js/common/bootstrap/modules.js index a28be76f6d..777e17f1f9 100644 --- a/js/common/bootstrap/modules.js +++ b/js/common/bootstrap/modules.js @@ -91,7 +91,7 @@ function hasOwnProperty(obj, prop) { function createRequire(module) { function require(path) { - return module.require(path.replace(/^org\/arangodb/, '@arangodb')); + return module.require(path); } require.resolve = function(request) { @@ -406,6 +406,7 @@ function isGlobalModule(filename) { // Then have it load the file contents before returning its exports // object. Module._load = function(request, parent, isMain) { + request = request.replace(/^org\/arangodb/, '@arangodb'); var filename = request; var dbModule = false; diff --git a/js/common/tests/shell-attributes.js b/js/common/tests/shell-attributes.js index b5235331c2..4613b70999 100644 --- a/js/common/tests/shell-attributes.js +++ b/js/common/tests/shell-attributes.js @@ -571,16 +571,16 @@ function AttributesSuite () { "@collection" : c.name() }).toArray().sort(); - assertEqual(3, result.length); - assertEqual([ "first", "second", "third" ], result); + assertEqual(2, result.length); + assertEqual([ "first", "third" ], result); result = db._query("FOR doc IN @@collection FILTER V8(LIKE(doc.value, '\u0000%')) " + "SORT doc._key RETURN doc._key", { "@collection" : c.name() }).toArray().sort(); - assertEqual(3, result.length); - assertEqual([ "first", "second", "third" ], result); + assertEqual(2, result.length); + assertEqual([ "first", "third" ], result); } };