Skip to content

Fix Mongo compatibility issue #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Amir-61 merged 1 commit into from
Mar 30, 2016
Merged

Fix Mongo compatibility issue #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/memory.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@ describe('Optimized connector', function() {
}.bind(this));
};

require('./persistence-hooks.suite')(ds, should);
require('./persistence-hooks.suite')(ds, should, {replaceOrCreateReportsNewInstance: true});
});

describe('Unoptimized connector', function() {
Expand All @@ -862,7 +862,7 @@ describe('Unoptimized connector', function() {
ds.connector.updateOrCreate = false;
ds.connector.findOrCreate = false;

require('./persistence-hooks.suite')(ds, should);
require('./persistence-hooks.suite')(ds, should, {replaceOrCreateReportsNewInstance: true});
});

describe('Memory connector with options', function() {
Expand Down
66 changes: 46 additions & 20 deletions test/persistence-hooks.suite.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
var ValidationError = require('../').ValidationError;
var traverse = require('traverse');

module.exports = function(dataSource, should) {
module.exports = function(dataSource, should, connectorCapabilities) {
if (!connectorCapabilities) connectorCapabilities = {};
if (connectorCapabilities.replaceOrCreateReportsNewInstance === undefined) {
console.warn('The connector does not support a recently added feature: replaceOrCreateReportsNewInstance');
}
describe('Persistence hooks', function() {
var observedContexts, expectedError, observersCalled;
var TestModel, existingInstance;
Expand Down Expand Up @@ -2403,13 +2407,19 @@ module.exports = function(dataSource, should) {
{ id: 'new-id', name: 'a name' },
function(err, instance) {
if (err) return done(err);
observedContexts.should.eql(aTestModelCtx({

var expected = {
data: {
id: 'new-id',
name: 'a name'
},
isNewInstance: true
}));
}
};

expected.isNewInstance =
connectorCapabilities.replaceOrCreateReportsNewInstance ?
true : undefined;

observedContexts.should.eql(aTestModelCtx(expected));
done();
});
});
Expand All @@ -2422,14 +2432,19 @@ module.exports = function(dataSource, should) {
function(err, instance) {
if (err) return done(err);

var expected = {
data: {
id: existingInstance.id,
name: 'replaced name'
}
};

expected.isNewInstance =
connectorCapabilities.replaceOrCreateReportsNewInstance ?
false : undefined;

if (dataSource.connector.replaceOrCreate) {
observedContexts.should.eql(aTestModelCtx({
data: {
id: existingInstance.id,
name: 'replaced name'
},
isNewInstance: false
}));
observedContexts.should.eql(aTestModelCtx(expected));
} else {
// TODO: Please see loopback-datasource-juggler/issues#836
//
Expand Down Expand Up @@ -2479,14 +2494,20 @@ module.exports = function(dataSource, should) {
{ id: existingInstance.id, name: 'replaced name' },
function(err, instance) {
if (err) return done(err);
observedContexts.should.eql(aTestModelCtx({

var expected = {
instance: {
id: existingInstance.id,
name: 'replaced name',
extra: undefined
},
isNewInstance: false
}));
}
};

expected.isNewInstance =
connectorCapabilities.replaceOrCreateReportsNewInstance ?
false : undefined;

observedContexts.should.eql(aTestModelCtx(expected));
done();
});
});
Expand All @@ -2498,14 +2519,19 @@ module.exports = function(dataSource, should) {
{ id: 'new-id', name: 'a name' },
function(err, instance) {
if (err) return done(err);
observedContexts.should.eql(aTestModelCtx({

var expected = {
instance: {
id: instance.id,
name: 'a name',
extra: undefined
},
isNewInstance: true
}));
}
};
expected.isNewInstance =
connectorCapabilities.replaceOrCreateReportsNewInstance ?
true : undefined;

observedContexts.should.eql(aTestModelCtx(expected));
done();
});
});
Expand Down