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

Merge pull request #2736 from strongloop/update/loopback-testing-in-2x 

Upgrade loopback-testing to the latest ^1.4 [2.x-only]
This commit is contained in:
Miroslav Bajtoš 2016-09-13 09:13:57 +02:00 committed by GitHub
parent ec8250cf58 c4214024be
commit 14b8426687
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -86,7 +86,7 @@
"karma-script-launcher": "^1.0.0", "karma-script-launcher": "^1.0.0",
"loopback-boot": "^2.7.0", "loopback-boot": "^2.7.0",
"loopback-datasource-juggler": "^2.19.1", "loopback-datasource-juggler": "^2.19.1",
"loopback-testing": "~1.1.0", "loopback-testing": "^1.4.0",
"mocha": "^3.0.0", "mocha": "^3.0.0",
"phantomjs-prebuilt": "^2.1.7", "phantomjs-prebuilt": "^2.1.7",
"sinon": "^1.13.0", "sinon": "^1.13.0",

7
test/access-control.integration.js
View File

@ -24,6 +24,7 @@ describe('access control - integration', function() {
}); });
lt.beforeEach.withApp(app); lt.beforeEach.withApp(app);
lt.beforeEach.withUserModel('user');
/* /*
describe('accessToken', function() { describe('accessToken', function() {
@ -105,7 +106,7 @@ describe('access control - integration', function() {
lt.describe.whenLoggedInAsUser(CURRENT_USER, function() { lt.describe.whenLoggedInAsUser(CURRENT_USER, function() {
beforeEach(function() { beforeEach(function() {
this.url = '/api/users/' + this.user.id + '?ok'; this.url = '/api/users/' + this.loggedInAccessToken.userId + '?ok';
}); });
lt.describe.whenCalledRemotely('DELETE', '/api/users/:id', function() { lt.describe.whenCalledRemotely('DELETE', '/api/users/:id', function() {
lt.it.shouldBeAllowed(); lt.it.shouldBeAllowed();
@ -262,7 +263,7 @@ describe('access control - integration', function() {
var self = this; var self = this;
// Create an account under the given user // Create an account under the given user
app.models.accountWithReplaceOnPUTtrue.create({ app.models.accountWithReplaceOnPUTtrue.create({
userId: self.user.id, userId: self.loggedInAccessToken.userId,
balance: 100 balance: 100
}, function(err, act) { }, function(err, act) {
actId = act.id; actId = act.id;
@ -326,7 +327,7 @@ describe('access control - integration', function() {
var self = this; var self = this;
// Create an account under the given user // Create an account under the given user
app.models.accountWithReplaceOnPUTfalse.create({ app.models.accountWithReplaceOnPUTfalse.create({
userId: self.user.id, userId: self.loggedInAccessToken.userId,
balance: 100, balance: 100,
}, function(err, act) { }, function(err, act) {
actId = act.id; actId = act.id;