Errors: Check context in wrapFn

plugins/errors.js

@@ -1316,7 +1316,11 @@
 				try {
 					var args = Array.prototype.slice.call(arguments);
 					var callbackFn = args[callbackIndex];
-					var targetObj = useCallingObject ? this : that;
+
+					// Determine the calling object: if 'this' is the Boomerang frame, we should swap it
+					// to the correct top level window context.  If Boomerang isn't running in a frame,
+					// BOOMR.window will still point to the top-level window.
+					var targetObj = useCallingObject ? (this === window ? BOOMR.window : this) : that;
 					var wrappedFn = impl.wrap(callbackFn, targetObj, via);
 
 					args[callbackIndex] = wrappedFn;

tests/boomerang-test-framework.js

@@ -259,7 +259,7 @@
 
 	t.configureTestEnvironment = function() {
 		// setup Mocha
-		window.mocha.globals(["BOOMR", "PageGroupVariable", "mochaResults", "BOOMR_configt"]);
+		window.mocha.globals(["BOOMR", "PageGroupVariable", "mochaResults", "BOOMR_configt", "_bmrEvents"]);
 		window.mocha.checkLeaks();
 
 		// set globals

tests/page-templates/14-errors/40-wrap-context.html

@@ -0,0 +1,14 @@
+<%= header %>
+<%= boomerangSnippet %>
+<script src="40-wrap-context.js" type="text/javascript"></script>
+<script>
+BOOMR_test.init({
+	testAfterOnBeacon: 1,
+	Errors: {
+		enabled: true,
+		monitorEvents: true,
+		sendAfterOnload: true
+	}
+});
+</script>
+<%= footer %>

tests/page-templates/14-errors/40-wrap-context.js

@@ -0,0 +1,21 @@
+/*eslint-env mocha*/
+
+describe("e2e/14-errors/40-wrap-context", function() {
+	it("Should infer BOOMR.window as context for unbound addEventListener calls", function(done) {
+		if (typeof window.EventTarget === "undefined") {
+			return this.skip();
+		}
+
+		assert.equal(BOOMR.window, top);
+		assert.equal(BOOMR.window, window.parent);
+		(function(){
+			addEventListener("foo", function(){
+				// this assert is redundant, if we get our callback, it means it fired on the right window
+				assert.equal(this, BOOMR.window);
+				done();
+			});
+			this.dispatchEvent(new Event("foo"));
+		}).apply(BOOMR.window);
+	});
+
+});