Skip to content

Commit 58c02af

Browse files
maxkorpmaxkorp
committed
handle pathing better for all tests
1 parent fc434a9 commit 58c02af

22 files changed

+139
-122
lines changed

‎test/runner.js‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,33 @@
11
var promisify = require("promisify-node");
22
var fse = promisify("fs-extra");
3+
var path = require("path");
4+
var local = path.join.bind(path, __dirname);
35

46
// Have to wrap exec, since it has a weird callback signature.
57
var exec = promisify(function(command, opts, callback) {
68
return require("child_process").exec(command, opts, callback);
79
});
810

9-
before(function(done) {
11+
before(function() {
1012
this.timeout(350000);
1113

1214
var url = "https://github.com/nodegit/test";
13-
var done = done.bind(null, null);
15+
fse.removeSync(local("repos"));
1416

15-
function initEmpty() {
16-
return exec("git init test/repos/empty");
17-
}
18-
19-
fse.removeSync("test/repos")
20-
21-
fse.mkdir("test/repos").then(initEmpty, initEmpty)
17+
return fse.mkdir(local("repos"))
18+
.then(function() {
19+
return exec("git init " + local("repos", "empty"));
20+
})
2221
.then(function() {
23-
return exec("git clone " + url + " test/repos/workdir");
22+
return exec("git clone " + url + " " + local("repos", "workdir"));
2423
}).then(function() {
25-
return exec("git checkout rev-walk", {cwd: "test/repos/workdir"})
24+
return exec("git checkout rev-walk", {cwd: local("repos", "workdir")})
2625
}).then(function() {
27-
return exec("git checkout master", {cwd: "test/repos/workdir"})
26+
return exec("git checkout master", {cwd: local("repos", "workdir")})
2827
}).then(function() {
29-
var nonrepo = "test/repos/nonrepo";
30-
31-
function writeBogus() {
32-
return fse.writeFile(nonrepo + "/file.txt", "This is a bogus file");
33-
}
34-
35-
return fse.mkdir(nonrepo).then(writeBogus, writeBogus);
36-
}).then(done, done);
28+
return fse.mkdir(local("repos", "nonrepo"));
29+
}).then(function() {
30+
return fse.writeFile(local("repos", "nonrepo", "file.txt"),
31+
"This is a bogus file");
32+
});
3733
});

‎test/tests/attr.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
var assert = require("assert");
22
var path = require("path");
3+
var local = path.join.bind(path, __dirname);
34

45
describe("Attr", function() {
5-
var reposPath = path.resolve("test/repos/workdir/.git");
6+
var reposPath = local("../repos/workdir/.git");
67

7-
var Repository = require("../../lib/repository");
8-
var Attr = require("../../lib/attr");
9-
var Status = require("../../lib/status");
8+
var Repository = require(local("../../lib/repository"));
9+
var Attr = require(local("../../lib/attr"));
10+
var Status = require(local("../../lib/status"));
1011

1112
before(function() {
1213
var test = this;

‎test/tests/blob.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
var assert = require("assert");
22
var path = require("path");
3+
var local = path.join.bind(path, __dirname);
34

45
describe("Blob", function() {
5-
var reposPath = path.resolve("test/repos/workdir/.git");
6+
var reposPath = local("../repos/workdir/.git");
67
var oid = "111dd657329797f6165f52f5085f61ac976dcf04";
78

8-
var Oid = require("../../lib/oid");
9-
var Repository = require("../../lib/repository");
10-
var FileMode = require("../../lib/tree_entry").FILEMODE;
9+
var Oid = require(local("../../lib/oid"));
10+
var Repository = require(local("../../lib/repository"));
11+
var FileMode = require(local("../../lib/tree_entry")).FILEMODE;
1112

1213
before(function() {
1314
var test = this;

‎test/tests/branch.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
var assert = require("assert");
22
var path = require("path");
3+
var local = path.join.bind(path, __dirname);
34

45
describe("Branch", function() {
5-
var reposPath = path.resolve("test/repos/workdir/.git");
6+
var reposPath = local("../repos/workdir/.git");
67

7-
var Repository = require("../../lib/repository");
8-
var Branch = require("../../lib/branch");
8+
var Repository = require(local("../../lib/repository"));
9+
var Branch = require(local("../../lib/branch"));
910
var branchName = "test-branch";
1011
var fullBranchName = "refs/heads/" + branchName;
1112

‎test/tests/checkout.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
var assert = require("assert");
22
var path = require("path");
3+
var local = path.join.bind(path, __dirname);
34

45
describe("Checkout", function() {
56
var packageJsonOid = "0fa56e90e096a4c24c785206b826ab914ea3de1e";
6-
var reposPath = path.resolve("test/repos/workdir/.git");
7+
var reposPath = local("../repos/workdir/.git");
78

8-
var Repository = require("../../lib/repository");
9-
var Checkout = require("../../lib/checkout");
9+
var Repository = require(local("../../lib/repository"));
10+
var Checkout = require(local("../../lib/checkout"));
1011

1112
before(function() {
1213
var test = this;

‎test/tests/clone.js‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,23 @@ var path = require("path");
33
var Promise = require("nodegit-promise");
44
var promisify = require("promisify-node");
55
var fse = promisify(require("fs-extra"));
6+
var local = path.join.bind(path, __dirname);
67
var fixAppveyor = process.env.APPVEYOR ? describe.skip : describe;
78

89
fixAppveyor("Clone", function() {
9-
var http = path.resolve("test/repos/http");
10-
var https = path.resolve("test/repos/https");
11-
var ssh = path.resolve("test/repos/ssh");
12-
var sshManual = path.resolve("test/repos/sshmanual");
13-
var git = path.resolve("test/repos/git");
14-
var file = path.resolve("test/repos/file");
10+
var http = local("../repos/http");
11+
var https = local("../repos/https");
12+
var ssh = local("../repos/ssh");
13+
var sshManual = local("../repos/sshmanual");
14+
var git = local("../repos/git");
15+
var file = local("../repos/file");
1516

16-
var sshPublicKey = path.resolve("./id_rsa.pub");
17-
var sshPrivateKey = path.resolve("./id_rsa");
17+
var sshPublicKey = local("../id_rsa.pub");
18+
var sshPrivateKey = local("../id_rsa");
1819

19-
var Repository = require("../../lib/repository");
20-
var Clone = require("../../lib/clone");
21-
var NodeGit = require("../../");
20+
var Repository = require(local("../../lib/repository"));
21+
var Clone = require(local("../../lib/clone"));
22+
var NodeGit = require(local("../../"));
2223

2324
// Set a reasonable timeout here now that our repository has grown.
2425
this.timeout(15000);
@@ -98,7 +99,7 @@ fixAppveyor("Clone", function() {
9899

99100
it("can clone with filesystem", function() {
100101
var prefix = process.platform === "win32" ? "" : "file://";
101-
var url = prefix + path.resolve("test/repos/empty");
102+
var url = prefix + local("../repos/empty");
102103

103104
return Clone.clone(url, file).then(function(repository) {
104105
assert.ok(repository instanceof Repository);

‎test/tests/commit.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ var path = require("path");
33
var Promise = require("nodegit-promise");
44
var promisify = require("promisify-node");
55
var fse = promisify(require("fs-extra"));
6+
var local = path.join.bind(path, __dirname);
67

7-
var NodeGit = require("../../");
8+
var NodeGit = require(local("../../"));
89
var Repository = NodeGit.Repository;
910

1011
describe("Commit", function() {
11-
var reposPath = path.resolve("test/repos/workdir/.git");
12+
var reposPath = local("../repos/workdir/.git");
1213
var oid = "fce88902e66c72b5b93e75bdb5ae717038b221f6";
1314

1415
beforeEach(function() {

‎test/tests/cred.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
var assert = require("assert");
22
var path = require("path");
3+
var local = path.join.bind(path, __dirname);
34

45
describe("Cred", function() {
5-
var NodeGit = require("../../");
6-
var sshPublicKey = path.resolve("./id_rsa.pub");
7-
var sshPrivateKey = path.resolve("./id_rsa");
6+
var NodeGit = require(local("../../"));
7+
var sshPublicKey = local("../id_rsa.pub");
8+
var sshPrivateKey = local("../id_rsa");
89

910
it("can create default credentials", function() {
1011
var defaultCreds = NodeGit.Cred.defaultNew();

‎test/tests/diff.js‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@ var assert = require("assert");
22
var path = require("path");
33
var promisify = require("promisify-node");
44
var fse = promisify(require("fs-extra"));
5-
var Diff = require("../../lib/diff");
6-
var normalizeOptions = require("../../lib/util/normalize_options");
7-
var NodeGit = require("../../");
5+
var local = path.join.bind(path, __dirname);
86

97
describe("Diff", function() {
10-
var Repository = require("../../lib/repository");
11-
var reposPath = path.resolve("test/repos/workdir/.git");
8+
var NodeGit = require("../../");
9+
var Repository = require(local("../../lib/repository"));
10+
var Diff = require(local("../../lib/diff"));
11+
var normalizeOptions = require(local("../../lib/util/normalize_options"));
12+
13+
var reposPath = local("../repos/workdir/.git");
1214
var oid = "fce88902e66c72b5b93e75bdb5ae717038b221f6";
1315
var diffFilename = "wddiff.txt";
14-
var diffFilepath = path.join(
15-
path.resolve("test/repos/workdir"),
16-
diffFilename
17-
);
16+
var diffFilepath = local("../repos/workdir", diffFilename);
1817

1918
before(function() {
2019
var test = this;

‎test/tests/index.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
var assert = require("assert");
22
var path = require("path");
3+
var local = path.join.bind(path, __dirname);
34

45
describe("Index", function() {
5-
var reposPath = path.resolve("test/repos/workdir/.git");
6+
var reposPath = local("../repos/workdir/.git");
67

7-
var Repository = require("../../lib/repository");
8+
var Repository = require(local("../../lib/repository"));
89

910
before(function() {
1011
var test = this;

0 commit comments

Comments
 (0)