This is an automated email from the ASF dual-hosted git repository. poorejc pushed a commit to branch FLAGON-336 in repository https://gitbox.apache.org/repos/asf/incubator-flagon-useralejs.git
commit 834c4cce1689ef2fb6602f936593fed223d28194 Author: poorejc <[email protected]> AuthorDate: Sat Jun 22 21:15:49 2019 -0400 [FLAGON-336] Added new log fields and jsdom-global package to fix brocken unit tests --- build/UserAleWebExtension/content.js | 6 ++ build/userale-2.0.0.js | 6 ++ build/userale-2.0.0.min.js | 2 +- package-lock.json | 118 +++++++++++++++++++++++------------ package.json | 3 +- src/packageLogs.js | 6 ++ test/packageLogs_spec.js | 1 + 7 files changed, 101 insertions(+), 41 deletions(-) diff --git a/build/UserAleWebExtension/content.js b/build/UserAleWebExtension/content.js index 223a5d3..e7df05a 100644 --- a/build/UserAleWebExtension/content.js +++ b/build/UserAleWebExtension/content.js @@ -267,6 +267,9 @@ function packageLog(e, detailFcn) { var log = { 'target' : getSelector(e.target), 'path' : buildPath(e), + 'pageUrl': window.location.href, + 'pageTitle': document.title, + 'pageReferrer': document.referrer, 'clientTime' : timeFields.milli, 'microTime' : timeFields.micro, 'location' : getLocation(e), @@ -334,6 +337,9 @@ function packageIntervalLog(e) { intervalLog = { 'target': intervalID, 'path': intervalPath, + 'pageUrl': window.location.href, + 'pageTitle': document.title, + 'pageReferrer': document.referrer, 'count': intervalCounter, 'duration': timestamp - intervalTimer, // microseconds 'startTime': intervalTimer, diff --git a/build/userale-2.0.0.js b/build/userale-2.0.0.js index b69900f..cac6cf8 100644 --- a/build/userale-2.0.0.js +++ b/build/userale-2.0.0.js @@ -246,6 +246,9 @@ var userale = (function (exports) { var log = { 'target' : getSelector(e.target), 'path' : buildPath(e), + 'pageUrl': window.location.href, + 'pageTitle': document.title, + 'pageReferrer': document.referrer, 'clientTime' : timeFields.milli, 'microTime' : timeFields.micro, 'location' : getLocation(e), @@ -313,6 +316,9 @@ var userale = (function (exports) { intervalLog = { 'target': intervalID, 'path': intervalPath, + 'pageUrl': window.location.href, + 'pageTitle': document.title, + 'pageReferrer': document.referrer, 'count': intervalCounter, 'duration': timestamp - intervalTimer, // microseconds 'startTime': intervalTimer, diff --git a/build/userale-2.0.0.min.js b/build/userale-2.0.0.min.js index caed367..c8c399a 100644 --- a/build/userale-2.0.0.min.js +++ b/build/userale-2.0.0.min.js @@ -15,4 +15,4 @@ * limitations under the License. * @preserved */ -var userale=function(n){"use strict";var a,i,u,l,s,c,d,f,t="2.0.0";function e(n,o){Object.keys(o).forEach(function(t){if("userFromParams"===t){var e=function(t){var e=new RegExp("[?&]"+t+"(=([^&#]*)|&|#|$)"),n=window.location.href.match(e);return n&&n[2]?decodeURIComponent(n[2].replace(/\+/g," ")):null}(o[t]);e&&(n.userId=e)}n[t]=o[t]})}var o,r,m,p=null,v=null;function g(t,e){if(!i.on)return!1;var n=null;e&&(n=e(t));var o=function(t){return{milli:Math.floor(t),micro:Number((t%1).toFixed( [...] \ No newline at end of file +var userale=function(n){"use strict";var a,i,u,l,s,c,d,f,t="2.0.0";function e(n,o){Object.keys(o).forEach(function(t){if("userFromParams"===t){var e=function(t){var e=new RegExp("[?&]"+t+"(=([^&#]*)|&|#|$)"),n=window.location.href.match(e);return n&&n[2]?decodeURIComponent(n[2].replace(/\+/g," ")):null}(o[t]);e&&(n.userId=e)}n[t]=o[t]})}var o,r,m,p=null,g=null;function v(t,e){if(!i.on)return!1;var n=null;e&&(n=e(t));var o=function(t){return{milli:Math.floor(t),micro:Number((t%1).toFixed( [...] \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index fb25c1b..ca03112 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,18 +45,18 @@ "dev": true }, "acorn-globals": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz";, - "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz";, + "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=", "dev": true, "requires": { - "acorn": "^2.1.0" + "acorn": "^4.0.4" }, "dependencies": { "acorn": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz";, - "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz";, + "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", "dev": true } } @@ -1730,6 +1730,12 @@ "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", "dev": true }, + "content-type-parser": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.2.tgz";, + "integrity": "sha512-lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ==", + "dev": true + }, "convert-source-map": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz";, @@ -2147,9 +2153,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.167", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.167.tgz";, - "integrity": "sha512-84IjpeRudjP43Q0+K7tlS7ESoHOl0W6CIdzs5reS9p+sAjCQEDiaAyiXN2v1qLUdL+Of6ZSaH4Cq6bl+sfzy8A==", + "version": "1.3.169", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.169.tgz";, + "integrity": "sha512-CxKt4ONON7m0ekVaFzvTZakHgGQsLMRH0J8W6h4lhyBNgskj3CIJz4bj+bh5+G26ztAe6dZjmYUeEW4u/VSnLQ==", "dev": true }, "encodeurl": { @@ -4055,6 +4061,15 @@ "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==", "dev": true }, + "html-encoding-sniffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz";, + "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==", + "dev": true, + "requires": { + "whatwg-encoding": "^1.0.1" + } + }, "http-errors": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz";, @@ -4600,38 +4615,46 @@ "dev": true }, "jsdom": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-8.5.0.tgz";, - "integrity": "sha1-1Nj12/J2hjW2KmKCO5R89wcevJg=", + "version": "9.12.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-9.12.0.tgz";, + "integrity": "sha1-6MVG//ywbADUgzyoRBD+1/igl9Q=", "dev": true, "requires": { - "abab": "^1.0.0", - "acorn": "^2.4.0", - "acorn-globals": "^1.0.4", + "abab": "^1.0.3", + "acorn": "^4.0.4", + "acorn-globals": "^3.1.0", "array-equal": "^1.0.0", - "cssom": ">= 0.3.0 < 0.4.0", - "cssstyle": ">= 0.2.34 < 0.3.0", + "content-type-parser": "^1.0.1", + "cssom": ">= 0.3.2 < 0.4.0", + "cssstyle": ">= 0.2.37 < 0.3.0", "escodegen": "^1.6.1", - "iconv-lite": "^0.4.13", - "nwmatcher": ">= 1.3.7 < 2.0.0", + "html-encoding-sniffer": "^1.0.1", + "nwmatcher": ">= 1.3.9 < 2.0.0", "parse5": "^1.5.1", - "request": "^2.55.0", - "sax": "^1.1.4", - "symbol-tree": ">= 3.1.0 < 4.0.0", - "tough-cookie": "^2.2.0", - "webidl-conversions": "^3.0.1", - "whatwg-url": "^2.0.1", - "xml-name-validator": ">= 2.0.1 < 3.0.0" + "request": "^2.79.0", + "sax": "^1.2.1", + "symbol-tree": "^3.2.1", + "tough-cookie": "^2.3.2", + "webidl-conversions": "^4.0.0", + "whatwg-encoding": "^1.0.1", + "whatwg-url": "^4.3.0", + "xml-name-validator": "^2.0.1" }, "dependencies": { "acorn": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz";, - "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz";, + "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", "dev": true } } }, + "jsdom-global": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/jsdom-global/-/jsdom-global-2.1.1.tgz";, + "integrity": "sha1-R9Rv539hZ7r100Qx07tZ/EGwkVo=", + "dev": true + }, "jsesc": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz";, @@ -6426,9 +6449,9 @@ } }, "rollup": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.16.1.tgz";, - "integrity": "sha512-cq2HT0OQF7sStRZpoiWgGorExkCxs7asewKtQcEkEam+xGDwT2QlF1P0J6OjKiqNj8bFzggfizPhEcI3mEUIfQ==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.16.2.tgz";, + "integrity": "sha512-UAZxaQvH0klYZdF+90xv9nGb+m4p8jdoaow1VL5/RzDK/gN/4CjvaMmJNcOIv1/+gtzswKhAg/467mzF0sLpAg==", "dev": true, "requires": { "@types/estree": "0.0.39", @@ -7726,19 +7749,36 @@ } }, "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz";, - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz";, + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", "dev": true }, + "whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz";, + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "dev": true, + "requires": { + "iconv-lite": "0.4.24" + } + }, "whatwg-url": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-2.0.1.tgz";, - "integrity": "sha1-U5ayBD8CDub3BNnEXqhRnnJN5lk=", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-4.8.0.tgz";, + "integrity": "sha1-0pgaqRSMHgCkHFphMRZqtGg7vMA=", "dev": true, "requires": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" + }, + "dependencies": { + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz";, + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", + "dev": true + } } }, "which": { diff --git a/package.json b/package.json index d00d818..050c9ab 100755 --- a/package.json +++ b/package.json @@ -57,7 +57,8 @@ "gulp-rename": "^1.2.2", "gulp-replace": "^0.5.4", "gulp-uglify": "^3.0.1", - "jsdom": "^8.4.0", + "jsdom": "^9.12.0", + "jsdom-global": "^2.1.1", "nodemon": "^1.9.2", "rollup": "^1.15.5", "rollup-plugin-json": "^4.0.0", diff --git a/src/packageLogs.js b/src/packageLogs.js index 439e816..81553cf 100644 --- a/src/packageLogs.js +++ b/src/packageLogs.js @@ -87,6 +87,9 @@ export function packageLog(e, detailFcn) { var log = { 'target' : getSelector(e.target), 'path' : buildPath(e), + 'pageUrl': window.location.href, + 'pageTitle': document.title, + 'pageReferrer': document.referrer, 'clientTime' : timeFields.milli, 'microTime' : timeFields.micro, 'location' : getLocation(e), @@ -154,6 +157,9 @@ export function packageIntervalLog(e) { intervalLog = { 'target': intervalID, 'path': intervalPath, + 'pageUrl': window.location.href, + 'pageTitle': document.title, + 'pageReferrer': document.referrer, 'count': intervalCounter, 'duration': timestamp - intervalTimer, // microseconds 'startTime': intervalTimer, diff --git a/test/packageLogs_spec.js b/test/packageLogs_spec.js index 9db1b5a..ddce925 100644 --- a/test/packageLogs_spec.js +++ b/test/packageLogs_spec.js @@ -16,6 +16,7 @@ */ import { expect } from 'chai'; import jsdom from 'jsdom'; +import 'jsdom-global/register'; import fs from 'fs'; import { packageLog, initPackager, getLocation, getSelector, buildPath, selectorizePath,
