Skip to content

Commit

Permalink
Update tests for strong-error-handler
Browse files Browse the repository at this point in the history
Fix rest-adapter related test case switching to strong-error-handler
Only affect the test-cases calling rest methods
  • Loading branch information
David Cheung committed Jun 7, 2016
1 parent 276fb5b commit ddb5327
Show file tree
Hide file tree
Showing 24 changed files with 54 additions and 14 deletions.
1 change: 1 addition & 0 deletions test/access-token.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,7 @@ function createTestApp(testToken, settings, done) {

app.use(cookieParser('secret'));
app.use(loopback.token(tokenSettings));
app.set('remoting', { errorHandler: { debug: true, log: false }});
app.get('/token', function(req, res) {
res.cookie('authorization', testToken.id, { signed: true });
res.cookie('access_token', testToken.id, { signed: true });
Expand Down
1 change: 1 addition & 0 deletions test/acl.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@ describe('access check', function() {
var app;
before(function() {
app = loopback();
app.set('remoting', { errorHandler: { debug: true, log: false }});
app.use(loopback.rest());
app.enableAuth();
app.dataSource('test', { connector: 'memory' });
Expand Down
1 change: 1 addition & 0 deletions test/app.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,7 @@ describe('app', function() {
var app, db;
beforeEach(function() {
app = loopback();
app.set('remoting', { errorHandler: { debug: true, log: false }});
db = loopback.createDataSource({ connector: loopback.Memory });
});

Expand Down
8 changes: 7 additions & 1 deletion test/fixtures/access-control/server/config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{
"port": 3000,
"host": "0.0.0.0",
"legacyExplorer": false
"legacyExplorer": false,
"remoting": {
"errorHandler": {
"debug": true,
"log": false
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
},
"cors": false,
"errorHandler": {
"disableStackTrace": false
"debug": true,
"log": false
},
"sharedMethods": {
"*": false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
},
"cors": false,
"errorHandler": {
"disableStackTrace": false
"debug": true,
"log": false
},
"sharedMethods": {
"*": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
},
"cors": false,
"errorHandler": {
"disableStackTrace": false
"debug": true,
"log": false
},
"sharedMethods": {
"*": true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
},
"cors": false,
"errorHandler": {
"disableStackTrace": false
"debug": true,
"log": false
},
"sharedMethods": {
"find": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
},
"cors": false,
"errorHandler": {
"disableStackTrace": false
"debug": true,
"log": false
},
"sharedMethods": {
"find": true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
},
"cors": false,
"errorHandler": {
"disableStackTrace": false
"debug": true,
"log": false
}
},
"legacyExplorer": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
},
"cors": false,
"errorHandler": {
"disableStackTrace": false
"debug": true,
"log": false
}
},
"legacyExplorer": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
},
"cors": false,
"errorHandler": {
"disableStackTrace": false
"debug": true,
"log": false
}
},
"legacyExplorer": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
},
"cors": false,
"errorHandler": {
"disableStackTrace": false
"debug": true,
"log": false
}
},
"legacyExplorer": false
Expand Down
8 changes: 7 additions & 1 deletion test/fixtures/simple-app/server/config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{
"port": 3000,
"host": "127.0.0.1",
"legacyExplorer": false
"legacyExplorer": false,
"remoting": {
"errorHandler": {
"debug": true,
"log": false
}
}
}
4 changes: 4 additions & 0 deletions test/fixtures/simple-integration-app/server/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
},
"urlencoded": {
"limit": "8kb"
},
"errorHandler": {
"debug": true,
"log": false
}
},
"legacyExplorer": false
Expand Down
4 changes: 4 additions & 0 deletions test/fixtures/user-integration-app/server/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
},
"urlencoded": {
"limit": "8kb"
},
"errorHandler": {
"debug": true,
"log": false
}
},
"legacyExplorer": false
Expand Down
2 changes: 2 additions & 0 deletions test/helpers/loopback-testing-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ _beforeEach.givenModel = function(modelName, attrs, optionalHandler) {
var test = this;
var app = this.app;
var model = app.models[modelName];

app.set('remoting', { errorHandler: { debug: true, log: false }});
assert(model, 'cannot get model of name ' + modelName + ' from app.models');
assert(model.dataSource, 'cannot test model ' + modelName +
' without attached dataSource');
Expand Down
1 change: 1 addition & 0 deletions test/model.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ describe.onServer('Remote Methods', function() {
);

app = loopback();
app.set('remoting', { errorHandler: { debug: true, log: false }});
app.use(loopback.rest());
app.model(User);
});
Expand Down
4 changes: 2 additions & 2 deletions test/relations.integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ describe('relations - integration', function() {
lt.describe.whenCalledRemotely('GET', '/stores/:id/widgets/:fk', function() {
it('should fail with statusCode 404', function() {
assert.equal(this.res.statusCode, 404);
assert.equal(this.res.body.error.status, 404);
assert.equal(this.res.body.error.statusCode, 404);
});
});
});
Expand Down Expand Up @@ -1652,7 +1652,7 @@ describe('relations - integration', function() {
expect(res.body).to.be.an('object');
expect(res.body.error).to.be.an('object');
expect(res.body.error.name).to.equal('Error');
expect(res.body.error.status).to.equal(500);
expect(res.body.error.statusCode).to.equal(500);
expect(res.body.error.message).to.equal('This should not crash the app');

done();
Expand Down
1 change: 1 addition & 0 deletions test/remote-connector.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ describe('RemoteConnector', function() {
beforeEach: function(done) {
var test = this;
remoteApp = loopback();
remoteApp.set('remoting', { errorHandler: { debug: true, log: false }});
remoteApp.use(loopback.rest());
remoteApp.listen(0, function() {
test.dataSource = loopback.createDataSource({
Expand Down
3 changes: 2 additions & 1 deletion test/remoting.integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ describe('remoting - integration', function() {
it('should load remoting options', function() {
var remotes = app.remotes();
assert.deepEqual(remotes.options, { 'json': { 'limit': '1kb', 'strict': false },
'urlencoded': { 'limit': '8kb', 'extended': true }});
'urlencoded': { 'limit': '8kb', 'extended': true },
'errorHandler': { 'debug': true, log: false }});
});

it('rest handler', function() {
Expand Down
1 change: 1 addition & 0 deletions test/replication.rest.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,7 @@ describe('Replication over REST', function() {

function setupServer(done) {
serverApp = loopback();
serverApp.set('remoting', { errorHandler: { debug: true, log: false }});
serverApp.enableAuth();

serverApp.dataSource('db', { connector: 'memory' });
Expand Down
1 change: 1 addition & 0 deletions test/rest.middleware.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ describe('loopback.rest', function() {
// override the global app object provided by test/support.js
// and create a local one that does not share state with other tests
app = loopback({ localRegistry: true, loadBuiltinModels: true });
app.set('remoting', { errorHandler: { debug: true, log: false }});
var db = app.dataSource('db', { connector: 'memory' });
MyModel = app.registry.createModel('MyModel');
MyModel.attachTo(db);
Expand Down
1 change: 1 addition & 0 deletions test/user.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ describe('User', function() {
// override the global app object provided by test/support.js
// and create a local one that does not share state with other tests
app = loopback({ localRegistry: true, loadBuiltinModels: true });
app.set('remoting', { errorHandler: { debug: true, log: false }});
app.dataSource('db', { connector: 'memory' });

// setup Email model, it's needed by User tests
Expand Down

0 comments on commit ddb5327

Please sign in to comment.