From 1dc03a935a0d49d473e569b749f7f2bd430b9d5f Mon Sep 17 00:00:00 2001 From: Jim Geurts Date: Fri, 16 Oct 2020 19:00:11 -0500 Subject: [PATCH 1/2] Update dependencies * Set minimum node version to oldest LTS --- lib/saml2.coffee | 2 +- package.json | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/saml2.coffee b/lib/saml2.coffee index 6fd0b12..539abf6 100644 --- a/lib/saml2.coffee +++ b/lib/saml2.coffee @@ -5,7 +5,7 @@ debug = require('debug') 'saml2' {parseString} = require 'xml2js' url = require 'url' util = require 'util' -xmlbuilder = require 'xmlbuilder' +xmlbuilder = require 'xmlbuilder2' xmlcrypto = require 'xml-crypto' xmldom = require 'xmldom' xmlenc = require 'xml-encryption' diff --git a/package.json b/package.json index 797e829..082a2bc 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "author": "Clever", "main": "index.js", "engines": { - "node": ">=0.10.x" + "node": ">=10.x" }, "scripts": { "test": "make -Br test", @@ -24,17 +24,17 @@ "url": "https://github.com/Clever/saml2/issues" }, "devDependencies": { - "mocha": "^3.5.0", + "mocha": "^8.2.0", "coffee-script": "^1.12.0" }, "dependencies": { - "async": "^2.5.0", - "debug": "^2.6.0", - "underscore": "^1.8.0", - "xml-crypto": "^0.10.0", - "xml-encryption": "^0.11.0", - "xml2js": "^0.4.0", - "xmlbuilder": "~2.2.0", - "xmldom": "^0.1.0" + "async": "^3.2.0", + "debug": "^4.2.0", + "underscore": "^1.11.0", + "xml-crypto": "^2.0.0", + "xml-encryption": "^1.2.1", + "xml2js": "^0.4.23", + "xmlbuilder2": "^2.4.0", + "xmldom": "^0.3.0" } } From 93a031ba99ef8f458c9467af56b0247b2b6365be Mon Sep 17 00:00:00 2001 From: Jim Geurts Date: Wed, 28 Oct 2020 11:48:14 -0500 Subject: [PATCH 2/2] Get mocha running and revert back to xmlbuilder --- .mocharc.js | 6 ++++++ Makefile | 4 ++-- lib/saml2.coffee | 2 +- package.json | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 .mocharc.js diff --git a/.mocharc.js b/.mocharc.js new file mode 100644 index 0000000..c2200f1 --- /dev/null +++ b/.mocharc.js @@ -0,0 +1,6 @@ +module.exports = { + exit: true, + timeout: 60000, + checkLeaks: false, + require: ['coffee-script/register'], +}; diff --git a/Makefile b/Makefile index 8986510..47d4e5a 100644 --- a/Makefile +++ b/Makefile @@ -12,11 +12,11 @@ test-cov: rm -rf lib-js lib-js-cov coffee -c -o lib-js lib jscoverage lib-js lib-js-cov - NODE_ENV=test TEST_COV_SAML2=1 node_modules/mocha/bin/mocha -R html-cov --ignore-leaks --compilers coffee:coffee-script/register test/*.coffee | tee coverage.html + NODE_ENV=test TEST_COV_SAML2=1 node_modules/mocha/bin/mocha -R html-cov test/*.coffee | tee coverage.html open coverage.html test: build - NODE_ENV=test node_modules/mocha/bin/mocha --ignore-leaks --timeout 60000 -R spec --compilers coffee:coffee-script/register test/*.coffee + NODE_ENV=test node_modules/mocha/bin/mocha -R spec test/*.coffee clean: rm -rf lib-js lib-js-cov diff --git a/lib/saml2.coffee b/lib/saml2.coffee index 539abf6..6fd0b12 100644 --- a/lib/saml2.coffee +++ b/lib/saml2.coffee @@ -5,7 +5,7 @@ debug = require('debug') 'saml2' {parseString} = require 'xml2js' url = require 'url' util = require 'util' -xmlbuilder = require 'xmlbuilder2' +xmlbuilder = require 'xmlbuilder' xmlcrypto = require 'xml-crypto' xmldom = require 'xmldom' xmlenc = require 'xml-encryption' diff --git a/package.json b/package.json index f468991..ac96bb7 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "xml-crypto": "^2.0.0", "xml-encryption": "^1.2.1", "xml2js": "^0.4.23", - "xmlbuilder2": "^2.4.0", + "xmlbuilder": "~2.2.0", "xmldom": "^0.3.0" } }