Detect deleteAll support in KVAO tests #1218
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
superkhau
force-pushed
the
clear-cache-if-delete-all-supported
branch
from
bde2a21
to
a09667c
Compare
bajtos
reviewed
Jan 10, 2017
| @@ -11,6 +11,8 @@ module.exports = function(dataSourceFactory, connectorCapabilities) { | |||
| let CacheItem; | |||
| beforeEach(function unpackContext() { | |||
| CacheItem = helpers.givenCacheItem(dataSourceFactory); | |||
| if (helpers.connectorSupports('deleteAll', dataSourceFactory)) | |||
| return CacheItem.deleteAll(); | |||
There was a problem hiding this comment.
Actually, I think we should move CacheItem.deleteAll into givenCacheItem.
superkhau
force-pushed
the
clear-cache-if-delete-all-supported
branch
6 times, most recently
from
615f7b1
to
0bab394
Compare
superkhau
force-pushed
the
clear-cache-if-delete-all-supported
branch
from
0bab394
to
ff34d25
Compare
bajtos
suggested changes
Jan 10, 2017
| return CacheItem; | ||
| }; | ||
|
|
||
| exports.givenAnotherModel = function(dataSourceFactory) { |
There was a problem hiding this comment.
I think it's time to create a more generic givenModel method.
| key: String, | ||
| value: 'any', | ||
| }); | ||
| if ('deleteAll' in dataSource.connector) | ||
| CacheItem.deleteAll(); |
There was a problem hiding this comment.
You need to wait until deleteAll returns before starting the tests.
I think we need to change givenCacheItem to return a promise now.
exports.givenCacheItem = function(dataSourceFactory) {
// note - most of this code should be moved to `givenModel`
// ...
const p = 'deleteAll' in dataSource.connector ?
CacheItem.deleteAll() : Promise.resolve;
return p.then(() => CacheItem);
};| @@ -11,7 +11,6 @@ module.exports = function(dataSourceFactory, connectorCapabilities) { | |||
| let CacheItem; | |||
| beforeEach(function unpackContext() { | |||
| CacheItem = helpers.givenCacheItem(dataSourceFactory); | |||
| return CacheItem.deleteAll(); | |||
There was a problem hiding this comment.
beforeEach(function unpackContext() {
return helpers.givenCacheItem(dataSourceFactory)
.then(ModelCtor => CacheItem = ModelCtor);
});| @@ -23,12 +23,13 @@ module.exports = function(dataSourceFactory, connectorCapabilities) { | |||
| }); | |||
|
|
|||
| it('does not remove data from other existing models', function() { | |||
| var AnotherModel = dataSourceFactory().createModel('AnotherModel'); | |||
| var AnotherModel = helpers.givenAnotherModel(dataSourceFactory); | |||
There was a problem hiding this comment.
helpers.givenModel(dataSourceFactory, 'AnotherModel')
.then(ModelCtor => {
AnotherModel = ModelCtor;
return helpers.givenKeys(CacheItem, ['key1', 'key2']);
})
.then(() => helpers.givenKeys(AnotherModel, ['key3', 'key4']))
// ...Write
superkhau
force-pushed
the
clear-cache-if-delete-all-supported
branch
2 times, most recently
from
ebb786f
to
e29c9c7
Compare
bajtos
reviewed
Jan 10, 2017
| beforeEach(function unpackContext() { | ||
| CacheItem = helpers.givenCacheItem(dataSourceFactory); | ||
| beforeEach(function setupCacheItem() { | ||
| helpers.givenCacheItem(dataSourceFactory) |
superkhau
force-pushed
the
clear-cache-if-delete-all-supported
branch
from
e29c9c7
to
0149c42
Compare
|
@bajtos PTAL, I assume this is good now? CI fails are unrelated. |
|
@slnode test please |
Clear CacheItem data between tests if connector supports `deleteAll`. Tests fail with 501 if this check is not used.
superkhau
force-pushed
the
clear-cache-if-delete-all-supported
branch
from
0149c42
to
0b93c5c
Compare
|
@bajtos Gonna land this as everything is passing and I addressed all your concerns in the previous comments so I can test the KVXS PR. |
|
Follow up issue for oracle fail at loopbackio/loopback-connector-oracle#100 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Clear CacheItem data between tests if connector supports
deleteAll. Tests fail with 501 if this check is not used.