Skip to content

Commit

Permalink
Merge pull request #482 from opentok/develop
Browse files Browse the repository at this point in the history
merge to master
  • Loading branch information
rhainer authored Sep 11, 2018
2 parents 5add889 + 016b089 commit 1f85010
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions server/testHealth.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ module.exports = (config, googleAuth) => new Promise((resolve, reject) => {
.then(testFirebase)
.then(testGoogleAuth)
.then(() => {
healthObj.success = 'pass';
healthObj.status = 'pass';
resolve(healthObj);
})
.catch((error) => {
healthObj.success = 'fail';
healthObj.status = 'fail';
healthObj.error = error.message;
reject(healthObj);
});
Expand Down
2 changes: 1 addition & 1 deletion test/api/server_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ describe('OpenTokRTC server', () => {
expect(response.body.name).to.equal('opentok-rtc');
expect(response.body.version).to.be.a.string;
expect(response.body.gitHash).to.be.a.string;
expect(response.body.success).to.equal('fail');
expect(response.body.status).to.equal('fail');
done();
});
});
Expand Down

0 comments on commit 1f85010

Please sign in to comment.