chore: work on webtests

.gitignore

@@ -487,3 +487,5 @@ devenv.local.nix
 .direnv
 result
 
+# pupeeter screenshot of the test page
+screenshot.png
\ No newline at end of file

nix/scripts/go-task.nix

@@ -80,7 +80,7 @@
               - rt
             env:
               USER_WORKING_DIR: "{{.USER_WORKING_DIR}}"
-            desc: Run the tests
+            desc: Run tests with node
             cmds:
               - ${script-run-tests}/bin/run-tests
 
@@ -90,8 +90,9 @@
               - rt
             env:
               USER_WORKING_DIR: "{{.USER_WORKING_DIR}}"
-            desc: Run the tests
+            desc: Run the tests in the browser
             cmds:
+              - ${script-update-web-test}/bin/update-web-test
               - ${script-run-web-tests}/bin/run-web-tests
 
           build-and-publish:

nix/scripts/run-web-tests.nix

@@ -18,7 +18,8 @@ in
        echo_fail "Tests failed, check your JS!"
        exit 1
     fi
-    exit 0
+    
+    echo_ok "Tests passed!"
 
 
   ''

nix/scripts/update-web-test.nix

@@ -6,25 +6,6 @@
   packageData = builtins.fromJSON (builtins.readFile ../../package.json);
   version = packageData.version;
   lib = pkgs.lib;
-  #  root = ../..;
-  #  gitignore = ../../.gitignore;
-  #  source = ../../source;
-  #  test = ../../test;
-  #
-  #  releasedPackageJson = {
-  #    description = packageData.description;
-  #    name = packageData.name;
-  #    version = version;
-  #    dependencies = packageData.dependencies;
-  #    keywords = packageData.keywords;
-  #    license = packageData.license;
-  #    repository = packageData.repository;
-  #    author = packageData.author;
-  #    homepage = packageData.homepage;
-  #    type = "module";
-  #    main = "source/monster.mjs";
-  #    module = "source/monster.mjs";
-  #  };
 in
   pkgs.writeShellScriptBin "update-web-test" ''
         source ${commonScript}
@@ -33,7 +14,7 @@ in
         echo_hint "This script will check the code for formatting and linting issues"
         echo_hint "The command is executed in the current working directory and not in a nix derivation."
         cd_working_dir
-    set -x
+    
         echo_step "Running prettier"
 
         PROJECT_ROOT="$(pwd)"

test/cases/data/datasource/server/websocket.mjs

@@ -4,10 +4,6 @@ import {initWebSocket} from "../../../../util/websocket.mjs";
 
 const testUrl = "wss://ws.postman-echo.com/raw"
 
-// const g = getGlobal();
-// g['WebSocket'] = WS;
-
-
 describe('Websocket', function () {
 
     let ds = undefined
@@ -25,7 +21,7 @@ describe('Websocket', function () {
             ds.close()
         }
 
-        // workaround: without this, the node test will hang 
+        // workaround: without this, the node test will not exit 
         for (const sym of Object.getOwnPropertySymbols(ds)) {
             if (sym.toString() === 'Symbol(connection)') {
                 const connection = ds[sym]
@@ -49,10 +45,8 @@ describe('Websocket', function () {
 
         ds = new WebConnect(testUrl)
         const clone = ds.getClone()
-
         expect(clone).to.be.an.instanceof(WebConnect)
 
-
     })
 
     it('should transform data', function (done) {
@@ -149,13 +143,17 @@ describe('Websocket', function () {
 
     })
 
-    it('should send message', function (done) {
+    it('should send a message', function (done) {
+        
+        this.timeout(10000)
+        
         ds = new WebConnect({
             url: testUrl,
             reconnect: {
                 enabled: false
             }
         });
+        
         ds.connect().then(() => {
             ds.set({
                 envelop: {
@@ -189,6 +187,6 @@ describe('Websocket', function () {
         })
 
 
-    }).timeout(10000);
+    });
 
 });

test/cases/data/transformer.mjs

@@ -25,13 +25,49 @@ describe('Transformer', function () {
 
     });
 
+    describe('Transformer.run() localize commands', function () {
+
+
+        const isNode = typeof global === 'object' && '[object global]' === global.toString.call(global);
+
+
+        [
+            ['datetimeformat', "2023-02-04 08:02:01", "Feb 4, 2023, 08:02:01", "4 Feb 2023, 08:02:01"],
+            ['datetimeformat:long:short', "2023-02-04 08:02:01", "February 4, 2023 at 08:02", "4 February 2023 at 08:02"],
+            ['datetimeformat:short:short', "2023-02-04 08:02:01", "2/4/23, 08:02", "04/02/2023, 08:02"],
+            ['currency', "EUR0", "€0.00", "€0.00"],
+            ['currency:1:2', "EUR14.25", "€14.2", "€14.2"],
+            ['currency', "EUR14.25", "€14.25", "€14.25"],
+            ['datetime', "2023-02-14 14:12:10", "2/14/2023, 14:12:10","14/02/2023, 14:12:10"],
+            ['datetime', "2023-02-14 08:02:01", "2/14/2023, 08:02:01","14/02/2023, 08:02:01"],
+            ['date', "2023-02-14", "02/14/2023","14/02/2023"],
+
+
+        ].forEach(function (data) {
+
+            // https://gitlab.schukai.com/oss/libraries/javascript/monster/-/issues/124
+
+
+            let a = data.shift() // command
+            let b = data.shift() // value
+            let c = data.shift() // expected result node    
+            let d = data.shift() // expected result browser    
+
+            const expected = isNode ? c : d
+
+            it('Transformer.run(' + JSON.stringify(a) + ').run(' + JSON.stringify(b) + ') should return ' + JSON.stringify(expected), function () {
+                let t = new Transformer(a);
+                const r = t.run(b);
+                expect(expected).to.be.eql(r, "Transformer.run(" + JSON.stringify(a) + ").run(" + JSON.stringify(b) + ") should return " + JSON.stringify(c));
+            });
+        });
+
+    });
+
 
     describe('Transformer.run()', function () {
 
         [
-            ['datetimeformat', "2023-02-04 08:02:01", "Feb 4, 2023, 08:02:01"],
-            ['datetimeformat:long:short', "2023-02-04 08:02:01","February 4, 2023 at 08:02"],
-            ['datetimeformat:short:short', "2023-02-04 08:02:01", "2/4/23, 08:02"],
             ['equals:a', "a", true],
             ['equals:a', "b", false],
             ['equals:3', 3, true],
@@ -51,11 +87,6 @@ describe('Transformer', function () {
             ['equals:null', null, true],
             ['equals:null', 3, false],
             ['equals:3', 6, false],
-            ['currency', "EUR0", "€0.00"], // 0,00 €
-           //  ['currency:1:2', "EUR14.25", "14,2 €"],  nodejs and browser have different results (https://gitlab.schukai.com/oss/libraries/javascript/monster/-/issues/124) 
-            ['currency', "EUR14.25", "€14.25"],
-            ['datetime', "2023-02-14 14:12:10", "2/14/2023, 14:12:10"],
-            ['datetime', "2023-02-14 08:02:01", "2/14/2023, 08:02:01"],
             ['has-entries', {}, false],
             ['has-entries', {a: 4}, true],
             ['has-entries', [], false],
@@ -90,7 +121,6 @@ describe('Transformer', function () {
             ['not', true, false],
             ['not', false, true],
             ['map:a=4:b=5:c=6', "a", "4"],
-            ['date', "2023-02-14", "02/14/2023"],
             ['year', "2023-02-14", 2023],
             ['month', "2023-02-14", 2],
             ['day', "2023-02-14", 14],
@@ -201,26 +231,6 @@ describe('Transformer', function () {
             let c = data.shift()
 
             it('Transformer.run(' + JSON.stringify(a) + ').run(' + JSON.stringify(b) + ') should return ' + JSON.stringify(c), function () {
-
-                // const [major, minor, patch] = process.versions.node.split('.').map(Number)
-                // console.log(major, minor, patch,'!!!!!!!!!!!')
-                //
-                // const args=a.split(':');
-                // args.shift();
-                //
-                // let date = new Date(b);
-                // const options = {
-                //     dateStyle: args.shift() || "medium",
-                //     timeStyle: args.shift() || "medium",
-                // };
-                //
-                // console.log(options,'options')
-                //
-                //   //  const locale = getLocaleOfDocument();
-                // //const intl= new Intl.DateTimeFormat("en", options).format(new Date("2023-02-04 08:02:01"));
-                // //console.log(intl,'intl')
-
-
                 let t = new Transformer(a);
 
                 t.setCallback('testcallback', function (a, b, c, d) {

test/cases/dom/customcontrol.mjs

@@ -125,7 +125,6 @@ describe('DOM', function () {
                     expect(e).to.be.null;
                 }
 
-                console.log(typeof d,"ssss");
                 expect(typeof d).is.equal('object');
                 
             });

test/cases/dom/customelement.mjs

@@ -43,8 +43,6 @@ describe('DOM', function () {
                             assignUpdaterToElement = function (elements, object) {
                                 return addObjectWithUpdaterToElement.call(this, elements, updaterSymbolSymbol, object);
                             }
-
-
                             document = getDocument();
 
                             done()
@@ -139,7 +137,7 @@ describe('DOM', function () {
                 expect(JSON.stringify(ap.getRealSubject())).to.equal('{"a":3}');
                 expect(JSON.stringify(bp.getRealSubject())).to.equal('{"b":4}');
                 done()
-            }, 10)
+            }, 50)
 
         })
 

test/util/jsdom.mjs

@@ -72,7 +72,13 @@ function initJSDOM(options) {
                     'ShadowRoot',
                     'XMLSerializer',
                 ].forEach(key => {
+                    try {
                         g[key] = window[key]    
+                    } catch(e) {
+                        console.error("Error setting key", key, e);
+                    }
+                    
+                    
                 });
 
                 import("dom-storage").then(({default: Storage}) => {

test/util/websocket.mjs

@@ -2,8 +2,9 @@ import {getGlobal} from "../../source/types/global.mjs";
 
 function initWebSocket() {
 
-    const title = process.title;
-    const isNode = typeof process !== 'undefined' && title.includes('node');
+//    const isBrowser = typeof window === 'object' && '[object Window]' === window.toString.call(window)
+    const isNode = typeof global === 'object' && '[object global]' === global.toString.call(global)
+
 
     if (!isNode) {
          return Promise.resolve();

test/web/puppeteer.mjs

@@ -84,7 +84,6 @@ if (!config.browser) {
     console.log('Tests failed:', failures);
     console.log('Duration:', duration);
     
-    // rm -rf screenshot.png (javascript)
     if (existsSync('screenshot.png')) {
         unlinkSync('screenshot.png');
     }
@@ -97,7 +96,7 @@ if (!config.browser) {
 
         await page.evaluate(() => {
             document.querySelectorAll('.test.fail').forEach((node) => {
-                console.log(node.textContent);
+                console.error(node.textContent);
             });
         });
 

test/web/test.html

@@ -16,7 +16,7 @@
 <body>
 <div id="headline" style="display: flex;align-items: center;justify-content: center;flex-direction: column;">
   <h1 style='margin-bottom: 0.1em;'>Monster 3.65.0</h1>
-  <div id="lastupdate" style='font-size:0.7em'>last update Mi 15. Mai 23:43:52 CEST 2024</div>
+  <div id="lastupdate" style='font-size:0.7em'>last update Do 16. Mai 12:17:05 CEST 2024</div>
 </div>
 <div id="mocha-errors"
      style="color: red;font-weight: bold;display: flex;align-items: center;justify-content: center;flex-direction: column;margin:20px;"></div>