diff --git a/Jenkinsfile b/Jenkinsfile index 1aa169fe..1b88fb91 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,9 +16,9 @@ def runTests() { cd .. rm -rf $WORKSPACE/*.xml || true - ./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-reports.xml -g \'logging|archivePath\' --invert || true + ./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-reports.xml || true ./node_modules/.bin/gulp setupProxyTests || true - ./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic-proxy/lib/**/*.js --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-proxy-reports.xml -g \'logging|archivePath\' --invert || true + ./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic-proxy/lib/**/*.js --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-proxy-reports.xml || true ''' junit '**/*.xml' } @@ -33,8 +33,8 @@ def runDockerCompose(String markLogicDockerImage) { cd node-client-api echo "Running docker compose with MarkLogic image: ''' + markLogicDockerImage + '''" MARKLOGIC_LOGS_VOLUME=/tmp MARKLOGIC_IMAGE=''' + markLogicDockerImage + ''' docker-compose up -d --build - echo "Waiting 60s for MarkLogic to be ready to accept connections" - sleep 60s; + echo "Waiting 90s for MarkLogic to be ready to accept connections" + sleep 90s; ''' } @@ -129,8 +129,7 @@ pipeline { runAuditReport() runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12') runTests() - // Commenting this out temporarily for faster PR feedback. - // runE2ETests() + runE2ETests() } post { always { diff --git a/package-lock.json b/package-lock.json index 23e2b115..3de77f41 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,8 +40,7 @@ "read": "^1.0.7", "sanitize-html": "^2.13.0", "should": "^13.2.3", - "stream-to-array": "^2.3.0", - "winston": "^3.8.2" + "stream-to-array": "^2.3.0" }, "engines": { "node": ">=16.14.0" @@ -101,28 +100,6 @@ "node": ">=6.9.0" } }, - "node_modules/@colors/colors": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", - "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.1.90" - } - }, - "node_modules/@dabh/diagnostics": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.8.tgz", - "integrity": "sha512-R4MSXTVnuMzGD7bzHdW2ZhhdPC/igELENcq5IjEverBvq5hn1SXCWcsi6eSsdWP0/Ur+SItRRjAktmdoX/8R/Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@so-ric/colorspace": "^1.1.6", - "enabled": "2.0.x", - "kuler": "^2.0.0" - } - }, "node_modules/@eslint-community/eslint-utils": { "version": "4.9.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", @@ -426,17 +403,6 @@ "node": ">=14" } }, - "node_modules/@so-ric/colorspace": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@so-ric/colorspace/-/colorspace-1.1.6.tgz", - "integrity": "sha512-/KiKkpHNOBgkFJwu9sh48LkHSMYGyuTcSFK/qMBdnOAlrRJzRSXAOFB5qwzaVQuDl8wAvHVMkaASQDReTahxuw==", - "dev": true, - "license": "MIT", - "dependencies": { - "color": "^5.0.2", - "text-hex": "1.0.x" - } - }, "node_modules/@sovpro/delimited-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@sovpro/delimited-stream/-/delimited-stream-1.1.0.tgz", @@ -496,13 +462,6 @@ "undici-types": "~7.14.0" } }, - "node_modules/@types/triple-beam": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz", - "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==", - "dev": true, - "license": "MIT" - }, "node_modules/@ungap/promise-all-settled": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", @@ -700,13 +659,6 @@ "astring": "bin/astring" } }, - "node_modules/async": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", - "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", - "dev": true, - "license": "MIT" - }, "node_modules/async-done": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/async-done/-/async-done-2.0.0.tgz", @@ -1126,20 +1078,6 @@ "node": ">=0.8" } }, - "node_modules/color": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/color/-/color-5.0.0.tgz", - "integrity": "sha512-16BlyiuyLq3MLxpRWyOTiWsO3ii/eLQLJUQXBSNcxMBBSnyt1ee9YUdaozQp03ifwm5woztEZGDbk9RGVuCsdw==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^3.0.1", - "color-string": "^2.0.0" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/color-convert": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-3.1.0.tgz", @@ -1163,19 +1101,6 @@ "node": ">=12.20" } }, - "node_modules/color-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-2.1.0.tgz", - "integrity": "sha512-gNVoDzpaSwvftp6Y8nqk97FtZoXP9Yj7KGYB8yIXuv0JcfqbYihTrd1OU5iZW9btfXde4YAOCRySBHT7O910MA==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "^2.0.0" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", @@ -1471,13 +1396,6 @@ "dev": true, "license": "MIT" }, - "node_modules/enabled": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", - "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==", - "dev": true, - "license": "MIT" - }, "node_modules/end-of-stream": { "version": "1.4.5", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", @@ -1905,13 +1823,6 @@ "reusify": "^1.0.4" } }, - "node_modules/fecha": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", - "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==", - "dev": true, - "license": "MIT" - }, "node_modules/file-entry-cache": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", @@ -2029,13 +1940,6 @@ "dev": true, "license": "ISC" }, - "node_modules/fn.name": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", - "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==", - "dev": true, - "license": "MIT" - }, "node_modules/for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -3377,13 +3281,6 @@ "graceful-fs": "^4.1.9" } }, - "node_modules/kuler": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", - "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==", - "dev": true, - "license": "MIT" - }, "node_modules/last-run": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/last-run/-/last-run-2.0.0.tgz", @@ -3553,24 +3450,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/logform": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz", - "integrity": "sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@colors/colors": "1.6.0", - "@types/triple-beam": "^1.3.2", - "fecha": "^4.2.0", - "ms": "^2.1.1", - "safe-stable-stringify": "^2.3.1", - "triple-beam": "^1.3.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, "node_modules/loupe": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", @@ -4188,16 +4067,6 @@ "wrappy": "1" } }, - "node_modules/one-time": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", - "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fn.name": "1.x.x" - } - }, "node_modules/onetime": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", @@ -4771,16 +4640,6 @@ "license": "MIT", "optional": true }, - "node_modules/safe-stable-stringify": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz", - "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - } - }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -5184,16 +5043,6 @@ "node": ">= 10.13.0" } }, - "node_modules/stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "*" - } - }, "node_modules/stream-composer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/stream-composer/-/stream-composer-1.0.2.tgz", @@ -5439,13 +5288,6 @@ "b4a": "^1.6.4" } }, - "node_modules/text-hex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", - "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==", - "dev": true, - "license": "MIT" - }, "node_modules/through2": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", @@ -5501,16 +5343,6 @@ "node": ">=10.13.0" } }, - "node_modules/triple-beam": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz", - "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 14.0.0" - } - }, "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", @@ -5825,44 +5657,6 @@ "node": ">=4" } }, - "node_modules/winston": { - "version": "3.18.3", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.18.3.tgz", - "integrity": "sha512-NoBZauFNNWENgsnC9YpgyYwOVrl2m58PpQ8lNHjV3kosGs7KJ7Npk9pCUE+WJlawVSe8mykWDKWFSVfs3QO9ww==", - "dev": true, - "license": "MIT", - "dependencies": { - "@colors/colors": "^1.6.0", - "@dabh/diagnostics": "^2.0.8", - "async": "^3.2.3", - "is-stream": "^2.0.0", - "logform": "^2.7.0", - "one-time": "^1.0.0", - "readable-stream": "^3.4.0", - "safe-stable-stringify": "^2.3.1", - "stack-trace": "0.0.x", - "triple-beam": "^1.3.0", - "winston-transport": "^4.9.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, - "node_modules/winston-transport": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.9.0.tgz", - "integrity": "sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==", - "dev": true, - "license": "MIT", - "dependencies": { - "logform": "^2.7.0", - "readable-stream": "^3.6.2", - "triple-beam": "^1.3.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", diff --git a/package.json b/package.json index d95cc836..25ec8534 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "doc": "gulp doc", "preinstall": "node checkNodeVersion", "prestart": "node checkNodeVersion", + "pretest": "node checkNodeVersion", "test:setup": "node etc/test-setup.js", "test:teardown": "node etc/test-teardown.js", "test": "gulp test" @@ -65,8 +66,7 @@ "read": "^1.0.7", "sanitize-html": "^2.13.0", "should": "^13.2.3", - "stream-to-array": "^2.3.0", - "winston": "^3.8.2" + "stream-to-array": "^2.3.0" }, "optionalDependencies": { "kerberos": "^2.0.1", @@ -78,10 +78,8 @@ "chalk": "4.1.2", "braces": "3.0.3", "brace-expansion": "2.0.2", - "color": "5.0.0", "color-convert": "3.1.0", "color-name": "2.0.0", - "color-string": "2.1.0", "cross-spawn": "7.0.6", "debug": "4.3.6", "is-arrayish": "0.3.2", diff --git a/test-basic/logging.js b/test-basic/logging.js index de14f8fe..e1a110fa 100644 --- a/test-basic/logging.js +++ b/test-basic/logging.js @@ -5,12 +5,10 @@ var should = require('should'), testconfig = require('../etc/test-config.js'), marklogic = require('../'), bunyan = require('bunyan'), - winston = require('winston'), intercept = require("intercept-stdout"); var dbDefault = marklogic.createDatabaseClient(testconfig.restWriterConnection); var dbBunyan = marklogic.createDatabaseClient(testconfig.restWriterConnection); -var dbWinston = marklogic.createDatabaseClient(testconfig.restWriterConnection); describe('logging', function(){ @@ -47,31 +45,7 @@ describe('logging', function(){ }); }); - describe('with Winston', function(){ - var winstonLogger = winston.createLogger({ - level: 'debug', - format: winston.format.combine( - winston.format((info) => { - info.level = info.level.toUpperCase(); - return info; - })(), - winston.format.json() - ), - transports: [new winston.transports.Console()] - }); - dbWinston.setLogger(winstonLogger); - it('should write Winston string entries', function(done){ - var captured = []; - var unhook = intercept(function(txt) { - captured.push(txt); - }); - dbWinston.config.serverprops.read().result(function(response) { - unhook(); - JSON.parse(captured[0]).level.should.eql('DEBUG'); - done(); - }, done); - }); - }); - }); + + diff --git a/test-complete-proxy/gulpfile.js b/test-complete-proxy/gulpfile.js index ea33a6d5..1708e5de 100755 --- a/test-complete-proxy/gulpfile.js +++ b/test-complete-proxy/gulpfile.js @@ -1,95 +1,87 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ -const path = require('path'); -const gulp = require('gulp'); -const jshint = require('gulp-jshint'); -const mocha = require('gulp-mocha'); -const jsdoc = require('gulp-jsdoc3'); - -const { parallel, series } = gulp; - -const marklogic = require('../'); -const proxy = require('../lib/proxy-generator.js'); -const testconfig = require('../etc/test-config-qa.js'); -const basicloader = require('../lib/basic-loader.js'); - -function lint() { - return gulp.src('lib/*') - .pipe(jshint({lookup:true})) - .pipe(jshint.reporter('default')); -} - -function test() { - return gulp.src(['test-basic/*.js']) - .pipe(mocha({ - reporter: 'spec', - globals: { - should: require('should') - } - })); -} - -let testModulesClient = null; -function getTestModulesClient() { - var modDBName = testconfig.testServerName+'-modules'; - if (testModulesClient === null) { - const connectionParams = { - host: testconfig.restEvaluatorConnection.host, - port: testconfig.restEvaluatorConnection.port, - user: testconfig.restEvaluatorConnection.user, - password: testconfig.restEvaluatorConnection.password, - authType: testconfig.restEvaluatorConnection.authType, - database: modDBName - }; - testModulesClient = marklogic.createDatabaseClient(connectionParams); - } - return testModulesClient; -} -function getTestDocumentPermissions() { - return [ - {'role-name':'rest-reader', capabilities:['read', 'execute']}, - {'role-name':'rest-writer', capabilities:['update']} - ]; -} - -function loadQAModules(callback) { - const databaseClient = getTestModulesClient(); - const documentMetadata = { - collections: ['/qa/test/cases'], - permissions: getTestDocumentPermissions() - }; - const uriPrefix = '/qa/test/'; - const uriStartDepth = 2; - return gulp.src([ - '../test-complete-proxy/ml-modules/*/service.json', - '../test-complete-proxy/ml-modules/*/*.api', - '../test-complete-proxy/ml-modules/*/*.sjs', - '../test-complete-proxy/ml-modules/*/*.mjs', - '../test-complete-proxy/ml-modules/*/*.xqy' - ]) - .pipe(basicloader.loadFileStream({ - databaseClient: databaseClient, - documentMetadata: documentMetadata, - uriPrefix: uriPrefix, - uriStartDepth: uriStartDepth - })); -} -function generateTestFnClasses() { - return gulp.src('../test-complete-proxy/ml-modules/**/*') - .pipe(proxy.generate()) - .pipe(gulp.dest('../test-complete-proxy/lib/')); -} - -function copyClassesTotestComplete() { - return gulp.src('./lib/*.js') - .pipe(gulp.dest('./')); -} - -exports.lint = lint; -exports.loadToModulesDB = loadQAModules; -exports.generateFnClasses = generateTestFnClasses; -exports.copyFnClasses = copyClassesTotestComplete; - -exports.test = test; -exports.default = lint; +/* +* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. +*/ +const path = require('path'); +const gulp = require('gulp'); +const mocha = require('gulp-mocha'); +const jsdoc = require('gulp-jsdoc3'); + +const { parallel, series } = gulp; + +const marklogic = require('../'); +const proxy = require('../lib/proxy-generator.js'); +const testconfig = require('../etc/test-config-qa.js'); +const basicloader = require('../lib/basic-loader.js'); + +function test() { + return gulp.src(['test-basic/*.js']) + .pipe(mocha({ + reporter: 'spec', + globals: { + should: require('should') + } + })); +} + +let testModulesClient = null; +function getTestModulesClient() { + var modDBName = testconfig.testServerName+'-modules'; + if (testModulesClient === null) { + const connectionParams = { + host: testconfig.restEvaluatorConnection.host, + port: testconfig.restEvaluatorConnection.port, + user: testconfig.restEvaluatorConnection.user, + password: testconfig.restEvaluatorConnection.password, + authType: testconfig.restEvaluatorConnection.authType, + database: modDBName + }; + testModulesClient = marklogic.createDatabaseClient(connectionParams); + } + return testModulesClient; +} +function getTestDocumentPermissions() { + return [ + {'role-name':'rest-reader', capabilities:['read', 'execute']}, + {'role-name':'rest-writer', capabilities:['update']} + ]; +} + +function loadQAModules(callback) { + const databaseClient = getTestModulesClient(); + const documentMetadata = { + collections: ['/qa/test/cases'], + permissions: getTestDocumentPermissions() + }; + const uriPrefix = '/qa/test/'; + const uriStartDepth = 2; + return gulp.src([ + '../test-complete-proxy/ml-modules/*/service.json', + '../test-complete-proxy/ml-modules/*/*.api', + '../test-complete-proxy/ml-modules/*/*.sjs', + '../test-complete-proxy/ml-modules/*/*.mjs', + '../test-complete-proxy/ml-modules/*/*.xqy' + ]) + .pipe(basicloader.loadFileStream({ + databaseClient: databaseClient, + documentMetadata: documentMetadata, + uriPrefix: uriPrefix, + uriStartDepth: uriStartDepth + })); +} +function generateTestFnClasses() { + return gulp.src('../test-complete-proxy/ml-modules/**/*') + .pipe(proxy.generate()) + .pipe(gulp.dest('../test-complete-proxy/lib/')); +} + +function copyClassesTotestComplete() { + return gulp.src('./lib/*.js') + .pipe(gulp.dest('./')); +} + +exports.loadToModulesDB = loadQAModules; +exports.generateFnClasses = generateTestFnClasses; +exports.copyFnClasses = copyClassesTotestComplete; + +exports.test = test; +exports.default = test; diff --git a/test-complete/nodejs-logger-bunyan.js b/test-complete/nodejs-logger-bunyan.js deleted file mode 100644 index 9e02acaa..00000000 --- a/test-complete/nodejs-logger-bunyan.js +++ /dev/null @@ -1,16 +0,0 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ -var testconfig = require('../etc/test-config-qa.js'); -var marklogic = require('../'); -var dbAdmin = marklogic.createDatabaseClient(testconfig.restAdminConnection); - -describe('Bunyan logger test', function () { - - it('should read the bunyan logger', function (done) { - dbAdmin.config.serverprops.read().result(function (response) { - done(); - }, done); - }); - -}); diff --git a/test-complete/nodejs-logger-winston.js b/test-complete/nodejs-logger-winston.js deleted file mode 100644 index 3014feb6..00000000 --- a/test-complete/nodejs-logger-winston.js +++ /dev/null @@ -1,31 +0,0 @@ -/* -* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. -*/ -var should = require('should'); -var winston = require('winston'); - -var testconfig = require('../etc/test-config-qa.js'); -var fs = require('fs'); - -var marklogic = require('../'); - -var db = marklogic.createDatabaseClient(testconfig.restReaderConnection); -var dbWriter = marklogic.createDatabaseClient(testconfig.restWriterConnection); -var dbEval = marklogic.createDatabaseClient(testconfig.restEvaluatorConnection); -var dbAdmin = marklogic.createDatabaseClient(testconfig.restAdminConnection); - -describe('Winston logger test', function () { - - winston.level = 'debug'; - dbAdmin.setLogger(winston); - - it('should read the bunyan logger', function (done) { - dbAdmin.config.serverprops.read().result(function (response) { - //var log = JSON.stringify(response); - //console.log(log); - //log.should.containEql('testlog'); - done(); - }, done); - }); - -});