summaryrefslogtreecommitdiff
path: root/test/fixtures/json-with-directory-name-module
diff options
context:
space:
mode:
authorRobert Kowalski <rok@kowalski.gd>2014-02-10 21:14:53 +0100
committerBen Noordhuis <info@bnoordhuis.nl>2014-12-06 22:14:05 +0100
commit36777d2a5f4f8da938edf9290fb74e381bfdb644 (patch)
treefc16ff1e8bbd6c1f1409ce01f9b834250c1831b0 /test/fixtures/json-with-directory-name-module
parent3ac494195319efb9c923c0ee89b6e0f2617d53ef (diff)
downloadandroid-node-v8-36777d2a5f4f8da938edf9290fb74e381bfdb644.tar.gz
android-node-v8-36777d2a5f4f8da938edf9290fb74e381bfdb644.tar.bz2
android-node-v8-36777d2a5f4f8da938edf9290fb74e381bfdb644.zip
module: test for directories, fix require with ..
Given my home-directory is `/Users/rocko` - and I have a file named `npm.json` in it and also a repository with name `npm`, which is a folder for the node-module. When try to require the `/Users/rocko/npm/index.js` two direcotry levels down in the npm folder (e.g. `/Users/rocko/npm/test/tap`) with require("../../") node will load `/Users/rocko/npm/index.json`. When I use require("../..") node will load `/Users/rocko/npm.json` which is fixed by this commit. PR-URL: https://github.com/iojs/io.js/pull/58 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-by: Chris Dickinson <christopher.s.dickinson@gmail.com> Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'test/fixtures/json-with-directory-name-module')
-rw-r--r--test/fixtures/json-with-directory-name-module/module-stub.json1
-rw-r--r--test/fixtures/json-with-directory-name-module/module-stub/index.js22
-rw-r--r--test/fixtures/json-with-directory-name-module/module-stub/one-trailing-slash/two/three.js22
-rw-r--r--test/fixtures/json-with-directory-name-module/module-stub/one/two/three.js22
-rw-r--r--test/fixtures/json-with-directory-name-module/module-stub/package.json7
5 files changed, 74 insertions, 0 deletions
diff --git a/test/fixtures/json-with-directory-name-module/module-stub.json b/test/fixtures/json-with-directory-name-module/module-stub.json
new file mode 100644
index 0000000000..472a445adb
--- /dev/null
+++ b/test/fixtures/json-with-directory-name-module/module-stub.json
@@ -0,0 +1 @@
+{"rocko": "artischocko"}
diff --git a/test/fixtures/json-with-directory-name-module/module-stub/index.js b/test/fixtures/json-with-directory-name-module/module-stub/index.js
new file mode 100644
index 0000000000..5cbb00b63c
--- /dev/null
+++ b/test/fixtures/json-with-directory-name-module/module-stub/index.js
@@ -0,0 +1,22 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module.exports = "hello from module-stub!"
diff --git a/test/fixtures/json-with-directory-name-module/module-stub/one-trailing-slash/two/three.js b/test/fixtures/json-with-directory-name-module/module-stub/one-trailing-slash/two/three.js
new file mode 100644
index 0000000000..a02399ef8b
--- /dev/null
+++ b/test/fixtures/json-with-directory-name-module/module-stub/one-trailing-slash/two/three.js
@@ -0,0 +1,22 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module.exports = require('../../');
diff --git a/test/fixtures/json-with-directory-name-module/module-stub/one/two/three.js b/test/fixtures/json-with-directory-name-module/module-stub/one/two/three.js
new file mode 100644
index 0000000000..19025cdc74
--- /dev/null
+++ b/test/fixtures/json-with-directory-name-module/module-stub/one/two/three.js
@@ -0,0 +1,22 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module.exports = require('../..');
diff --git a/test/fixtures/json-with-directory-name-module/module-stub/package.json b/test/fixtures/json-with-directory-name-module/module-stub/package.json
new file mode 100644
index 0000000000..4c380f620b
--- /dev/null
+++ b/test/fixtures/json-with-directory-name-module/module-stub/package.json
@@ -0,0 +1,7 @@
+{
+ "version": "1.1.12",
+ "name": "module-stub",
+ "main": "./index.js",
+ "description": "A stub for node tests",
+ "author": "Robert Kowalski <rok@kowalski.gd>"
+}