Skip to content

Commit

Permalink
refactor: clean up after connectorFeatures rename
Browse files Browse the repository at this point in the history
Clean up remaining places referencing "connectorFeatures" to use
"features" instead.

Signed-off-by: Miroslav Bajtoš <mbajtoss@gmail.com>
  • Loading branch information
bajtos committed Jul 22, 2019
1 parent 055eeeb commit c6c74d0
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion packages/repository-tests/README.md
Expand Up @@ -67,7 +67,7 @@ tests:
export function createRetrieveSuite(
dataSourceOptions: DataSourceOptions,
repositoryClass: CrudRepositoryCtor,
connectorFeatures: CrudConnectorFeatures,
features: CrudFeatures,
) {
// test code
}
Expand Down
10 changes: 5 additions & 5 deletions packages/repository-tests/src/crud-test-suite.ts
Expand Up @@ -20,26 +20,26 @@ const debug = debugFactory('loopback:repository-tests');
type SuiteFn = (
dataSourceOptions: DataSourceOptions,
repositoryClass: CrudRepositoryCtor,
connectorFeatures: CrudFeatures,
features: CrudFeatures,
) => void;

export function crudRepositoryTestSuite(
dataSourceOptions: DataSourceOptions,
repositoryClass: CrudRepositoryCtor,
connectorFeatures: Partial<CrudFeatures>,
partialFeatures: Partial<CrudFeatures>,
) {
const features: CrudFeatures = {
idType: 'string',
freeFormProperties: true,
...connectorFeatures,
...partialFeatures,
};

describe('CRUD Repository operations', () => {
before(
withCrudCtx(function setupContext(ctx: CrudTestContext) {
ctx.dataSourceOptions = dataSourceOptions;
ctx.repositoryClass = repositoryClass;
ctx.connectorFeatures = features;
ctx.features = features;
}),
);
before(
Expand Down Expand Up @@ -70,7 +70,7 @@ export function crudRepositoryTestSuite(
suite.name,
dataSourceOptions,
'class ' + repositoryClass.name,
connectorFeatures,
partialFeatures,
);
suite(dataSourceOptions, repositoryClass, features);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/repository-tests/src/crud/create-retrieve.suite.ts
Expand Up @@ -19,12 +19,12 @@ import {
export function createRetrieveSuite(
dataSourceOptions: DataSourceOptions,
repositoryClass: CrudRepositoryCtor,
connectorFeatures: CrudFeatures,
features: CrudFeatures,
) {
@model()
class Product extends Entity {
@property({
type: connectorFeatures.idType,
type: features.idType,
id: true,
generated: true,
description: 'The unique identifier for a product',
Expand Down
Expand Up @@ -18,17 +18,17 @@ import {
export function freeformPropertiesSuite(
dataSourceOptions: DataSourceOptions,
repositoryClass: CrudRepositoryCtor,
connectorFeatures: CrudFeatures,
features: CrudFeatures,
) {
skipIf<[(this: Suite) => void], void>(
!connectorFeatures.freeFormProperties,
!features.freeFormProperties,
describe,
'free-form properties (strict: false)',
() => {
@model({settings: {strict: false}})
class Freeform extends Entity {
@property({
type: connectorFeatures.idType,
type: features.idType,
id: true,
description: 'The unique identifier for a product',
})
Expand Down
2 changes: 1 addition & 1 deletion packages/repository-tests/src/types.repository-tests.ts
Expand Up @@ -60,6 +60,6 @@ export type CrudRepositoryCtor = new <
export interface CrudTestContext {
dataSourceOptions: DataSourceOptions;
repositoryClass: CrudRepositoryCtor;
connectorFeatures: CrudFeatures;
features: CrudFeatures;
dataSource: juggler.DataSource;
}
2 changes: 1 addition & 1 deletion packages/testlab/src/skip.ts
Expand Up @@ -17,7 +17,7 @@ export type TestDefinition<ARGS extends unknown[], RETVAL> = (
* @example
* ```ts
* skipIf(
* !connectorFeatures.freeFormProperties,
* !features.freeFormProperties,
* describe,
* 'free-form properties (strict: false)',
* () => {
Expand Down

0 comments on commit c6c74d0

Please sign in to comment.