8000 Search node_modules in parent directories until the root is reached by jazzzz · Pull Request #991 · casperjs/casperjs · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Jun 19, 2020. It is now read-only.

Search node_modules in parent directories until the root is reached #991

Merged
merged 2 commits into from
Aug 1, 2014
Merged

Search node_modules in parent directories until the root is reached #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f20b9eb
Search node_modules in parent directories until the root is reached (…
jazzzz Jul 31, 2014
2d6583a
Added test for node_modules in parent directory
jazzzz Aug 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion bin/bootstrap.js
View file
Open in desktop 8000
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,14 @@ CasperError.prototype = Object.getPrototypeOf(new Error());
return resolveFile(path, fs.pathJoin(phantom.casperPath, 'modules'));
}
function nodeModulePath(path) {
return resolveFile(path, fs.pathJoin(getCurrentScriptRoot(), 'node_modules'));
var resolved, prevBaseDir;
var baseDir = getCurrentScriptRoot();
do {
resolved = resolveFile(path, fs.pathJoin(baseDir, 'node_modules'));
prevBaseDir = baseDir;
baseDir = fs.absolute(fs.pathJoin(prevBaseDir, '..'));
} while (!resolved && baseDir !== '/' && baseDir !== prevBaseDir);
return resolved;
}
function localModulePath(path) {
return resolveFile(path, phantom.casperScriptBaseDir || fs.workingDirectory);
Expand Down
4 changes: 4 additions & 0 deletions tests/clitests/modules/test_node_subdir/test_node_mod.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
var casper = require('casper').create();
var foo = require('foo');
console.log(foo);
casper.exit();
4 changes: 4 additions & 0 deletions tests/clitests/runtests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,10 @@ def test_node_module_require_json_package(self):
def test_node_module_require_json(self):
self.assertCommandOutputEquals('./test_node_json.js', '42')

@timeout(20)
def test_node_module_require_subdir(self):
self.assertCommandOutputEquals('./test_node_subdir/test_node_mod.js', '42')


class ScriptOutputTest(CasperExecTestBase):
@timeout(20)
Expand Down
0