@thisisagile/easy-test 10.10.8 → 10.11.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/mock/Fits.js CHANGED
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.fits = void 0;
4
4
  const Utils_1 = require("../utils/Utils");
5
5
  const Eq_1 = require("../utils/Eq");
6
- const asymmetricMatchers_1 = require("expect/build/asymmetricMatchers");
7
- class ObjectContainingText extends asymmetricMatchers_1.AsymmetricMatcher {
6
+ const expect_1 = require("expect");
7
+ class ObjectContainingText extends expect_1.AsymmetricMatcher {
8
8
  asymmetricMatch(other) {
9
9
  return (0, Utils_1.asString)(other).includes((0, Utils_1.asString)(this.sample));
10
10
  }
@@ -12,7 +12,7 @@ class ObjectContainingText extends asymmetricMatchers_1.AsymmetricMatcher {
12
12
  return `String${this.inverse ? 'Not' : ''}Containing`;
13
13
  }
14
14
  }
15
- class ObjectContainingJson extends asymmetricMatchers_1.AsymmetricMatcher {
15
+ class ObjectContainingJson extends expect_1.AsymmetricMatcher {
16
16
  asymmetricMatch(other) {
17
17
  return Eq_1.eq.subset((0, Utils_1.asJson)(other), (0, Utils_1.asJson)(this.sample));
18
18
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Fits.js","sourceRoot":"","sources":["../../src/mock/Fits.ts"],"names":[],"mappings":";;;AAAA,0CAAkD;AAClD,oCAAiC;AACjC,wEAAoE;AAEpE,MAAM,oBAAqB,SAAQ,sCAAyB;IAC1D,eAAe,CAAC,KAAU;QACxB,OAAO,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAA,gBAAQ,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,QAAQ;QACN,OAAO,SAAS,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC;IACxD,CAAC;CACF;AAED,MAAM,oBAAqB,SAAQ,sCAAsB;IACvD,eAAe,CAAC,KAAU;QACxB,OAAO,OAAE,CAAC,MAAM,CAAC,IAAA,cAAM,EAAC,KAAK,CAAC,EAAE,IAAA,cAAM,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,QAAQ;QACN,OAAO,SAAS,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC;IACxD,CAAC;CACF;AAEY,QAAA,IAAI,GAAG;IAClB,GAAG,EAAE,GAAQ,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE;IACjC,IAAI,EAAE,CAAC,IAAc,EAAO,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;IAC/C,IAAI,EAAE,CAAC,CAAU,EAAO,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACrD,IAAI,EAAE,CAAC,CAAM,EAAO,EAAE,CAAC,IAAI,oBAAoB,CAAC,CAAC,CAAC;IAClD,IAAI,EAAE,CAAC,CAAM,EAAO,EAAE,CAAC,IAAI,oBAAoB,CAAC,CAAC,CAAC;CACnD,CAAC"}
1
+ {"version":3,"file":"Fits.js","sourceRoot":"","sources":["../../src/mock/Fits.ts"],"names":[],"mappings":";;;AAAA,0CAAkD;AAClD,oCAAiC;AACjC,mCAA2C;AAE3C,MAAM,oBAAqB,SAAQ,0BAAyB;IAC1D,eAAe,CAAC,KAAU;QACxB,OAAO,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAA,gBAAQ,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,QAAQ;QACN,OAAO,SAAS,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC;IACxD,CAAC;CACF;AAED,MAAM,oBAAqB,SAAQ,0BAAsB;IACvD,eAAe,CAAC,KAAU;QACxB,OAAO,OAAE,CAAC,MAAM,CAAC,IAAA,cAAM,EAAC,KAAK,CAAC,EAAE,IAAA,cAAM,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,QAAQ;QACN,OAAO,SAAS,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC;IACxD,CAAC;CACF;AAEY,QAAA,IAAI,GAAG;IAClB,GAAG,EAAE,GAAQ,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE;IACjC,IAAI,EAAE,CAAC,IAAc,EAAO,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;IAC/C,IAAI,EAAE,CAAC,CAAU,EAAO,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACrD,IAAI,EAAE,CAAC,CAAM,EAAO,EAAE,CAAC,IAAI,oBAAoB,CAAC,CAAC,CAAC;IAClD,IAAI,EAAE,CAAC,CAAM,EAAO,EAAE,CAAC,IAAI,oBAAoB,CAAC,CAAC,CAAC;CACnD,CAAC"}
package/dist/utils/Eq.js CHANGED
@@ -1,12 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.eq = void 0;
4
- const jasmineUtils_1 = require("expect/build/jasmineUtils");
5
- const utils_1 = require("expect/build/utils");
6
4
  const Utils_1 = require("./Utils");
5
+ const expect_utils_1 = require("@jest/expect-utils");
7
6
  exports.eq = {
8
- exact: (a, b) => (0, jasmineUtils_1.equals)(a, b, []),
9
- subset: (a, b) => (0, jasmineUtils_1.equals)(a, b, [utils_1.iterableEquality, utils_1.subsetEquality]),
7
+ exact: (a, b) => (0, expect_utils_1.equals)(a, b, []),
8
+ subset: (a, b) => (0, expect_utils_1.equals)(a, b, [expect_utils_1.iterableEquality, expect_utils_1.subsetEquality]),
10
9
  string: (a, b) => (0, Utils_1.asString)(a) === (0, Utils_1.asString)(b),
11
10
  };
12
11
  //# sourceMappingURL=Eq.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Eq.js","sourceRoot":"","sources":["../../src/utils/Eq.ts"],"names":[],"mappings":";;;AAAA,4DAAmD;AACnD,8CAAsE;AACtE,mCAAmC;AAEtB,QAAA,EAAE,GAAG;IAChB,KAAK,EAAE,CAAC,CAAW,EAAE,CAAW,EAAW,EAAE,CAAC,IAAA,qBAAM,EAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC9D,MAAM,EAAE,CAAC,CAAW,EAAE,CAAW,EAAW,EAAE,CAAC,IAAA,qBAAM,EAAC,CAAC,EAAE,CAAC,EAAE,CAAC,wBAAgB,EAAE,sBAAc,CAAC,CAAC;IAC/F,MAAM,EAAE,CAAC,CAAW,EAAE,CAAW,EAAW,EAAE,CAAC,IAAA,gBAAQ,EAAC,CAAC,CAAC,KAAK,IAAA,gBAAQ,EAAC,CAAC,CAAC;CAC3E,CAAC"}
1
+ {"version":3,"file":"Eq.js","sourceRoot":"","sources":["../../src/utils/Eq.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,qDAA8E;AAEjE,QAAA,EAAE,GAAG;IAChB,KAAK,EAAE,CAAC,CAAW,EAAE,CAAW,EAAW,EAAE,CAAC,IAAA,qBAAM,EAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC9D,MAAM,EAAE,CAAC,CAAW,EAAE,CAAW,EAAW,EAAE,CAAC,IAAA,qBAAM,EAAC,CAAC,EAAE,CAAC,EAAE,CAAC,+BAAgB,EAAE,6BAAc,CAAC,CAAC;IAC/F,MAAM,EAAE,CAAC,CAAW,EAAE,CAAW,EAAW,EAAE,CAAC,IAAA,gBAAQ,EAAC,CAAC,CAAC,KAAK,IAAA,gBAAQ,EAAC,CAAC,CAAC;CAC3E,CAAC"}
@@ -4,6 +4,8 @@ export declare class Req {
4
4
  constructor(state?: any);
5
5
  get id(): Id;
6
6
  get q(): JsonValue;
7
+ get skip(): number | undefined;
8
+ get take(): number | undefined;
7
9
  get path(): Json;
8
10
  get query(): Json;
9
11
  get body(): unknown;
package/dist/utils/Req.js CHANGED
@@ -12,6 +12,12 @@ class Req {
12
12
  get q() {
13
13
  return this.state.q ?? this.query.q;
14
14
  }
15
+ get skip() {
16
+ return this.state?.query.skip;
17
+ }
18
+ get take() {
19
+ return this.state?.query.take;
20
+ }
15
21
  get path() {
16
22
  return this.state?.path ?? {};
17
23
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Req.js","sourceRoot":"","sources":["../../src/utils/Req.ts"],"names":[],"mappings":";;;AAEA,MAAa,GAAG;IACd,YAAqB,QAAa,EAAE;QAAf,UAAK,GAAL,KAAK,CAAU;QAsBpC,QAAG,GAAG,CAAC,GAAS,EAAO,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAtB1E,CAAC;IAExC,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACvC,CAAC;IAED,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC;IAChC,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC;IACjC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IACzB,CAAC;CAGF;AAxBD,kBAwBC"}
1
+ {"version":3,"file":"Req.js","sourceRoot":"","sources":["../../src/utils/Req.ts"],"names":[],"mappings":";;;AAEA,MAAa,GAAG;IACd,YAAqB,QAAa,EAAE;QAAf,UAAK,GAAL,KAAK,CAAU;QAgCpC,QAAG,GAAG,CAAC,GAAS,EAAO,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IA/BjH,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACvC,CAAC;IAED,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC;IAChC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC;IAChC,CAAC;IAGD,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC;IAChC,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC;IACjC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IACzB,CAAC;CAGF;AAlCD,kBAkCC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@thisisagile/easy-test",
3
- "version": "10.10.8",
3
+ "version": "10.11.2",
4
4
  "description": "Straightforward library for testing microservices built with @thisisagile/easy",
5
5
  "author": "Sander Hoogendoorn",
6
6
  "license": "MIT",
@@ -36,12 +36,13 @@
36
36
  "weak-napi": "^2.0.2"
37
37
  },
38
38
  "dependencies": {
39
- "@types/jest": "^27.5.0",
40
- "@types/node": "^17.0.31",
41
- "expect": "27.5.1",
42
- "jest": "27.5.1",
39
+ "@jest/expect-utils": "^28.1.0",
40
+ "@types/jest": "^27.5.1",
41
+ "@types/node": "^17.0.33",
42
+ "expect": "28.1.0",
43
+ "jest": "28.1.0",
43
44
  "jest-junit": "^13.2.0",
44
45
  "jest-sonar-reporter": "^2.0.0",
45
- "ts-jest": "^27.1.4"
46
+ "ts-jest": "^28.0.2"
46
47
  }
47
48
  }
package/src/mock/Fits.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { asJson, asString } from '../utils/Utils';
2
2
  import { eq } from '../utils/Eq';
3
- import { AsymmetricMatcher } from 'expect/build/asymmetricMatchers';
3
+ import { AsymmetricMatcher } from 'expect';
4
4
 
5
5
  class ObjectContainingText extends AsymmetricMatcher<string> {
6
6
  asymmetricMatch(other: any) {
package/src/utils/Eq.ts CHANGED
@@ -1,6 +1,5 @@
1
- import { equals } from 'expect/build/jasmineUtils';
2
- import { iterableEquality, subsetEquality } from 'expect/build/utils';
3
1
  import { asString } from './Utils';
2
+ import { equals, iterableEquality, subsetEquality } from "@jest/expect-utils";
4
3
 
5
4
  export const eq = {
6
5
  exact: (a?: unknown, b?: unknown): boolean => equals(a, b, []),
package/src/utils/Req.ts CHANGED
@@ -1,7 +1,8 @@
1
1
  import { Id, Json, JsonValue, Text } from './Types';
2
2
 
3
3
  export class Req {
4
- constructor(readonly state: any = {}) {}
4
+ constructor(readonly state: any = {}) {
5
+ }
5
6
 
6
7
  get id(): Id {
7
8
  return this.state.id ?? this.path.id;
@@ -11,6 +12,15 @@ export class Req {
11
12
  return this.state.q ?? this.query.q;
12
13
  }
13
14
 
15
+ get skip(): number | undefined {
16
+ return this.state?.query.skip;
17
+ }
18
+
19
+ get take(): number | undefined {
20
+ return this.state?.query.take;
21
+ }
22
+
23
+
14
24
  get path(): Json {
15
25
  return this.state?.path ?? {};
16
26
  }