datagrok-tools 4.6.3 → 4.6.4

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.
@@ -115,6 +115,9 @@ function createDirectoryContents(name, config, templateDir, packageDir) {
115
115
  }
116
116
 
117
117
  if (jest) {
118
+ Object.assign(_package.dependencies, {
119
+ '@datagrok-libraries/utils': 'latest'
120
+ });
118
121
  Object.assign(_package.devDependencies, {
119
122
  'jest-html-reporter': '^3.5.0',
120
123
  'jest': '^27.0.0',
@@ -39,31 +39,39 @@ it('TEST', async () => {
39
39
  const targetPackage: string = process.env.TARGET_PACKAGE ?? '#{PACKAGE_NAMESPACE}';
40
40
  console.log(`Testing ${targetPackage} package`);
41
41
 
42
- let r = await page.evaluate((targetPackage): Promise<object> => {
42
+ let r = await page.evaluate((targetPackage):Promise<object> => {
43
43
  return new Promise<object>((resolve, reject) => {
44
44
  (<any>window).grok.functions.eval(targetPackage + ':test()').then((df: any) => {
45
45
  const cStatus = df.columns.byName('success');
46
+ const cSkipped = df.columns.byName('skipped');
46
47
  const cMessage = df.columns.byName('result');
47
48
  const cCat = df.columns.byName('category');
48
49
  const cName = df.columns.byName('name');
49
50
  const cTime = df.columns.byName('ms');
50
51
  let failed = false;
52
+ let skipReport = '';
51
53
  let passReport = '';
52
54
  let failReport = '';
53
55
  for (let i = 0; i < df.rowCount; i++) {
54
56
  if (cStatus.get(i)) {
55
- passReport += `Test result : Success : ${cTime.get(i)} : ${targetPackage}.${cCat.get(i)}.${cName.get(i)} : ${cMessage.get(i)}\n`;
57
+ if (cSkipped.get(i)) {
58
+ skipReport += `Test result : Skipped : ${cTime.get(i)} : ${targetPackage}.${cCat.get(i)}.${cName.get(i)} : ${cMessage.get(i)}\n`;
59
+ } else {
60
+ passReport += `Test result : Success : ${cTime.get(i)} : ${targetPackage}.${cCat.get(i)}.${cName.get(i)} : ${cMessage.get(i)}\n`;
61
+ }
56
62
  } else {
57
63
  failed = true;
58
64
  failReport += `Test result : Failed : ${cTime.get(i)} : ${targetPackage}.${cCat.get(i)}.${cName.get(i)} : ${cMessage.get(i)}\n`;
59
65
  }
60
66
  }
61
- resolve({failReport, passReport, failed});
67
+ resolve({failReport, skipReport, passReport, failed});
62
68
  }).catch((e: any) => reject(e));
63
69
  });
64
70
  }, targetPackage);
65
71
  // @ts-ignore
66
72
  console.log(r.passReport);
67
73
  // @ts-ignore
74
+ console.log(r.skipReport);
75
+ // @ts-ignore
68
76
  expect(r.failed).checkOutput(false, r.failReport);
69
- }, 3600000);
77
+ }, 7200000);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "datagrok-tools",
3
- "version": "4.6.3",
3
+ "version": "4.6.4",
4
4
  "description": "Utility to upload and publish packages to Datagrok",
5
5
  "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
6
6
  "dependencies": {