Skip to content

Commit 3a4cb96

Browse files
nicolanicola
committed
moving test folders
1 parent dbcfa8c commit 3a4cb96

46 files changed

Lines changed: 65 additions & 65 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎test/acl.js‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ describe('ACL', function() {
1616

1717
var ldp = ldnode.createServer({
1818
mount: '/test',
19-
root: __dirname,
20-
key: __dirname + '/key.pem',
21-
cert: __dirname + '/cert.pem',
19+
root: __dirname + '/resources',
20+
key: __dirname + '/keys/key.pem',
21+
cert: __dirname + '/keys/cert.pem',
2222
webid: true
2323
});
2424
ldp.listen(3456);
@@ -47,12 +47,12 @@ describe('ACL', function() {
4747
var user2 = "https://user2.databox.me/profile/card#me";
4848
var userCredentials = {
4949
user1: {
50-
cert: fs.readFileSync(__dirname + '/testfiles/user1-cert.pem'),
51-
key: fs.readFileSync(__dirname + '/testfiles/user1-key.pem')
50+
cert: fs.readFileSync(__dirname + '/keys/user1-cert.pem'),
51+
key: fs.readFileSync(__dirname + '/keys/user1-key.pem')
5252
},
5353
user2: {
54-
cert: fs.readFileSync(__dirname + '/testfiles/user2-cert.pem'),
55-
key: fs.readFileSync(__dirname + '/testfiles/user2-key.pem')
54+
cert: fs.readFileSync(__dirname + '/keys/user2-cert.pem'),
55+
key: fs.readFileSync(__dirname + '/keys/user2-key.pem')
5656
}
5757
};
5858

@@ -968,14 +968,14 @@ describe('ACL', function() {
968968
it("should remove all files and dirs created", function(done) {
969969
try {
970970
// must remove the ACLs in sync
971-
fs.unlinkSync(__dirname + '/' + testDir + '/dir1/dir2/abcd.ttl');
972-
fs.rmdirSync(__dirname + '/' + testDir + '/dir1/dir2/');
973-
fs.rmdirSync(__dirname + '/' + testDir + '/dir1/');
974-
fs.unlinkSync(__dirname + '/' + abcFile);
975-
fs.unlinkSync(__dirname + '/' + testDirAclFile);
976-
fs.unlinkSync(__dirname + '/' + testDirMetaFile);
977-
fs.rmdirSync(__dirname + '/' + testDir);
978-
fs.rmdirSync(__dirname + '/acl/');
971+
fs.unlinkSync(__dirname + '/resources/' + testDir + '/dir1/dir2/abcd.ttl');
972+
fs.rmdirSync(__dirname + '/resources/' + testDir + '/dir1/dir2/');
973+
fs.rmdirSync(__dirname + '/resources/' + testDir + '/dir1/');
974+
fs.unlinkSync(__dirname + '/resources/' + abcFile);
975+
fs.unlinkSync(__dirname + '/resources/' + testDirAclFile);
976+
fs.unlinkSync(__dirname + '/resources/' + testDirMetaFile);
977+
fs.rmdirSync(__dirname + '/resources/' + testDir);
978+
fs.rmdirSync(__dirname + '/resources/acl/');
979979
done();
980980
} catch (e) {
981981
done(e);

test/cert.pem renamed to test/keys/cert.pem

File renamed without changes.

test/testfiles/client-cert.pem renamed to test/keys/client-cert.pem

File renamed without changes.

test/testfiles/client-key.pem renamed to test/keys/client-key.pem

File renamed without changes.

test/key.pem renamed to test/keys/key.pem

File renamed without changes.

test/testfiles/user1-cert.pem renamed to test/keys/user1-cert.pem

File renamed without changes.

test/testfiles/user1-key.pem renamed to test/keys/user1-key.pem

File renamed without changes.

test/testfiles/user2-cert.pem renamed to test/keys/user2-cert.pem

File renamed without changes.

test/testfiles/user2-key.pem renamed to test/keys/user2-key.pem

File renamed without changes.

‎test/params.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ var fs = require('fs');
55

66
function cp (src, dest) {
77
return fsExtra.copySync(
8-
__dirname + '/' + src,
9-
__dirname + '/' + dest);
8+
__dirname + '/resources/' + src,
9+
__dirname + '/resources/' + dest);
1010
}
1111

1212
function read (file) {
13-
return fs.readFileSync(__dirname + '/' + file, {
13+
return fs.readFileSync(__dirname + '/resources/' + file, {
1414
'encoding': 'utf8'
1515
});
1616
}
1717

1818
function rm (file) {
19-
return fs.unlinkSync(__dirname + '/' + file);
19+
return fs.unlinkSync(__dirname + '/resources/' + file);
2020
}
2121

2222
function write (text, file) {
23-
return fs.writeFileSync(__dirname + '/' + file, text);
23+
return fs.writeFileSync(__dirname + '/resources/' + file, text);
2424
}
2525

2626
describe('params', function () {
@@ -61,46 +61,46 @@ describe('params', function () {
6161
var server = supertest(ldp);
6262

6363
it ('should fallback on current working directory', function () {
64-
assert.equal(ldp.locals.ldp.root, process.cwd() + ldp.locals.ldp.mount);
64+
assert.equal(ldp.locals.ldp.root, process.cwd() + '/');
6565
});
6666

6767
it ('should find resource in correct path', function(done) {
6868
write(
6969
'<#current> <#temp> 123 .',
70-
'testfiles/example.ttl');
70+
'sampleContainer/example.ttl');
7171

7272
// This assums npm test is run from the folder that contains package.js
73-
server.get('/test/testfiles/example.ttl')
73+
server.get('/test/resources/sampleContainer/example.ttl')
7474
.expect('Link', /http:\/\/www.w3.org\/ns\/ldp#Resource/)
7575
.expect(200)
7676
.end(function(err, res, body) {
77-
assert.equal(read('testfiles/example.ttl'), '<#current> <#temp> 123 .');
78-
rm('testfiles/example.ttl');
77+
assert.equal(read('sampleContainer/example.ttl'), '<#current> <#temp> 123 .');
78+
rm('sampleContainer/example.ttl');
7979
done(err);
8080
});
8181
});
8282
});
8383

8484
describe('passed', function() {
85-
var ldp = ldnode({root:'test'});
85+
var ldp = ldnode({root:'./test/resources/'});
8686
var server = supertest(ldp);
8787

8888
it ('should fallback on current working directory', function () {
89-
assert.equal(ldp.locals.ldp.root, 'test' + ldp.locals.ldp.mount);
89+
assert.equal(ldp.locals.ldp.root, './test/resources/');
9090
});
9191

9292
it ('should find resource in correct path', function(done) {
9393
write(
9494
'<#current> <#temp> 123 .',
95-
'testfiles/example.ttl');
95+
'sampleContainer/example.ttl');
9696

9797
// This assums npm test is run from the folder that contains package.js
98-
server.get('/testfiles/example.ttl')
98+
server.get('/sampleContainer/example.ttl')
9999
.expect('Link', /http:\/\/www.w3.org\/ns\/ldp#Resource/)
100100
.expect(200)
101101
.end(function(err, res, body) {
102-
assert.equal(read('testfiles/example.ttl'), '<#current> <#temp> 123 .');
103-
rm('testfiles/example.ttl');
102+
assert.equal(read('sampleContainer/example.ttl'), '<#current> <#temp> 123 .');
103+
rm('sampleContainer/example.ttl');
104104
done(err);
105105
});
106106
});

0 commit comments

Comments
 (0)