datagrok-tools 4.5.9 → 4.5.11

package/bin/commands/config.js

@@ -182,6 +182,8 @@ function config(args) {
       config["default"] = args.alias;
     }
 
+    _fs["default"].writeFileSync(confPath, _jsYaml["default"].dump(config));
+
     return true;
   }
 

package/package-template/src/__jest__/remote.test.ts

@@ -19,31 +19,51 @@ afterAll(async () => {
   await browser.close();
 });
 
+expect.extend({
+  checkOutput(received, expected, context) {
+    if (received === expected) {
+      return {
+        message: () => context,
+        pass: true
+      };
+    } else {
+      return {
+        message: () => context,
+        pass: false
+      };
+    }
+  }
+});
+
 it('TEST', async () => {
   const targetPackage: string = process.env.TARGET_PACKAGE ?? '#{PACKAGE_NAMESPACE}';
   console.log(`Testing ${targetPackage} package`);
 
-  //console.log(require('root-require')('package.json').version);
   let r = await page.evaluate((targetPackage): Promise<object> => {
     return new Promise<object>((resolve, reject) => {
       (<any>window).grok.functions.eval(targetPackage + ':test()').then((df: any) => {
-        let cStatus = df.columns.byName('success');
-        let cMessage = df.columns.byName('result');
-        let cCat = df.columns.byName('category');
-        let cName = df.columns.byName('name');
+        const cStatus = df.columns.byName('success');
+        const cMessage = df.columns.byName('result');
+        const cCat = df.columns.byName('category');
+        const cName = df.columns.byName('name');
+        const cTime = df.columns.byName('ms');
         let failed = false;
-        let report = '';
-        for (let i = 0; i < df.rowCount; i++)
-          if (!cStatus.get(i)) {
-            report += `${cCat.get(i)}.${cName.get(i)}: ${cMessage.get(i)}\n`;
+        let passReport = '';
+        let failReport = '';
+        for (let i = 0; i < df.rowCount; i++) {
+          if (cStatus.get(i)) {
+            passReport += `Test result : Success : ${cTime.get(i)} : ${targetPackage}.${cCat.get(i)}.${cName.get(i)} : ${cMessage.get(i)}\n`;
+          } else {
             failed = true;
+            failReport += `Test result : Failed : ${cTime.get(i)} : ${targetPackage}.${cCat.get(i)}.${cName.get(i)} : ${cMessage.get(i)}\n`;
           }
-        resolve({report, failed});
+        }
+        resolve({failReport, passReport, failed});
       }).catch((e: any) => reject(e));
     });
   }, targetPackage);
   // @ts-ignore
-  console.log(r.report);
+  console.log(r.passReport);
   // @ts-ignore
-  expect(r.failed).toBe(false);
+  expect(r.failed).checkOutput(false, r.failReport);
 }, 3600000);

package/package-template/src/__jest__/test-node.ts

@@ -67,8 +67,8 @@ export async function getBrowserPage(puppeteer: any): Promise<{browser: any, pag
   });
 
   let page = await browser.newPage();
-  await page.goto(`${url}/oauth/`);
   await page.setDefaultNavigationTimeout(0);
+  await page.goto(`${url}/oauth/`);
   await page.setCookie({name: 'auth', value: token});
   await page.evaluate((token: any) => {
     window.localStorage.setItem('auth', token);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "4.5.9",
+  "version": "4.5.11",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {