@thisisagile/easy-test 8.41.12 → 8.42.0

package/dist/matchers/index.d.ts

@@ -4,6 +4,7 @@ export * from './ResultMatchers';
 export * from './toBeArrayOf';
 export * from './toBeArrayOfWithLength';
 export * from './toBeAt';
+export * from './toBeExactlyAt';
 export * from './toFailMatcher';
 export * from './toBeValid';
 export * from './toMatchExactJson';

package/dist/matchers/index.js

@@ -16,6 +16,7 @@ __exportStar(require("./ResultMatchers"), exports);
 __exportStar(require("./toBeArrayOf"), exports);
 __exportStar(require("./toBeArrayOfWithLength"), exports);
 __exportStar(require("./toBeAt"), exports);
+__exportStar(require("./toBeExactlyAt"), exports);
 __exportStar(require("./toFailMatcher"), exports);
 __exportStar(require("./toBeValid"), exports);
 __exportStar(require("./toMatchExactJson"), exports);

package/dist/matchers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/matchers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA+B;AAC/B,0CAAwB;AACxB,mDAAiC;AACjC,gDAA8B;AAC9B,0DAAwC;AACxC,2CAAyB;AACzB,kDAAgC;AAChC,8CAA4B;AAC5B,qDAAmC;AACnC,qDAAmC;AACnC,gDAA8B;AAC9B,iDAA+B;AAC/B,gDAA8B;AAC9B,kDAAgC;AAChC,oDAAkC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/matchers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA+B;AAC/B,0CAAwB;AACxB,mDAAiC;AACjC,gDAA8B;AAC9B,0DAAwC;AACxC,2CAAyB;AACzB,kDAAgC;AAChC,kDAAgC;AAChC,8CAA4B;AAC5B,qDAAmC;AACnC,qDAAmC;AACnC,gDAA8B;AAC9B,iDAA+B;AAC/B,gDAA8B;AAC9B,kDAAgC;AAChC,oDAAkC"}

package/dist/matchers/toBeAt.js

@@ -1,18 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBeAt = void 0;
-const Utils_1 = require("../utils/Utils");
 const Match_1 = require("./Match");
-const toUrl = (uc, id) => {
-    const i = (0, Utils_1.isDefined)(id) ? `/${id}` : '';
-    return `/${uc.app.id}/${uc.id}${i}`;
-};
 const toBeAt = (tester, uc, id) => {
     return (0, Match_1.match)(tester)
         .undefined(t => t, 'Tester is undefined')
         .undefined(t => t.url, 'Tester does not contain a URL')
         .undefined(() => uc, 'Use case is undefined')
-        .not(t => t.url.includes(toUrl(uc, id)), t => `We expected the tester to be at: '${toUrl(uc, id)}', but it is at: '${t?.url}' instead.`)
+        .not(t => t.url.includes(`/${uc?.app.id}`), t => `We expected the tester to be at app '${uc?.app.id}', but it is at '${t?.url}' instead.`)
+        .not(t => t.url.includes(`/${uc?.id}`), t => `We expected the tester to be at use case '${uc?.id}', but it is at '${t?.url}' instead.`)
+        .not(t => t.url.includes(id ? `/${id}` : ''), t => `We expected the path to contain '/42', but it is '${t?.url}' instead.`)
         .else(t => `The tester is at '${t?.url}'`);
 };
 exports.toBeAt = toBeAt;

package/dist/matchers/toBeAt.js.map

@@ -1 +1 @@
-{"version":3,"file":"toBeAt.js","sourceRoot":"","sources":["../../src/matchers/toBeAt.ts"],"names":[],"mappings":";;;AAEA,0CAA2C;AAC3C,mCAAgC;AAEhC,MAAM,KAAK,GAAG,CAAC,EAAW,EAAE,EAAO,EAAU,EAAE;IAC7C,MAAM,CAAC,GAAG,IAAA,iBAAS,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACxC,OAAO,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;AACtC,CAAC,CAAC;AAEK,MAAM,MAAM,GAAG,CAAC,MAAe,EAAE,EAAY,EAAE,EAAO,EAAuB,EAAE;IACpF,OAAO,IAAA,aAAK,EAAS,MAAgB,CAAC;SACnC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,qBAAqB,CAAC;SACxC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,+BAA+B,CAAC;SACtD,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,uBAAuB,CAAC;SAC5C,GAAG,CACF,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAa,EAAE,EAAE,CAAC,CAAC,EAC7C,CAAC,CAAC,EAAE,CAAC,qCAAqC,KAAK,CAAC,EAAa,EAAE,EAAE,CAAC,qBAAqB,CAAC,EAAE,GAAG,YAAY,CAC1G;SACA,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC;AAC/C,CAAC,CAAC;AAVW,QAAA,MAAM,UAUjB;AAEF,MAAM,CAAC,MAAM,CAAC;IACZ,MAAM,EAAN,cAAM;CACP,CAAC,CAAC"}
+{"version":3,"file":"toBeAt.js","sourceRoot":"","sources":["../../src/matchers/toBeAt.ts"],"names":[],"mappings":";;;AAEA,mCAAgC;AAEzB,MAAM,MAAM,GAAG,CAAC,MAAe,EAAE,EAAY,EAAE,EAAO,EAAuB,EAAE;IACpF,OAAO,IAAA,aAAK,EAAS,MAAgB,CAAC;SACnC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,qBAAqB,CAAC;SACxC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,+BAA+B,CAAC;SACtD,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,uBAAuB,CAAC;SAC5C,GAAG,CACF,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,EACrC,CAAC,CAAC,EAAE,CAAC,wCAAwC,EAAE,EAAE,GAAG,CAAC,EAAE,oBAAoB,CAAC,EAAE,GAAG,YAAY,CAC9F;SACA,GAAG,CACF,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,EACjC,CAAC,CAAC,EAAE,CAAC,6CAA6C,EAAE,EAAE,EAAE,oBAAoB,CAAC,EAAE,GAAG,YAAY,CAC/F;SACA,GAAG,CACF,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACvC,CAAC,CAAC,EAAE,CAAC,qDAAqD,CAAC,EAAE,GAAG,YAAY,CAC7E;SACA,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC;AAC/C,CAAC,CAAC;AAlBW,QAAA,MAAM,UAkBjB;AAEF,MAAM,CAAC,MAAM,CAAC;IACZ,MAAM,EAAN,cAAM;CACP,CAAC,CAAC"}

package/dist/matchers/toBeExactlyAt.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="jest" />
+import CustomMatcherResult = jest.CustomMatcherResult;
+import { Id, Tester, UseCase } from '../utils/Types';
+export declare const toBeExactlyAt: (tester?: Tester | undefined, uc?: UseCase | undefined, id?: Id | undefined) => CustomMatcherResult;
+declare global {
+    namespace jest {
+        interface Matchers<R, T> {
+            toBeExactlyAt(uc?: UseCase, id?: Id): R;
+        }
+    }
+}

package/dist/matchers/toBeExactlyAt.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toBeExactlyAt = void 0;
+const Utils_1 = require("../utils/Utils");
+const Match_1 = require("./Match");
+const toUrl = (uc, id) => {
+    const i = (0, Utils_1.isDefined)(id) ? `/${id}` : '';
+    return `/${uc.app.id}/${uc.id}${i}`;
+};
+const toBeExactlyAt = (tester, uc, id) => {
+    return (0, Match_1.match)(tester)
+        .undefined(t => t, 'Tester is undefined')
+        .undefined(t => t.url, 'Tester does not contain a URL')
+        .undefined(() => uc, 'Use case is undefined')
+        .not(t => t.url.includes(toUrl(uc, id)), t => `We expected the tester to be at: '${toUrl(uc, id)}', but it is at: '${t?.url}' instead.`)
+        .else(t => `The tester is at '${t?.url}'`);
+};
+exports.toBeExactlyAt = toBeExactlyAt;
+expect.extend({
+    toBeExactlyAt: exports.toBeExactlyAt,
+});
+//# sourceMappingURL=toBeExactlyAt.js.map

package/dist/matchers/toBeExactlyAt.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"toBeExactlyAt.js","sourceRoot":"","sources":["../../src/matchers/toBeExactlyAt.ts"],"names":[],"mappings":";;;AAEA,0CAA2C;AAC3C,mCAAgC;AAEhC,MAAM,KAAK,GAAG,CAAC,EAAW,EAAE,EAAO,EAAU,EAAE;IAC7C,MAAM,CAAC,GAAG,IAAA,iBAAS,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACxC,OAAO,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;AACtC,CAAC,CAAC;AAEK,MAAM,aAAa,GAAG,CAAC,MAAe,EAAE,EAAY,EAAE,EAAO,EAAuB,EAAE;IAC3F,OAAO,IAAA,aAAK,EAAS,MAAgB,CAAC;SACnC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,qBAAqB,CAAC;SACxC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,+BAA+B,CAAC;SACtD,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,uBAAuB,CAAC;SAC5C,GAAG,CACF,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAa,EAAE,EAAE,CAAC,CAAC,EAC7C,CAAC,CAAC,EAAE,CAAC,qCAAqC,KAAK,CAAC,EAAa,EAAE,EAAE,CAAC,qBAAqB,CAAC,EAAE,GAAG,YAAY,CAC1G;SACA,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC;AAC/C,CAAC,CAAC;AAVW,QAAA,aAAa,iBAUxB;AAEF,MAAM,CAAC,MAAM,CAAC;IACZ,aAAa,EAAb,qBAAa;CACd,CAAC,CAAC"}

package/dist/utils/Types.d.ts

@@ -1,7 +1,7 @@
 export declare type Constructor<T> = {
     new (...args: any[]): T;
 };
-export declare type Message<P extends unknown> = Text | ((...params: P[]) => Text);
+export declare type Message<P> = Text | ((...params: P[]) => Text);
 export declare const toMessage: <P>(g: Message<P>, ...params: P[]) => string;
 export declare type Validatable = {
     isValid: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy-test",
-  "version": "8.41.12",
+  "version": "8.42.0",
   "description": "Straightforward library for testing microservices built with @thisisagile/easy",
   "author": "Sander Hoogendoorn",
   "license": "MIT",

package/src/matchers/index.ts

@@ -4,6 +4,7 @@ export * from './ResultMatchers';
 export * from './toBeArrayOf';
 export * from './toBeArrayOfWithLength';
 export * from './toBeAt';
+export * from './toBeExactlyAt';
 export * from './toFailMatcher';
 export * from './toBeValid';
 export * from './toMatchExactJson';

package/src/matchers/toBeAt.ts

@@ -1,21 +1,23 @@
 import CustomMatcherResult = jest.CustomMatcherResult;
 import { Id, Tester, UseCase } from '../utils/Types';
-import { isDefined } from '../utils/Utils';
 import { match } from './Match';
 
-const toUrl = (uc: UseCase, id?: Id): string => {
-  const i = isDefined(id) ? `/${id}` : '';
-  return `/${uc.app.id}/${uc.id}${i}`;
-};
-
 export const toBeAt = (tester?: Tester, uc?: UseCase, id?: Id): CustomMatcherResult => {
   return match<Tester>(tester as Tester)
     .undefined(t => t, 'Tester is undefined')
     .undefined(t => t.url, 'Tester does not contain a URL')
     .undefined(() => uc, 'Use case is undefined')
     .not(
-      t => t.url.includes(toUrl(uc as UseCase, id)),
-      t => `We expected the tester to be at: '${toUrl(uc as UseCase, id)}', but it is at: '${t?.url}' instead.`
+      t => t.url.includes(`/${uc?.app.id}`),
+      t => `We expected the tester to be at app '${uc?.app.id}', but it is at '${t?.url}' instead.`,
+    )
+    .not(
+      t => t.url.includes(`/${uc?.id}`),
+      t => `We expected the tester to be at use case '${uc?.id}', but it is at '${t?.url}' instead.`,
+    )
+    .not(
+      t => t.url.includes(id ? `/${id}` : ''),
+      t => `We expected the path to contain '/42', but it is '${t?.url}' instead.`,
     )
     .else(t => `The tester is at '${t?.url}'`);
 };

package/src/matchers/toBeExactlyAt.ts

@@ -0,0 +1,34 @@
+import CustomMatcherResult = jest.CustomMatcherResult;
+import { Id, Tester, UseCase } from '../utils/Types';
+import { isDefined } from '../utils/Utils';
+import { match } from './Match';
+
+const toUrl = (uc: UseCase, id?: Id): string => {
+  const i = isDefined(id) ? `/${id}` : '';
+  return `/${uc.app.id}/${uc.id}${i}`;
+};
+
+export const toBeExactlyAt = (tester?: Tester, uc?: UseCase, id?: Id): CustomMatcherResult => {
+  return match<Tester>(tester as Tester)
+    .undefined(t => t, 'Tester is undefined')
+    .undefined(t => t.url, 'Tester does not contain a URL')
+    .undefined(() => uc, 'Use case is undefined')
+    .not(
+      t => t.url.includes(toUrl(uc as UseCase, id)),
+      t => `We expected the tester to be at: '${toUrl(uc as UseCase, id)}', but it is at: '${t?.url}' instead.`
+    )
+    .else(t => `The tester is at '${t?.url}'`);
+};
+
+expect.extend({
+  toBeExactlyAt,
+});
+
+declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace
+  namespace jest {
+    interface Matchers<R, T> {
+      toBeExactlyAt(uc?: UseCase, id?: Id): R;
+    }
+  }
+}

package/src/utils/Types.ts

@@ -2,7 +2,7 @@ import { asString, isFunction } from './Utils';
 
 export type Constructor<T> = { new (...args: any[]): T };
 
-export type Message<P extends unknown> = Text | ((...params: P[]) => Text);
+export type Message<P> = Text | ((...params: P[]) => Text);
 
 export const toMessage = <P>(g: Message<P>, ...params: P[]): string => asString(isFunction(g) ? g(...params) : g);