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 #268 from strongloop/feature/update-deps 

Feature/update deps
This commit is contained in:
Raymond Feng 2014-05-26 21:53:45 -07:00
parent 1ebeca66f2 ed0b568542
commit 25250a03d1
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
package.json
View File

@ -34,45 +34,45 @@
"test": "mocha -R spec" "test": "mocha -R spec"
}, },
"dependencies": { "dependencies": {
"debug": "~0.7.4", "debug": "~0.8.1",
"express": "~3.4.8", "express": "~3.5.0",
"strong-remoting": "~1.3.1", "strong-remoting": "~1.4.0",
"inflection": "~1.3.5", "inflection": "~1.3.5",
"passport": "~0.2.0", "passport": "~0.2.0",
"passport-local": "~0.1.6", "passport-local": "~1.0.0",
"nodemailer": "~0.6.0", "nodemailer": "~0.6.5",
"ejs": "~0.8.5", "ejs": "~1.0.0",
"bcryptjs": "~0.7.12", "bcryptjs": "~0.7.12",
"underscore.string": "~2.3.3", "underscore.string": "~2.3.3",
"underscore": "~1.6.0", "underscore": "~1.6.0",
"uid2": "0.0.3", "uid2": "0.0.3",
"async": "~0.2.10" "async": "~0.9.0"
}, },
"peerDependencies": { "peerDependencies": {
"loopback-datasource-juggler": ">=1.4.0 <1.6.0" "loopback-datasource-juggler": ">=1.4.0 <1.6.0"
}, },
"devDependencies": { "devDependencies": {
"loopback-datasource-juggler": ">=1.4.0 <1.6.0", "loopback-datasource-juggler": ">=1.4.0 <1.6.0",
"mocha": "~1.17.1", "mocha": "~1.18.0",
"strong-task-emitter": "0.0.x", "strong-task-emitter": "0.0.x",
"supertest": "~0.9.0", "supertest": "~0.12.1",
"chai": "~1.9.0", "chai": "~1.9.1",
"loopback-testing": "~0.1.2", "loopback-testing": "~0.1.2",
"browserify": "~3.41.0", "browserify": "~4.1.5",
"grunt": "~0.4.2", "grunt": "~0.4.5",
"grunt-browserify": "~1.3.1", "grunt-browserify": "~2.1.0",
"grunt-contrib-uglify": "~0.3.2", "grunt-contrib-uglify": "~0.4.0",
"grunt-contrib-jshint": "~0.8.0", "grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-watch": "~0.5.3", "grunt-contrib-watch": "~0.6.1",
"karma-script-launcher": "~0.1.0", "karma-script-launcher": "~0.1.0",
"karma-chrome-launcher": "~0.1.2", "karma-chrome-launcher": "~0.1.3",
"karma-firefox-launcher": "~0.1.3", "karma-firefox-launcher": "~0.1.3",
"karma-html2js-preprocessor": "~0.1.0", "karma-html2js-preprocessor": "~0.1.0",
"karma-phantomjs-launcher": "~0.1.2", "karma-phantomjs-launcher": "~0.1.4",
"karma": "~0.10.9", "karma": "~0.12.16",
"karma-browserify": "~0.2.0", "karma-browserify": "~0.2.0",
"karma-mocha": "~0.1.1", "karma-mocha": "~0.1.3",
"grunt-karma": "~0.6.2" "grunt-karma": "~0.8.3"
}, },
"repository": { "repository": {
"type": "git", "type": "git",

10
test/acl.test.js
View File

@ -14,10 +14,13 @@ function checkResult(err, result) {
assert(!err); assert(!err);
} }
describe('security scopes', function () { var ds = null;
before(function() {
ds = loopback.createDataSource({connector: loopback.Memory});
});
describe('security scopes', function () {
beforeEach(function() { beforeEach(function() {
var ds = this.ds = loopback.createDataSource({connector: loopback.Memory});
testModel = loopback.Model.extend('testModel'); testModel = loopback.Model.extend('testModel');
ACL.attachTo(ds); ACL.attachTo(ds);
Role.attachTo(ds); Role.attachTo(ds);
@ -156,7 +159,6 @@ describe('security ACLs', function () {
}); });
it("should honor defaultPermission from the model", function () { it("should honor defaultPermission from the model", function () {
var ds = this.ds;
var Customer = ds.createModel('Customer', { var Customer = ds.createModel('Customer', {
name: { name: {
type: String, type: String,
@ -188,7 +190,6 @@ describe('security ACLs', function () {
}); });
it("should honor static ACLs from the model", function () { it("should honor static ACLs from the model", function () {
var ds = this.ds;
var Customer = ds.createModel('Customer', { var Customer = ds.createModel('Customer', {
name: { name: {
type: String, type: String,
@ -226,7 +227,6 @@ describe('security ACLs', function () {
it("should check access against LDL, ACL, and Role", function () { it("should check access against LDL, ACL, and Role", function () {
// var log = console.log; // var log = console.log;
var log = function() {}; var log = function() {};
var ds = this.ds;
// Create // Create
User.create({name: 'Raymond', email: 'x@y.com', password: 'foobar'}, function (err, user) { User.create({name: 'Raymond', email: 'x@y.com', password: 'foobar'}, function (err, user) {