MLE-21557 : Node Client Api mjs tests are failing for 12-nightly due to changes in the server code.

Author: anu3990

gulpfile.js

@@ -26,6 +26,7 @@ const proxy = require('./lib/proxy-generator.js');
 const testproxy = require('./test-basic-proxy/testGenerator.js');
 const testconfig = require('./etc/test-config.js');
 const basicloader = require('./lib/basic-loader.js');
+const streamToArray = require("stream-to-array");
 
 function lint() {
   return gulp.src('lib/*')
@@ -90,6 +91,48 @@ function loadProxyTestInspector(callback) {
   });
 }
 
+function updateMjsFiles(callback){
+  const testlib = require("./etc/test-lib");
+  let serverConfiguration = {};
+  testlib.findServerConfigurationPromise(serverConfiguration)
+      .then(() => {
+        if(serverConfiguration.serverVersion<12){
+          callback();
+        } else {
+            const query = marklogic.queryBuilder.where(
+                marklogic.ctsQueryBuilder.cts.directoryQuery('/dbf/test/', 'infinity'));
+            streamToArray(getTestModulesClient().documents.queryAll(query),
+                function(err, arr ) {
+                    if(err){
+                        throw new Error(err);
+                    }
+                    arr.forEach(uri=> {
+                        if(uri && uri.toString().endsWith(".mjs")){
+                            getTestModulesClient().documents.read(uri.toString())
+                                .result(function(documents){
+                                    const lines = documents[0].content.split('\n');
+                                    let i=lines.length-1;
+                                    while(lines[i]===""){
+                                        i--;
+                                    }
+                                    lines[i] = 'export default ' + lines[i];
+                                    getTestModulesClient().documents.write({
+                                        uri: uri.toString(),
+                                        content: lines.join('\n')
+                                    })
+                                        .result(function(response){callback();})
+                                })
+
+                        } else {
+                            callback();
+                        }
+                    });
+
+                });
+        }
+      }).catch((error) => {throw new Error(error);});
+}
+
 function loadProxyTestData(callback) {
   const testdir = path.resolve('test-basic-proxy');
   const filePath           = path.resolve(testdir, 'testdef.json');
@@ -158,11 +201,11 @@ exports.loadProxyTests     = parallel(loadProxyTestInspector, loadProxyTestData,
 exports.generateProxyTests = parallel(positiveProxyTests, negativeProxyTests, generatedProxyTests);
 exports.runProxyTests = runProxyTests;
 exports.setupProxyTests = series(
-    parallel(loadProxyTestInspector, loadProxyTestData, loadProxyTestCases),
-    parallel(positiveProxyTests, negativeProxyTests, generatedProxyTests));
+    parallel(loadProxyTestInspector, loadProxyTestData, loadProxyTestCases,),
+    parallel(positiveProxyTests, negativeProxyTests, generatedProxyTests), updateMjsFiles);
 exports.proxyTests = series(
     parallel(loadProxyTestInspector, loadProxyTestData, loadProxyTestCases),
-    parallel(positiveProxyTests, negativeProxyTests, generatedProxyTests),
+    parallel(positiveProxyTests, negativeProxyTests, generatedProxyTests), updateMjsFiles,
     runProxyTests);
 exports.test = test;
 exports.default = lint;

test-app/src/main/ml-modules/root/optic/test/transformDoc-test-forServerVersion12.mjs

@@ -0,0 +1,6 @@
+const result = {
+    "hello": "world",
+    "yourParam": external.myParam,
+    "theDoc": external.doc
+}
+export default result

test-app/src/main/ml-modules/root/optic/test/transformDoc-test-two-params-forServerVersion12.mjs

@@ -0,0 +1,5 @@
+const result = {"hello": "world",
+    "Patch1": external.patch1,
+    "Patch2": external.patch2,
+    "theDoc": external.doc}
+export default result

test-basic/transformDoc-test.js

@@ -23,6 +23,8 @@ const testlib = require("../etc/test-lib");
 const op = marklogic.planBuilder;
 let removeStream = new Stream.PassThrough({objectMode: true});
 let serverConfiguration = {};
+let transformDoc;
+let transformDocWithTwoParams;
 
 describe('optic-update transformDoc tests', function() {
     this.timeout(6000);
@@ -40,6 +42,10 @@ describe('optic-update transformDoc tests', function() {
             if(serverConfiguration.serverVersion < 11){
                 this.skip();
             }
+            transformDoc = serverConfiguration.serverVersion < 12?'/optic/test/transformDoc-test.mjs':
+                '/optic/test/transformDoc-test-forServerVersion12.mjs';
+            transformDocWithTwoParams = serverConfiguration.serverVersion < 12?'/optic/test/transformDoc-test-two-params.mjs':
+                '/optic/test/transformDoc-test-two-params-forServerVersion12.mjs';
             let readable = new Stream.Readable({objectMode: true});
             removeStream = new Stream.PassThrough({objectMode: true});
             const musician = {
@@ -78,7 +84,7 @@ describe('optic-update transformDoc tests', function() {
             try {
                 const plan = op.fromDocUris('/test/optic/transformDoc/data1.json')
                     .joinDoc(op.col("doc"), op.col("uri"))
-                    .transformDoc('doc', {"path": "/optic/test/transformDoc-test.mjs"})
+                    .transformDoc('doc', {"path": transformDoc})
                     .orderBy(op.col('uri'));
 
                 db.rows.query(plan).then(res => {
@@ -96,7 +102,7 @@ describe('optic-update transformDoc tests', function() {
             try {
                 const plan = op.fromDocUris('/test/optic/transformDoc/data1.json')
                     .joinDoc(op.col("doc"), op.col("uri"))
-                    .transformDoc('doc', {"path": "/optic/test/transformDoc-test.mjs", kind: "mjs"})
+                    .transformDoc('doc', {"path": transformDoc, kind: "mjs"})
                     .orderBy(op.col('uri'));
 
                 db.rows.query(plan).then(res => {
@@ -115,7 +121,7 @@ describe('optic-update transformDoc tests', function() {
                 const plan = op.fromDocUris('/test/optic/transformDoc/data1.json')
                     .joinDoc(op.col("doc"), op.col("uri"))
                     .transformDoc('doc', {
-                        "path": "/optic/test/transformDoc-test.mjs",
+                        "path": transformDoc,
                         kind: "mjs",
                         params: {myParam: 'my new content'}
                     })
@@ -141,7 +147,7 @@ describe('optic-update transformDoc tests', function() {
                 const plan = op.fromDocUris('/test/optic/transformDoc/data1.json')
                     .joinDoc(op.col("doc"), op.col("uri"))
                     .transformDoc('doc', {
-                        "path": "/optic/test/transformDoc-test.mjs",
+                        "path": transformDoc,
                         kind: "mjs",
                         params: {wrongParamName: 'my new content'}
                     })
@@ -188,7 +194,7 @@ describe('optic-update transformDoc tests', function() {
                 ];
                 const plan = op.fromDocDescriptors(docsDescriptor)
                     .transformDoc('doc', {
-                        "path": "/optic/test/transformDoc-test.mjs",
+                        "path": transformDoc,
                         kind: "mjs",
                         params: {myParam: 'my new content'}
                     })
@@ -296,7 +302,7 @@ describe('optic-update transformDoc tests', function() {
                     .joinInner(fromLiteral)
                     .orderBy('id')
                     .transformDoc('doc', {
-                        "path": "/optic/test/transformDoc-test-two-params.mjs", kind: "mjs",
+                        "path": transformDocWithTwoParams, kind: "mjs",
                         params: {patch1: op.col('id'), patch2: op.col('val')}
                     })
                     .write({uri: 'uri', doc: 'doc'});