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 #1112 from strongloop/fix/failing-test 

Fix test broken by recent juggler changes
This commit is contained in:
Miroslav Bajtoš 2015-02-20 13:23:38 +01:00
parent a19f39396f c925e669f7
commit d6761be40c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -52,7 +52,7 @@
"underscore.string": "~2.3.3" "underscore.string": "~2.3.3"
}, },
"peerDependencies": { "peerDependencies": {
"loopback-datasource-juggler": "^2.8.0" "loopback-datasource-juggler": "^2.17.0"
}, },
"devDependencies": { "devDependencies": {
"browserify": "~4.2.3", "browserify": "~4.2.3",
@ -79,7 +79,7 @@
"karma-phantomjs-launcher": "~0.1.4", "karma-phantomjs-launcher": "~0.1.4",
"karma-script-launcher": "~0.1.0", "karma-script-launcher": "~0.1.0",
"loopback-boot": "^1.1.0", "loopback-boot": "^1.1.0",
"loopback-datasource-juggler": "^2.8.0", "loopback-datasource-juggler": "^2.17.0",
"loopback-testing": "~0.2.0", "loopback-testing": "~0.2.0",
"mocha": "~1.21.4", "mocha": "~1.21.4",
"serve-favicon": "~2.1.3", "serve-favicon": "~2.1.3",

6
test/loopback.test.js
View File

@ -344,6 +344,8 @@ describe('loopback', function() {
emailVerificationRequired: false emailVerificationRequired: false
}); });
var baseName = model.settings.base.name;
loopback.configureModel(model, { loopback.configureModel(model, {
dataSource: null, dataSource: null,
options: { options: {
@ -357,7 +359,9 @@ describe('loopback', function() {
expect(model.settings).to.have.property('emailVerificationRequired', expect(model.settings).to.have.property('emailVerificationRequired',
false); false);
expect(model.settings).to.have.property('realmRequired', true); expect(model.settings).to.have.property('realmRequired', true);
expect(model.settings).to.not.have.property('base');
// configureModel MUST NOT change Model's base class
expect(model.settings.base.name).to.equal(baseName);
}); });
}); });