verdnatura-mirror
/
loopback-boot
mirror of https://github.com/strongloop/loopback-boot.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #214 from strongloop/update-lb-3-rc-1 

Update deps to loopback 3.0.0 RC
This commit is contained in:
Miroslav Bajtoš 2016-09-23 12:41:58 +02:00 committed by GitHub
parent a6076ae8be 49ed10caaf
commit 57e5e64b4d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -40,7 +40,7 @@
"eslint": "^2.5.3", "eslint": "^2.5.3",
"eslint-config-loopback": "^1.0.0", "eslint-config-loopback": "^1.0.0",
"fs-extra": "^0.12.0", "fs-extra": "^0.12.0",
"loopback": "^2.16.3", "loopback": "^3.0.0",
"mocha": "^1.19.0", "mocha": "^1.19.0",
"supertest": "^0.14.0" "supertest": "^0.14.0"
} }

10
test/executor.test.js
View File

@ -55,7 +55,6 @@ describe('executor', function() {
dataSources: { dataSources: {
'the-db': { 'the-db': {
connector: 'memory', connector: 'memory',
defaultForType: 'db',
}, },
}, },
}); });
@ -804,10 +803,11 @@ describe('executor', function() {
.get('/') .get('/')
.end(function(err, res) { .end(function(err, res) {
if (err) return done(err); if (err) return done(err);
expect(res.text).to.eql(('<!DOCTYPE html>\n<html>\n<head lang="en">\n' + var EXPECTED_TEXT = '<!DOCTYPE html>\n<html>\n<head lang="en">\n' +
' <meta charset="UTF-8">\n <title>simple-app</title>\n' + ' <meta charset="UTF-8">\n <title>simple-app</title>\n' +
'</head>\n<body>\n<h1>simple-app</h1>\n' + '</head>\n<body>\n<h1>simple-app</h1>\n' +
'</body>\n</html>').replace(/\n/g, os.EOL)); '</body>\n</html>';
expect(normalizeEols(res.text)).to.eql(normalizeEols(EXPECTED_TEXT));
done(); done();
}); });
}); });
@ -1129,3 +1129,7 @@ function envAppInstructions() {
env: 'test', env: 'test',
}); });
} }
function normalizeEols(str) {
return str.replace(/\r\n/g, '\n');
}