joist-test-utils 1.49.0 → 1.49.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/build/toMatchEntity.js +17 -3
- package/build/toMatchEntity.js.map +1 -1
- package/package.json +1 -1
package/build/toMatchEntity.js
CHANGED
|
@@ -29,7 +29,7 @@ function toMatchEntity(actual, expected) {
|
|
|
29
29
|
(0, joist_orm_1.isCollection)(actualValue) ||
|
|
30
30
|
(0, joist_orm_1.isAsyncProperty)(actualValue) ||
|
|
31
31
|
(0, joist_orm_1.isPersistedAsyncProperty)(actualValue)) {
|
|
32
|
-
actualValue =
|
|
32
|
+
actualValue = getWithSoftDeleted(actualValue);
|
|
33
33
|
}
|
|
34
34
|
if (actualValue instanceof Array) {
|
|
35
35
|
const actualList = actualValue;
|
|
@@ -91,7 +91,21 @@ function getTestId(em, entity) {
|
|
|
91
91
|
const sameType = em.entities.filter((e) => e instanceof meta.cstr);
|
|
92
92
|
return `${meta.tagName}#${sameType.indexOf(entity) + 1}`;
|
|
93
93
|
}
|
|
94
|
-
|
|
95
|
-
|
|
94
|
+
/**
|
|
95
|
+
* Adds back soft-deleted to `.get`.
|
|
96
|
+
*
|
|
97
|
+
* In Joist, `.get` filters both soft and hard deleted entities, because `.get`
|
|
98
|
+
* is likely used by real business logic that doesn't want to see either.
|
|
99
|
+
*
|
|
100
|
+
* However, in tests with `toMatchEntity`, we take a stronger stance that the
|
|
101
|
+
* developer needs to know "this is _soft_ deleted and not hard deleted", so
|
|
102
|
+
* we add-back soft deleted entities.
|
|
103
|
+
*
|
|
104
|
+
* We do this by calling `getWithDeleted`, which returns all hard and soft
|
|
105
|
+
* deleted entities, and then filtering out the hard deletes.
|
|
106
|
+
*/
|
|
107
|
+
function getWithSoftDeleted(relation) {
|
|
108
|
+
const r = "getWithDeleted" in relation ? relation.getWithDeleted : relation.get;
|
|
109
|
+
return Array.isArray(r) ? r.filter((e) => !e.isDeletedEntity) : r;
|
|
96
110
|
}
|
|
97
111
|
//# sourceMappingURL=toMatchEntity.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toMatchEntity.js","sourceRoot":"","sources":["../src/toMatchEntity.ts"],"names":[],"mappings":";;;;;;AACA,aAAa;AACb,qEAA6C;AAC7C,qDAAgD;AAChD,yCAYmB;AAEnB,SAAgB,aAAa,CAAI,MAAc,EAAE,QAA0B;IACzE,yFAAyF;IACzF,0FAA0F;IAC1F,oFAAoF;IACpF,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAEhD,sGAAsG;IACtG,0GAA0G;IAC1G,MAAM,KAAK,GAAsB,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;IAC7D,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;QAE/C,uFAAuF;QACvF,qDAAqD;QACrD,MAAM,IAAI,GACR,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEhH,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,IAAI,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAC9B,MAAM,aAAa,GAAG,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;YAEtC,uFAAuF;YACvF,IACE,IAAA,uBAAW,EAAC,WAAW,CAAC;gBACxB,IAAA,wBAAY,EAAC,WAAW,CAAC;gBACzB,IAAA,2BAAe,EAAC,WAAW,CAAC;gBAC5B,IAAA,oCAAwB,EAAC,WAAW,CAAC,EACrC;gBACA,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"toMatchEntity.js","sourceRoot":"","sources":["../src/toMatchEntity.ts"],"names":[],"mappings":"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"}
|