Merge pull request #1439 from strongloop/use-connector-flag
use connector flag throughout tests
This commit is contained in:
commit
fc83ff14a5
|
@ -17,10 +17,12 @@ var uid = require('./helpers/uid-generator');
|
||||||
var getLastGeneratedUid = uid.last;
|
var getLastGeneratedUid = uid.last;
|
||||||
|
|
||||||
var HookMonitor = require('./helpers/hook-monitor');
|
var HookMonitor = require('./helpers/hook-monitor');
|
||||||
|
var isNewInstanceFlag;
|
||||||
|
|
||||||
module.exports = function(dataSource, should, connectorCapabilities) {
|
module.exports = function(dataSource, should, connectorCapabilities) {
|
||||||
|
isNewInstanceFlag = connectorCapabilities.replaceOrCreateReportsNewInstance;
|
||||||
if (!connectorCapabilities) connectorCapabilities = {};
|
if (!connectorCapabilities) connectorCapabilities = {};
|
||||||
if (connectorCapabilities.replaceOrCreateReportsNewInstance === undefined) {
|
if (isNewInstanceFlag === undefined) {
|
||||||
var warn = 'The connector does not support a recently added feature:' +
|
var warn = 'The connector does not support a recently added feature:' +
|
||||||
' replaceOrCreateReportsNewInstance';
|
' replaceOrCreateReportsNewInstance';
|
||||||
console.warn(warn);
|
console.warn(warn);
|
||||||
|
@ -1219,7 +1221,7 @@ module.exports = function(dataSource, should, connectorCapabilities) {
|
||||||
name: existingInstance.name,
|
name: existingInstance.name,
|
||||||
extra: 'changed',
|
extra: 'changed',
|
||||||
},
|
},
|
||||||
isNewInstance: false,
|
isNewInstance: isNewInstanceFlag ? false : undefined,
|
||||||
options: {throws: false, validate: true},
|
options: {throws: false, validate: true},
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
@ -1260,7 +1262,7 @@ module.exports = function(dataSource, should, connectorCapabilities) {
|
||||||
name: 'changed',
|
name: 'changed',
|
||||||
extra: undefined,
|
extra: undefined,
|
||||||
},
|
},
|
||||||
isNewInstance: false,
|
isNewInstance: isNewInstanceFlag ? false : undefined,
|
||||||
options: {throws: false, validate: true},
|
options: {throws: false, validate: true},
|
||||||
}));
|
}));
|
||||||
done();
|
done();
|
||||||
|
@ -1285,7 +1287,7 @@ module.exports = function(dataSource, should, connectorCapabilities) {
|
||||||
name: 'created',
|
name: 'created',
|
||||||
extra: undefined,
|
extra: undefined,
|
||||||
},
|
},
|
||||||
isNewInstance: true,
|
isNewInstance: isNewInstanceFlag ? true : undefined,
|
||||||
options: {throws: false, validate: true},
|
options: {throws: false, validate: true},
|
||||||
}));
|
}));
|
||||||
done();
|
done();
|
||||||
|
@ -2152,7 +2154,7 @@ module.exports = function(dataSource, should, connectorCapabilities) {
|
||||||
if (dataSource.connector.updateOrCreate) {
|
if (dataSource.connector.updateOrCreate) {
|
||||||
ctxRecorder.records.should.eql(aCtxForModel(TestModel, {
|
ctxRecorder.records.should.eql(aCtxForModel(TestModel, {
|
||||||
data: {id: 'new-id', name: 'a name'},
|
data: {id: 'new-id', name: 'a name'},
|
||||||
isNewInstance: true,
|
isNewInstance: isNewInstanceFlag ? true : undefined,
|
||||||
}));
|
}));
|
||||||
} else {
|
} else {
|
||||||
ctxRecorder.records.should.eql(aCtxForModel(TestModel, {
|
ctxRecorder.records.should.eql(aCtxForModel(TestModel, {
|
||||||
|
@ -2179,7 +2181,7 @@ module.exports = function(dataSource, should, connectorCapabilities) {
|
||||||
id: existingInstance.id,
|
id: existingInstance.id,
|
||||||
name: 'updated name',
|
name: 'updated name',
|
||||||
},
|
},
|
||||||
isNewInstance: false,
|
isNewInstance: isNewInstanceFlag ? false : undefined,
|
||||||
}));
|
}));
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
|
@ -2208,7 +2210,7 @@ module.exports = function(dataSource, should, connectorCapabilities) {
|
||||||
name: 'updated name',
|
name: 'updated name',
|
||||||
extra: undefined,
|
extra: undefined,
|
||||||
},
|
},
|
||||||
isNewInstance: false,
|
isNewInstance: isNewInstanceFlag ? false : undefined,
|
||||||
}));
|
}));
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
|
@ -2238,7 +2240,7 @@ module.exports = function(dataSource, should, connectorCapabilities) {
|
||||||
name: 'a name',
|
name: 'a name',
|
||||||
extra: undefined,
|
extra: undefined,
|
||||||
},
|
},
|
||||||
isNewInstance: true,
|
isNewInstance: isNewInstanceFlag ? true : undefined,
|
||||||
}));
|
}));
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
|
@ -2560,7 +2562,7 @@ module.exports = function(dataSource, should, connectorCapabilities) {
|
||||||
};
|
};
|
||||||
|
|
||||||
expected.isNewInstance =
|
expected.isNewInstance =
|
||||||
connectorCapabilities.replaceOrCreateReportsNewInstance ?
|
isNewInstanceFlag ?
|
||||||
true : undefined;
|
true : undefined;
|
||||||
|
|
||||||
ctxRecorder.records.should.eql(aCtxForModel(TestModel, expected));
|
ctxRecorder.records.should.eql(aCtxForModel(TestModel, expected));
|
||||||
|
@ -2584,7 +2586,7 @@ module.exports = function(dataSource, should, connectorCapabilities) {
|
||||||
};
|
};
|
||||||
|
|
||||||
expected.isNewInstance =
|
expected.isNewInstance =
|
||||||
connectorCapabilities.replaceOrCreateReportsNewInstance ?
|
isNewInstanceFlag ?
|
||||||
false : undefined;
|
false : undefined;
|
||||||
|
|
||||||
ctxRecorder.records.should.eql(aCtxForModel(TestModel, expected));
|
ctxRecorder.records.should.eql(aCtxForModel(TestModel, expected));
|
||||||
|
@ -2619,7 +2621,7 @@ module.exports = function(dataSource, should, connectorCapabilities) {
|
||||||
};
|
};
|
||||||
|
|
||||||
expected.isNewInstance =
|
expected.isNewInstance =
|
||||||
connectorCapabilities.replaceOrCreateReportsNewInstance ?
|
isNewInstanceFlag ?
|
||||||
false : undefined;
|
false : undefined;
|
||||||
|
|
||||||
ctxRecorder.records.should.eql(aCtxForModel(TestModel, expected));
|
ctxRecorder.records.should.eql(aCtxForModel(TestModel, expected));
|
||||||
|
@ -2643,7 +2645,7 @@ module.exports = function(dataSource, should, connectorCapabilities) {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
expected.isNewInstance =
|
expected.isNewInstance =
|
||||||
connectorCapabilities.replaceOrCreateReportsNewInstance ?
|
isNewInstanceFlag ?
|
||||||
true : undefined;
|
true : undefined;
|
||||||
|
|
||||||
ctxRecorder.records.should.eql(aCtxForModel(TestModel, expected));
|
ctxRecorder.records.should.eql(aCtxForModel(TestModel, expected));
|
||||||
|
|
Loading…
Reference in New Issue