Skip to content

Commit 7d16644

Browse files
author
deiu
committed
Fixed standard errors after upgrade to 6.0.4
1 parent 622e85b commit 7d16644

9 files changed

Lines changed: 57 additions & 49 deletions

File tree

‎lib/create-app.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function createApp (argv) {
6767
if (ldp.createAdmin) {
6868
app.get('/', function (req, res) {
6969
res.set('Content-Type', 'text/html')
70-
var signup = path.resolve(__dirname + '/../static/signup.html')
70+
var signup = path.resolve(__dirname, '/../static/signup.html')
7171
res.sendFile(signup)
7272
})
7373
}

‎test/acl.js‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ var assert = require('chai').assert
22
var fs = require('fs')
33
var $rdf = require('rdflib')
44
var request = require('request')
5+
var path = require('path')
56

67
// Helper functions for the FS
78
var rm = require('./test-utils').rm
@@ -21,9 +22,9 @@ describe('ACL HTTP', function () {
2122
var ldpHttpsServer
2223
var ldp = ldnode.createServer({
2324
mount: '/test',
24-
root: __dirname + '/resources',
25-
key: __dirname + '/keys/key.pem',
26-
cert: __dirname + '/keys/cert.pem',
25+
root: path.join(__dirname, '/resources'),
26+
key: path.join(__dirname, '/keys/key.pem'),
27+
cert: path.join(__dirname, '/keys/cert.pem'),
2728
webid: true
2829
})
2930

@@ -56,12 +57,12 @@ describe('ACL HTTP', function () {
5657
var user2 = 'https://user2.databox.me/profile/card#me'
5758
var userCredentials = {
5859
user1: {
59-
cert: fs.readFileSync(__dirname + '/keys/user1-cert.pem'),
60-
key: fs.readFileSync(__dirname + '/keys/user1-key.pem')
60+
cert: fs.readFileSync(path.join(__dirname, '/keys/user1-cert.pem')),
61+
key: fs.readFileSync(path.join(__dirname, '/keys/user1-key.pem'))
6162
},
6263
user2: {
63-
cert: fs.readFileSync(__dirname + '/keys/user2-cert.pem'),
64-
key: fs.readFileSync(__dirname + '/keys/user2-key.pem')
64+
cert: fs.readFileSync(path.join(__dirname, '/keys/user2-cert.pem')),
65+
key: fs.readFileSync(path.join(__dirname, '/keys/user2-key.pem'))
6566
}
6667
}
6768

@@ -444,7 +445,7 @@ describe('ACL HTTP', function () {
444445
})
445446

446447
describe('Read-only', function () {
447-
var body = fs.readFileSync(__dirname + '/resources/acl/read-acl/.acl')
448+
var body = fs.readFileSync(path.join(__dirname, '/resources/acl/read-acl/.acl'))
448449
it('user1 should be able to access ACL file', function (done) {
449450
var options = createOptions('/acl/read-acl/.acl', 'user1')
450451
request.head(options, function (error, response, body) {
@@ -1019,14 +1020,14 @@ describe('ACL HTTP', function () {
10191020
it('should remove all files and dirs created', function (done) {
10201021
try {
10211022
// must remove the ACLs in sync
1022-
fs.unlinkSync(__dirname + '/resources/' + testDir + '/dir1/dir2/abcd.ttl')
1023-
fs.rmdirSync(__dirname + '/resources/' + testDir + '/dir1/dir2/')
1024-
fs.rmdirSync(__dirname + '/resources/' + testDir + '/dir1/')
1025-
fs.unlinkSync(__dirname + '/resources/' + abcFile)
1026-
fs.unlinkSync(__dirname + '/resources/' + testDirAclFile)
1027-
fs.unlinkSync(__dirname + '/resources/' + testDirMetaFile)
1028-
fs.rmdirSync(__dirname + '/resources/' + testDir)
1029-
fs.rmdirSync(__dirname + '/resources/acl/')
1023+
fs.unlinkSync(path.join(__dirname, '/resources/' + testDir + '/dir1/dir2/abcd.ttl'))
1024+
fs.rmdirSync(path.join(__dirname, '/resources/' + testDir + '/dir1/dir2/'))
1025+
fs.rmdirSync(path.join(__dirname, '/resources/' + testDir + '/dir1/'))
1026+
fs.unlinkSync(path.join(__dirname, '/resources/' + abcFile))
1027+
fs.unlinkSync(path.join(__dirname, '/resources/' + testDirAclFile))
1028+
fs.unlinkSync(path.join(__dirname, '/resources/' + testDirMetaFile))
1029+
fs.rmdirSync(path.join(__dirname, '/resources/' + testDir))
1030+
fs.rmdirSync(path.join(__dirname, '/resources/acl/'))
10301031
done()
10311032
} catch (e) {
10321033
done(e)

‎test/errors.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
var supertest = require('supertest')
2+
var path = require('path')
23

34
// Helper functions for the FS
45
// var rm = require('./test-utils').rm
@@ -11,14 +12,14 @@ var ldnode = require('../index')
1112
describe('Error pages', function () {
1213
// LDP with error pages
1314
var errorLdp = ldnode({
14-
root: __dirname + '/resources',
15-
errorPages: __dirname + '/resources/errorPages'
15+
root: path.join(__dirname, '/resources'),
16+
errorPages: path.join(__dirname, '/resources/errorPages')
1617
})
1718
var errorServer = supertest(errorLdp)
1819

1920
// LDP with no error pages
2021
var noErrorLdp = ldnode({
21-
root: __dirname + '/resources',
22+
root: path.join(__dirname, '/resources'),
2223
noErrorPages: true
2324
})
2425
var noErrorServer = supertest(noErrorLdp)

‎test/formats.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
var supertest = require('supertest')
22
var ldnode = require('../index')
3+
var path = require('path')
34

45
describe('formats', function () {
56
var ldp = ldnode.createServer({
6-
root: __dirname + '/resources'
7+
root: path.join(__dirname, '/resources')
78
})
89

910
var server = supertest(ldp)

‎test/http.js‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ var li = require('li')
44
var ldnode = require('../index')
55
var rm = require('./test-utils').rm
66
var RSVP = require('rsvp')
7+
var path = require('path')
78

89
var suffixAcl = '.acl'
910
var suffixMeta = '.meta'
1011
var ldpServer = ldnode({
11-
root: __dirname + '/resources'
12+
root: path.join(__dirname, '/resources')
1213
})
1314
var server = supertest(ldpServer)
1415

@@ -473,7 +474,7 @@ describe('HTTP APIs', function () {
473474
.expect(201)
474475
.end(function (err) {
475476
if (err) return done(err)
476-
var stats = fs.statSync(__dirname + '/resources/post-tests/loans/')
477+
var stats = fs.statSync(path.join(__dirname, '/resources/post-tests/loans/'))
477478
if (!stats.isDirectory()) {
478479
return done(new Error('Cannot read file just created'))
479480
}
@@ -498,19 +499,19 @@ describe('HTTP APIs', function () {
498499
it('should create as many files as the ones passed in multipart',
499500
function (done) {
500501
server.post('/sampleContainer/')
501-
.attach('timbl', __dirname + '/resources/timbl.jpg')
502-
.attach('nicola', __dirname + '/resources/nicola.jpg')
502+
.attach('timbl', path.join(__dirname, '/resources/timbl.jpg'))
503+
.attach('nicola', path.join(__dirname, '/resources/nicola.jpg'))
503504
.expect(200)
504505
.end(function (err) {
505506
if (err) return done(err)
506507

507508
var sizeNicola = fs.statSync(__dirname +
508509
'/resources/nicola.jpg').size
509-
var sizeTim = fs.statSync(__dirname + '/resources/timbl.jpg').size
510-
var sizeNicolaLocal = fs.statSync(__dirname +
511-
'/resources/sampleContainer/nicola.jpg').size
512-
var sizeTimLocal = fs.statSync(__dirname +
513-
'/resources/sampleContainer/timbl.jpg').size
510+
var sizeTim = fs.statSync(path.join(__dirname, '/resources/timbl.jpg')).size
511+
var sizeNicolaLocal = fs.statSync(path.join(__dirname,
512+
'/resources/sampleContainer/nicola.jpg')).size
513+
var sizeTimLocal = fs.statSync(path.join(__dirname,
514+
'/resources/sampleContainer/timbl.jpg')).size
514515

515516
if (sizeNicola === sizeNicolaLocal && sizeTim === sizeTimLocal) {
516517
return done()

‎test/identity-provider.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
var supertest = require('supertest')
2+
var path = require('path')
23
// Helper functions for the FS
34
var rm = require('./test-utils').rm
45
// var write = require('./test-utils').write
@@ -14,9 +15,9 @@ describe('Identity Provider', function () {
1415
var host = 'localhost:3457'
1516
var ldpHttpsServer
1617
var ldp = ldnode.createServer({
17-
root: __dirname + '/resources/accounts/',
18-
key: __dirname + '/keys/key.pem',
19-
cert: __dirname + '/keys/cert.pem',
18+
root: path.join(__dirname, '/resources/accounts/'),
19+
key: path.join(__dirname, '/keys/key.pem'),
20+
cert: path.join(__dirname, '/keys/cert.pem'),
2021
webid: true,
2122
idp: true
2223
})

‎test/ldp.js‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ var assert = require('chai').assert
22
var $rdf = require('rdflib')
33
var ns = require('../lib/vocab/ns.js').ns
44
var LDP = require('../lib/ldp')
5+
var path = require('path')
56
var stringToStream = require('../lib/utils').stringToStream
67

78
// Helper functions for the FS
@@ -27,7 +28,7 @@ describe('LDP', function () {
2728
it('return file if file exists', function (done) {
2829
// file can be empty as well
2930
write('hello world', 'fileExists.txt')
30-
ldp.readFile(__dirname + '/resources/fileExists.txt', function (err, file) {
31+
ldp.readFile(path.join(__dirname, '/resources/fileExists.txt'), function (err, file) {
3132
rm('fileExists.txt')
3233
assert.notOk(err)
3334
assert.equal(file, 'hello world')
@@ -47,7 +48,7 @@ describe('LDP', function () {
4748
it('should return content if metaFile exists', function (done) {
4849
// file can be empty as well
4950
write('This function just reads this, does not parse it', '.meta')
50-
ldp.readContainerMeta(__dirname + '/resources/', function (err, metaFile) {
51+
ldp.readContainerMeta(path.join(__dirname, '/resources/'), function (err, metaFile) {
5152
rm('.meta')
5253
assert.notOk(err)
5354
assert.equal(metaFile, 'This function just reads this, does not parse it')
@@ -58,7 +59,7 @@ describe('LDP', function () {
5859
it('should work also if trailing `/` is not passed', function (done) {
5960
// file can be empty as well
6061
write('This function just reads this, does not parse it', '.meta')
61-
ldp.readContainerMeta(__dirname + '/resources', function (err, metaFile) {
62+
ldp.readContainerMeta(path.join(__dirname, '/resources'), function (err, metaFile) {
6263
rm('.meta')
6364
assert.notOk(err)
6465
assert.equal(metaFile, 'This function just reads this, does not parse it')
@@ -115,7 +116,7 @@ describe('LDP', function () {
115116
' dcterms:title "This is a magic type" ;' +
116117
' o:limit 500000.00 .', 'sampleContainer/magicType.ttl')
117118

118-
ldp.listContainer(__dirname + '/resources/sampleContainer/', 'https://server.tld', '', 'text/turtle', function (err, data) {
119+
ldp.listContainer(path.join(__dirname, '/resources/sampleContainer/'), 'https://server.tld', '', 'text/turtle', function (err, data) {
119120
if (err) done(err)
120121
var graph = $rdf.graph()
121122
$rdf.parse(
@@ -155,7 +156,7 @@ describe('LDP', function () {
155156
' dcterms:title "This is a container" ;' +
156157
' o:limit 500000.00 .', 'sampleContainer/basicContainerFile.ttl')
157158

158-
ldp.listContainer(__dirname + '/resources/sampleContainer/', 'https://server.tld', '', 'text/turtle', function (err, data) {
159+
ldp.listContainer(path.join(__dirname, '/resources/sampleContainer/'), 'https://server.tld', '', 'text/turtle', function (err, data) {
159160
if (err) done(err)
160161
var graph = $rdf.graph()
161162
$rdf.parse(
@@ -193,9 +194,9 @@ describe('LDP', function () {
193194
})
194195

195196
it('should ldp:contains the same amount of files in dir', function (done) {
196-
ldp.listContainer(__dirname + '/resources/sampleContainer/', 'https://server.tld', '', 'text/turtle', function (err, data) {
197+
ldp.listContainer(path.join(__dirname, '/resources/sampleContainer/'), 'https://server.tld', '', 'text/turtle', function (err, data) {
197198
if (err) done(err)
198-
fs.readdir(__dirname + '/resources/sampleContainer/', function (err, files) {
199+
fs.readdir(path.join(__dirname, '/resources/sampleContainer/'), function (err, files) {
199200
var graph = $rdf.graph()
200201
$rdf.parse(
201202
data,

‎test/params.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ var assert = require('chai').assert
22
var supertest = require('supertest')
33
var nock = require('nock')
44
var async = require('async')
5+
var path = require('path')
56
// Helper functions for the FS
67
var rm = require('./test-utils').rm
78
var write = require('./test-utils').write
@@ -13,7 +14,7 @@ var ldnode = require('../index')
1314
describe('LDNODE params', function () {
1415
describe('proxy', function () {
1516
var ldp = ldnode({
16-
root: __dirname + '/resources',
17+
root: path.join(__dirname, '/resources'),
1718
proxy: '/proxy'
1819
})
1920
var server = supertest(ldp)
@@ -142,9 +143,9 @@ describe('LDNODE params', function () {
142143
var ldpHttpsServer
143144
var ldp = ldnode.createServer({
144145
forceUser: 'https://fakeaccount.com/profile#me',
145-
root: __dirname + '/resources/acl/fake-account',
146-
key: __dirname + '/keys/key.pem',
147-
cert: __dirname + '/keys/cert.pem',
146+
root: path.join(__dirname, '/resources/acl/fake-account'),
147+
key: path.join(__dirname, '/keys/key.pem'),
148+
cert: path.join(__dirname, '/keys/cert.pem'),
148149
webid: true,
149150
host: 'localhost:3457'
150151
})

‎test/test-utils.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
var fs = require('fs')
22
var fsExtra = require('fs-extra')
33
var rimraf = require('rimraf')
4+
var path = require('path')
45

56
exports.rm = function (file) {
6-
return rimraf.sync(__dirname + '/resources/' + file)
7+
return rimraf.sync(path.join(__dirname, '/resources/' + file))
78
}
89

910
exports.write = function (text, file) {
10-
return fs.writeFileSync(__dirname + '/resources/' + file, text)
11+
return fs.writeFileSync(path.join(__dirname, '/resources/' + file), text)
1112
}
1213

1314
exports.cp = function (src, dest) {
1415
return fsExtra.copySync(
15-
__dirname + '/resources/' + src,
16-
__dirname + '/resources/' + dest)
16+
path.join(__dirname, '/resources/' + src),
17+
path.join(__dirname, '/resources/' + dest))
1718
}
1819

1920
exports.read = function (file) {
20-
return fs.readFileSync(__dirname + '/resources/' + file, {
21+
return fs.readFileSync(path.join(__dirname, '/resources/' + file), {
2122
'encoding': 'utf8'
2223
})
2324
}

0 commit comments

Comments
 (0)