WebDriver reporter updates

- Fix call to non-existent _send method
- Add unit tests

Author: jason0x43

lib/reporters/WebDriver.js

@@ -1,16 +1,13 @@
 define([
-	'dojo/aspect',
-	'dojo/topic',
-	'dojo/request',
-	'dojo/Promise',
 	'../util',
-	'../sendData',
+	// Conditional load sendData for testability
+	'dojo/has!host-browser?../sendData',
 	'require'
-], function (aspect, topic, request, Promise, util, sendData, require) {
-	function scroll() {
-		window.scrollTo(0, document.documentElement.scrollHeight || document.body.scrollHeight);
-	}
-
+], function (
+	util,
+	sendData,
+	require
+) {
 	function WebDriver(config) {
 		config = config || {};
 
@@ -33,7 +30,7 @@ define([
 		$others: function (name) {
 			// never send coverage events; coverage is handled explicitly by Proxy
 			if (name !== 'coverage' && name !== 'run') {
-				return this._send(Array.prototype.slice.call(arguments, 0));
+				return this._sendEvent(name, Array.prototype.slice.call(arguments, 1));
 			}
 		},
 
@@ -72,7 +69,7 @@ define([
 					oldSuiteNode.appendChild(outerSuiteNode);
 				}
 
-				scroll();
+				this._scroll();
 			}
 
 			return this._sendEvent('suiteStart', arguments);
@@ -86,7 +83,7 @@ define([
 				var errorNode = document.createElement('pre');
 				errorNode.appendChild(document.createTextNode(util.getErrorMessage(error)));
 				this.suiteNode.appendChild(errorNode);
-				scroll();
+				this._scroll();
 			}
 
 			return this._sendEvent('suiteError', arguments);
@@ -97,7 +94,7 @@ define([
 				this.testNode = document.createElement('li');
 				this.testNode.appendChild(document.createTextNode(test.name));
 				this.suiteNode.appendChild(this.testNode);
-				scroll();
+				this._scroll();
 			}
 
 			return this._sendEvent('testStart', arguments);
@@ -107,7 +104,7 @@ define([
 			if (this.writeHtml) {
 				this.testNode.appendChild(document.createTextNode(' passed (' + test.timeElapsed + 'ms)'));
 				this.testNode.style.color = 'green';
-				scroll();
+				this._scroll();
 			}
 
 			return this._sendEvent('testPass', arguments);
@@ -120,7 +117,7 @@ define([
 					(test.skipped ? ' (' + test.skipped + ')' : '')));
 				testNode.style.color = 'gray';
 				this.suiteNode.appendChild(testNode);
-				scroll();
+				this._scroll();
 			}
 
 			return this._sendEvent('testSkip', arguments);
@@ -134,7 +131,7 @@ define([
 				var errorNode = document.createElement('pre');
 				errorNode.appendChild(document.createTextNode(util.getErrorMessage(test.error)));
 				this.testNode.appendChild(errorNode);
-				scroll();
+				this._scroll();
 			}
 
 			return this._sendEvent('testFail', arguments);
@@ -148,6 +145,10 @@ define([
 			if (shouldWait) {
 				return promise;
 			}
+		},
+
+		_scroll: function () {
+			window.scrollTo(0, document.documentElement.scrollHeight || document.body.scrollHeight);
 		}
 	};
 

tests/unit/lib/reporters/WebDriver.js

@@ -0,0 +1,107 @@
+define([
+	'intern!object',
+	'intern/chai!assert',
+	'../../../../lib/Suite',
+	'../../../../lib/Test',
+	'../../../../lib/reporters/WebDriver'
+], function (
+	registerSuite,
+	assert,
+	Suite,
+	Test,
+	WebDriver
+) {
+	var reporter;
+	var messages;
+	var documentAdded = false;
+
+	function messageTest(name, object) {
+		if (reporter[name]) {
+			reporter[name](object);
+		}
+		else {
+			reporter.$others(name, object);
+		}
+		assert.lengthOf(messages, 1, 'expected a message to be sent');
+		assert.strictEqual(messages[0].name, name, 'unexpected message name ' + messages[0].name);
+		if (object) {
+			assert.strictEqual(messages[0].args[0], object, 'unexpected message args');
+		}
+	}
+
+	function createSuiteMessageTest(name) {
+		return function () {
+			var suite = new Suite({ name: 'suite', parent: {} });
+			return messageTest(name, suite);
+		};
+	}
+
+	function createTestMessageTest(name) {
+		return function () {
+			var test = new Test({ name: 'test', parent: {} });
+			return messageTest(name, test);
+		};
+	}
+
+	function createMessageTest(name) {
+		return function () {
+			return messageTest(name);
+		};
+	}
+
+	registerSuite({
+		name: 'intern/lib/reporters/WebDriver',
+
+		setup: function () {
+			if (typeof document === 'undefined') {
+				/* globals global */
+				global.document = {};
+				documentAdded = true;
+			}
+		},
+
+		beforeEach: function () {
+			reporter = new WebDriver({
+				writeHtml: false,
+				internConfig: {
+					sessionId: 'foo'
+				}
+			});
+			messages = [];
+
+			reporter._sendEvent = function (name, args) {
+				messages.push({
+					name: name,
+					args: args
+				});
+			};
+
+			reporter._scroll = function () {};
+		},
+
+		afterEach: function () {
+			messages = null;
+			reporter = null;
+		},
+
+		teardown: function () {
+			if (documentAdded) {
+				delete global.document;
+			}
+		},
+
+		suiteStart: createSuiteMessageTest('suiteStart'),
+		suiteEnd: createSuiteMessageTest('suiteEnd'),
+		suiteError: createSuiteMessageTest('suiteError'),
+
+		runStart: createMessageTest('runStart'),
+		runEnd: createMessageTest('runEnd'),
+
+		testStart: createTestMessageTest('testStart'),
+		testPass: createTestMessageTest('testPass'),
+		testSkip: createTestMessageTest('testSkip'),
+		testEnd: createTestMessageTest('testEnd'),
+		testFail: createTestMessageTest('testFail')
+	});
+});
+