Skip to content

Update deps to loopback 3.0.0 RC #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bajtos merged 2 commits into from
Sep 22, 2016
Merged

Update deps to loopback 3.0.0 RC #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b49818d
Update deps to loopback 3.0.0 RC
bajtos Sep 22, 2016
6e288a9
Fix tests to not depend on exact EOL chars
bajtos Sep 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"chai": "^3.2.0",
"eslint": "^2.8.0",
"eslint-config-loopback": "^2.0.0",
"loopback": "^3.0.0-alpha.4",
"loopback": "^3.0.0",
"mocha": "^2.2.5",
"supertest": "^1.0.1"
},
Expand Down
29 changes: 19 additions & 10 deletions test/explorer.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ describe('explorer', function() {
if (err) return done(err);

// expect the content of `dummy-swagger-ui/swagger-ui.js`
expect(res.text).to.contain('/* custom swagger-ui file */' + os.EOL);
expect(res.text).to.contain('/* custom swagger-ui file */');

done();
});
Expand All @@ -153,9 +153,12 @@ describe('explorer', function() {
it('overrides strongloop overrides', function(done) {
request(app).get('/explorer/')
.expect(200)
// expect the content of `dummy-swagger-ui/index.html`
.expect('custom index.html' + os.EOL)
.end(done);
.end(function(err, res) {
if (err) return done(er);
// expect the content of `dummy-swagger-ui/index.html`
expect(res.text).to.contain('custom index.html');
done();
});
});
});

Expand Down Expand Up @@ -231,9 +234,12 @@ describe('explorer', function() {

request(app).get('/explorer/')
.expect(200)
// expect the content of `dummy-swagger-ui/index.html`
.expect('custom index.html' + os.EOL)
.end(done);
.end(function(err, res) {
if (err) return done(err);
// expect the content of `dummy-swagger-ui/index.html`
expect(res.text).to.contain('custom index.html');
done();
});
});

it('should allow `uiDirs` to be defined as an String', function(done) {
Expand All @@ -243,9 +249,12 @@ describe('explorer', function() {

request(app).get('/explorer/')
.expect(200)
// expect the content of `dummy-swagger-ui/index.html`
.expect('custom index.html' + os.EOL)
.end(done);
.end(function(err, res) {
if (err) return done(err);
// expect the content of `dummy-swagger-ui/index.html`
expect(res.text).to.contain('custom index.html');
done();
});
});
});

Expand Down