@o3r/testing 10.2.0-prerelease.2 → 10.2.0-prerelease.21
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/testing",
|
|
3
|
-
"version": "10.2.0-prerelease.
|
|
3
|
+
"version": "10.2.0-prerelease.21",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -103,9 +103,9 @@
|
|
|
103
103
|
"@angular/platform-browser": "~17.2.0",
|
|
104
104
|
"@ngrx/store": "~17.1.0",
|
|
105
105
|
"@ngx-translate/core": "~15.0.0",
|
|
106
|
-
"@o3r/core": "^10.2.0-prerelease.
|
|
107
|
-
"@o3r/localization": "^10.2.0-prerelease.
|
|
108
|
-
"@o3r/schematics": "^10.2.0-prerelease.
|
|
106
|
+
"@o3r/core": "^10.2.0-prerelease.21",
|
|
107
|
+
"@o3r/localization": "^10.2.0-prerelease.21",
|
|
108
|
+
"@o3r/schematics": "^10.2.0-prerelease.21",
|
|
109
109
|
"@playwright/test": "~1.42.0",
|
|
110
110
|
"@schematics/angular": "~17.2.0",
|
|
111
111
|
"pixelmatch": "^5.2.1",
|
|
@@ -179,12 +179,12 @@
|
|
|
179
179
|
"@ngx-translate/core": "~15.0.0",
|
|
180
180
|
"@nx/eslint-plugin": "~18.0.2",
|
|
181
181
|
"@nx/jest": "~18.0.2",
|
|
182
|
-
"@o3r/build-helpers": "^10.2.0-prerelease.
|
|
183
|
-
"@o3r/core": "^10.2.0-prerelease.
|
|
184
|
-
"@o3r/eslint-plugin": "^10.2.0-prerelease.
|
|
185
|
-
"@o3r/localization": "^10.2.0-prerelease.
|
|
186
|
-
"@o3r/schematics": "^10.2.0-prerelease.
|
|
187
|
-
"@o3r/test-helpers": "^10.2.0-prerelease.
|
|
182
|
+
"@o3r/build-helpers": "^10.2.0-prerelease.21",
|
|
183
|
+
"@o3r/core": "^10.2.0-prerelease.21",
|
|
184
|
+
"@o3r/eslint-plugin": "^10.2.0-prerelease.21",
|
|
185
|
+
"@o3r/localization": "^10.2.0-prerelease.21",
|
|
186
|
+
"@o3r/schematics": "^10.2.0-prerelease.21",
|
|
187
|
+
"@o3r/test-helpers": "^10.2.0-prerelease.21",
|
|
188
188
|
"@playwright/test": "~1.42.0",
|
|
189
189
|
"@schematics/angular": "~17.2.0",
|
|
190
190
|
"@stylistic/eslint-plugin-ts": "^1.5.4",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/fixture/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/fixture/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAIjF;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,EAAE,4BAA4B,EAAE,OAAO,GAAG,IAAI,CA6FnL"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateFixtureConfig = void 0;
|
|
4
4
|
/* eslint-disable @typescript-eslint/naming-convention */
|
|
5
5
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
6
|
-
const schematics_2 = require("@o3r/schematics");
|
|
7
6
|
const ts = require("typescript");
|
|
8
7
|
/**
|
|
9
8
|
* Add fixture configuration
|
|
@@ -19,10 +18,11 @@ function updateFixtureConfig(options, registerUnitTestFixturePaths) {
|
|
|
19
18
|
* @param tree
|
|
20
19
|
* @param context
|
|
21
20
|
*/
|
|
22
|
-
const updateTestTsconfig = (tree, context) => {
|
|
23
|
-
const
|
|
21
|
+
const updateTestTsconfig = async (tree, context) => {
|
|
22
|
+
const { getTestFramework, getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
|
|
23
|
+
const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
|
|
24
24
|
if (!workspaceProject) {
|
|
25
|
-
return
|
|
25
|
+
return;
|
|
26
26
|
}
|
|
27
27
|
const testTarget = workspaceProject.architect && workspaceProject.architect.test;
|
|
28
28
|
const tsconfig = testTarget && testTarget.options && testTarget.options.tsConfig;
|
|
@@ -40,7 +40,7 @@ function updateFixtureConfig(options, registerUnitTestFixturePaths) {
|
|
|
40
40
|
}
|
|
41
41
|
return libs;
|
|
42
42
|
}, []);
|
|
43
|
-
const testFramework = options.testingFramework ||
|
|
43
|
+
const testFramework = options.testingFramework || getTestFramework(getWorkspaceConfig(tree), context);
|
|
44
44
|
if (testFramework === 'jest') {
|
|
45
45
|
tsconfigCompilerOptions.types ||= [];
|
|
46
46
|
if (tsconfigCompilerOptions.types.indexOf('jest') === -1) {
|
|
@@ -51,7 +51,7 @@ function updateFixtureConfig(options, registerUnitTestFixturePaths) {
|
|
|
51
51
|
tsconfigCompilerOptions.outDir = 'test';
|
|
52
52
|
tree.overwrite(tsconfig, JSON.stringify(tsconfigFile, null, 2));
|
|
53
53
|
}
|
|
54
|
-
return
|
|
54
|
+
return;
|
|
55
55
|
};
|
|
56
56
|
/**
|
|
57
57
|
* Update base tsconfig paths with o3r fixtures
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-add/fixture/index.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AACzD,2DAAiF;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-add/fixture/index.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AACzD,2DAAiF;AAEjF,iCAAiC;AAEjC;;;;;;GAMG;AACH,SAAgB,mBAAmB,CAAC,OAAkG,EAAE,4BAAqC;IAE3K,MAAM,QAAQ,GAAG,CAAC,qBAAqB,EAAE,uBAAuB,CAAC,CAAC;IAClE;;;;OAIG;IACH,MAAM,kBAAkB,GAAS,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/E,MAAM,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,GAAG,2CAAa,iBAAiB,EAAC,CAAC;QACjF,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEnH,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,gBAAgB,CAAC,SAAS,IAAI,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC;QACjF,MAAM,QAAQ,GAAuB,UAAU,IAAI,UAAU,CAAC,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC;QAErG,IAAI,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,MAAM,YAAY,GAAG,EAAE,CAAC,yBAAyB,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;YAC5F,YAAY,CAAC,eAAe,GAAG,YAAY,CAAC,eAAe,IAAI,EAAE,CAAC;YAElE,MAAM,uBAAuB,GAAG,YAAY,CAAC,eAAe,CAAC;YAE7D,uBAAuB,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,uBAAuB,CAAC,GAAG,IAAI,EAAE,CAAC;gBACnE,KAAK;gBACL,QAAQ;gBACR,YAAY;aACb,CAAC,MAAM,CAAW,CAAC,IAAI,EAAE,GAAW,EAAE,EAAE;gBACvC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;oBAC7B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACjB,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,EAAE,EAAE,CAAC,CAAC;YAEP,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;YACtG,IAAI,aAAa,KAAK,MAAM,EAAE,CAAC;gBAC7B,uBAAuB,CAAC,KAAK,KAAK,EAAE,CAAC;gBACrC,IAAI,uBAAuB,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;oBACzD,uBAAuB,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC7C,CAAC;YACH,CAAC;YACD,uBAAuB,CAAC,eAAe,GAAG,IAAI,CAAC;YAC/C,uBAAuB,CAAC,MAAM,GAAG,MAAM,CAAC;YAExC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAClE,CAAC;QAED,OAAO;IACT,CAAC,CAAC;IAEF;;;;OAIG;IACH,MAAM,iCAAiC,GAAS,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QACxF,MAAM,SAAS,GAAG,CAAC,oBAAoB,EAAE,qBAAqB,EAAE,eAAe,CAAC,CAAC;QACjF,MAAM,OAAO,GAAG,SAAS;aACtB,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;aAC3C,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAClB,QAAQ;YACR,OAAO,EAAE,EAAE,CAAC,yBAAyB,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM;SAChF,CAAC,CAAC;aACF,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAEtC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,iFAAiF,CAAC,CAAC;YACvG,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;QAExG,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAA0B,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACtK,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBACjC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACnB,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,IAAI,4BAA4B,EAAE,CAAC;YACjC,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,KAAK,GAAG,CAAC;YACvD,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;YAC/G,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,qBAAqB,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;QACrH,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAEzF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,IAAA,kBAAK,EAAC,CAAC,kBAAkB,EAAE,iCAAiC,CAAC,CAAC,CAAC;AACxE,CAAC;AA7FD,kDA6FC"}
|