From 0b77d7f7989230727afd85a9f9bb3c3a99d87b5c Mon Sep 17 00:00:00 2001
From: Reid Burke <me@reidburke.com>
Date: Fri, 28 Feb 2014 16:48:07 -0800
Subject: [PATCH 1/7] Add test for #78, bad output for moduleless QUnit.

---
 package.json             |   2 +-
 test/functional/junit.js | 132 +++++++++++++++++++++++++++++++++++++++
 test/lib/cli.js          |  35 +++++++++++
 3 files changed, 168 insertions(+), 1 deletion(-)
 create mode 100644 test/functional/junit.js
 create mode 100644 test/lib/cli.js

diff --git a/package.json b/package.json
index 3c22604a..60f0de72 100644
--- a/package.json
+++ b/package.json
@@ -85,6 +85,6 @@
     "jake": ">=0.2.35",
     "rimraf": ">=2.0.1",
     "walkdir": ">=0.0.5",
-    "mock-utf8-stream": ">=0.1.0"
+    "mock-utf8-stream": ">=0.1.1"
   }
 }
diff --git a/test/functional/junit.js b/test/functional/junit.js
new file mode 100644
index 00000000..0ceebdf5
--- /dev/null
+++ b/test/functional/junit.js
@@ -0,0 +1,132 @@
+"use strict";
+
+var vows = require("vows");
+var assert = require("assert");
+
+var portfinder = require("portfinder");
+
+var hub = require("../lib/hub");
+var cliTopic = require("../lib/cli");
+
+var EventEmitter2 = require("../../lib/event-emitter");
+
+vows.describe("Yeti JUnit Functional").addBatch({
+    "A Yeti CLI with moduleless QUnit with JUnit output": {
+        topic: cliTopic(function (topic) {
+            var vow = this;
+
+            topic.stderr.startCapture();
+
+            portfinder.getPort(function (err, port) {
+                if (err) {
+                    vow.callback(err);
+                    return;
+                }
+
+                port = String(port);
+                topic.port = port;
+
+                topic.stderr.expect("When ready", function () {
+                    topic.stderr.stopCapture();
+                    topic.output = topic.stderr.capturedData;
+                    vow.callback(null, topic);
+                });
+
+                topic.fe.route([
+                    "node",
+                    "cli.js",
+                    "--junit",
+                    "-p", port,
+                    __dirname + "/fixture/qunit.html"
+                ]);
+            });
+        }),
+        "is ok": function (topic) {
+            assert.isUndefined(topic.stack);
+        },
+        "prints hub creation message on stderr": function (topic) {
+            assert.ok(topic.output.indexOf("Creating a Hub.") === 0);
+        },
+        "waits for agents to connect on stderr": function (topic) {
+            assert.include(topic.output, "Waiting for agents to connect");
+        },
+        "prompts on the writableStream": function (topic) {
+            assert.include(topic.output, "When ready, press Enter");
+        },
+        "a browser": hub.phantomContext({
+            "visits Yeti": {
+                topic: function (browser, topic) {
+                    var vow = this;
+
+                    topic.browser = browser;
+
+                    topic.stderr.expect("Agent connected", function (err, capturedData) {
+                        topic.output = capturedData;
+                        vow.callback(null, topic);
+                    });
+
+                    function onPageOpen(err, status) {
+                        if (err) {
+                            vow.callback(err);
+                        }
+                    }
+
+                    browser.createPage(function (err, page) {
+                        page.open("http://localhost:" + topic.port, onPageOpen);
+                    });
+                },
+                "is ok": function (topic) {
+                    assert.isUndefined(topic.stack);
+                },
+                "the stderr output contains the User-Agent": function (topic) {
+                    assert.include(topic.output, "PhantomJS");
+                },
+                "when Enter is pressed": {
+                    topic: function (topic) {
+                        var vow = this;
+
+                        topic.stderr.expect("pass", function (err, capturedData) {
+                            topic.output = capturedData;
+                            vow.callback(null, topic);
+                        });
+
+                        topic.stdout.startCapture();
+
+                        topic.stdin.write("\n"); // Enter
+                    },
+                    "is ok": function (topic) {
+                        assert.isUndefined(topic.stack);
+                    },
+                    "the stderr output contains the test summary": function (topic) {
+                        // FIXME, tests should be test
+                        assert.include(topic.output, "1 tests passed");
+                    },
+                    "the stderr output contains Agent complete": function (topic) {
+                        assert.include(topic.output, "Agent complete");
+                    },
+                    "should exit": {
+                        topic: function (topic) {
+                            var vow = this;
+                            topic.emitter.once("exit", function (code) {
+                                topic.stdout.stopCapture();
+                                topic.exitCode = code;
+                                vow.callback(null, topic);
+                            });
+                        },
+                        "with status code 0": function (topic) {
+                            assert.strictEqual(topic.exitCode, 0);
+                        },
+                        "the stdout output contains JUnit XML": function (topic) {
+                            assert.ok(topic.stdout.capturedData.indexOf("<?xml") === 0);
+                            assert.include(topic.stdout.capturedData, "</testsuites>");
+                        },
+                        "the stdout output contains a JUnit testcase": function (topic) {
+                            // https://github.com/yui/yeti/issues/78
+                            assert.include(topic.stdout.capturedData, '<testcase name="hello qunit: test1"');
+                        }
+                    }
+                }
+            }
+        }) // phantomContext
+    }
+}).export(module);
diff --git a/test/lib/cli.js b/test/lib/cli.js
new file mode 100644
index 00000000..b6ac0d43
--- /dev/null
+++ b/test/lib/cli.js
@@ -0,0 +1,35 @@
+"use strict";
+
+var streams = require("mock-utf8-stream");
+
+var EventEmitter2 = require("../../lib/event-emitter");
+var CLI = require("../../lib/cli").CLI;
+
+module.exports = function cliTopic(fn) {
+    return function () {
+        var vow = this,
+            topic,
+            emitter = new EventEmitter2();
+
+        topic = {
+            fe: null,
+            stdin:  new streams.MockReadableStream(),
+            stdout: new streams.MockWritableStream(),
+            stderr: new streams.MockWritableStream(),
+            emitter: emitter
+        };
+
+        function mockExit(code) {
+            emitter.emit("exit", code);
+        }
+
+        topic.fe = new CLI({
+            stdin: topic.stdin,
+            stdout: topic.stdout,
+            stderr: topic.stderr,
+            exitFn: mockExit
+        });
+
+        return fn.call(vow, topic);
+    };
+};

From 5485aeda80d8c7551aba4dc0dc76b0eec6e38f75 Mon Sep 17 00:00:00 2001
From: Reid Burke <me@reidburke.com>
Date: Fri, 28 Feb 2014 16:37:24 -0800
Subject: [PATCH 2/7] Do not autostart QUnit.

---
 test/functional/fixture/qunit.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/functional/fixture/qunit.html b/test/functional/fixture/qunit.html
index 14342209..c0be71c2 100644
--- a/test/functional/fixture/qunit.html
+++ b/test/functional/fixture/qunit.html
@@ -6,6 +6,7 @@
 <div id="qunit"></div>
 <script src="../../../dep/dev/qunit.js"></script>
 <script>
+QUnit.config.autostart = false;
 test("hello qunit", function () {
     ok(1 == 1, "Yay!");
 });

From 2526758233679b133aeeacfa9695a48fc408ec9f Mon Sep 17 00:00:00 2001
From: Reid Burke <me@reidburke.com>
Date: Fri, 28 Feb 2014 16:38:01 -0800
Subject: [PATCH 3/7] Fix #78, collect moduleless QUnit test results.

The old implementation required moduleDone in order to collect
test results. This change introduces changes that allow results
to be sent even without modules by using testStart and testDone APIs.
---
 lib/hub/view/public/inject.js | 73 +++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 30 deletions(-)

diff --git a/lib/hub/view/public/inject.js b/lib/hub/view/public/inject.js
index 3405584b..9859b3ed 100644
--- a/lib/hub/view/public/inject.js
+++ b/lib/hub/view/public/inject.js
@@ -75,6 +75,7 @@ window.$yetify = function (options) {
                     data = {},
                     tests = {},
                     count = 1,
+                    curModuleName = "",
                     curTestName;
 
                 function complete(results) {
@@ -105,7 +106,19 @@ window.$yetify = function (options) {
                     return result.message || "";
                 }
 
-                qunit.log = function (test) {
+                function formatTests() {
+                    var i, out = {};
+                    for (i in tests) {
+                        out[tests[i].name] = {
+                            result: tests[i].result,
+                            message: message(tests[i]),
+                            name: tests[i].name
+                        };
+                    }
+                    return out;
+                }
+
+                qunit.log(function (test) {
                     tests["test" + count] = {
                         message: test.message,
                         result: (test.result) ? test.result : "fail",
@@ -115,46 +128,46 @@ window.$yetify = function (options) {
                     };
 
                     count = count + 1;
-                };
+                });
 
-                qunit.moduleStart = function (test) {
+                qunit.testStart(function (test) {
                     curTestName = test.name;
-                };
+                });
 
-                qunit.moduleDone = function (test) {
-                    var testName = curTestName,
-                        i;
+                qunit.testDone(function (test) {
+                    var module = formatTests(),
+                        name = curModuleName + curTestName;
 
-                    data[testName] = {
-                        name: testName,
-                        passed: test.passed,
-                        failed: test.failed,
-                        total: test.total
-                    };
+                    module.name = name;
+                    module.passed = test.passed;
+                    module.failed = test.failed;
+                    module.total = test.total;
 
-                    for (i in tests) {
-                        data[testName][tests[i].name] = {
-                            result: tests[i].result,
-                            message: message(tests[i]),
-                            name: tests[i].name
-                        };
-                    }
+                    data[name] = module;
 
                     tests = {};
                     count = 1;
-                };
+                });
 
-                qunit.done = function (tests) {
-                    var results = data;
+                qunit.moduleStart(function (test) {
+                    curModuleName = test.name + ": ";
+                });
 
-                    results.passed = tests.passed;
-                    results.failed = tests.failed;
-                    results.total = tests.total;
-                    results.duration = tests.runtime;
-                    results.name = document.title;
+                qunit.moduleDone(function (test) {
+                    curModuleName = "";
+                });
 
-                    complete(results);
-                };
+                qunit.done(function (tests) {
+                    data = Y.merge(formatTests(), data);
+
+                    data.passed = tests.passed;
+                    data.failed = tests.failed;
+                    data.total = tests.total;
+                    data.duration = tests.runtime;
+                    data.name = document.title;
+
+                    complete(data);
+                });
 
                 qunit.start();
             }

From e92202f22f840386f59bdbfcd24b7c7cfbc9dcad Mon Sep 17 00:00:00 2001
From: Reid Burke <me@reidburke.com>
Date: Mon, 3 Mar 2014 14:45:44 -0800
Subject: [PATCH 4/7] Add missing qunit-module.html

---
 test/functional/fixture/qunit-module.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 test/functional/fixture/qunit-module.html

diff --git a/test/functional/fixture/qunit-module.html b/test/functional/fixture/qunit-module.html
new file mode 100644
index 00000000..147cbdb0
--- /dev/null
+++ b/test/functional/fixture/qunit-module.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<head>
+    <title>Yeti QUnit Module Test</title>
+    <link rel="stylesheet" href="../../../dep/dev/qunit.css">
+</head>
+<div id="qunit"></div>
+<script src="../../../dep/dev/qunit.js"></script>
+<script>
+QUnit.config.autostart = false;
+module("Yeti Example Module");
+test("hello qunit", function () {
+    ok(1 == 1, "Yay!");
+});
+</script>

From 008bc26832f5e2e9f8a89f48ffe3bbf6e1eb6adf Mon Sep 17 00:00:00 2001
From: Reid Burke <me@reidburke.com>
Date: Mon, 3 Mar 2014 15:38:45 -0800
Subject: [PATCH 5/7] Add assertion failure message for XML prolog test.

---
 test/functional/junit.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/functional/junit.js b/test/functional/junit.js
index 0ceebdf5..f1ed788d 100644
--- a/test/functional/junit.js
+++ b/test/functional/junit.js
@@ -117,7 +117,8 @@ vows.describe("Yeti JUnit Functional").addBatch({
                             assert.strictEqual(topic.exitCode, 0);
                         },
                         "the stdout output contains JUnit XML": function (topic) {
-                            assert.ok(topic.stdout.capturedData.indexOf("<?xml") === 0);
+                            assert.ok(topic.stdout.capturedData.indexOf("<?xml") === 0,
+                                "Expected XML prolog in: " + topic.stdout.capturedData);
                             assert.include(topic.stdout.capturedData, "</testsuites>");
                         },
                         "the stdout output contains a JUnit testcase": function (topic) {

From a97191adcc19fc6e3b46cbc7e0c7fdc7a2583c62 Mon Sep 17 00:00:00 2001
From: Reid Burke <me@reidburke.com>
Date: Mon, 3 Mar 2014 16:50:06 -0800
Subject: [PATCH 6/7] Start capturing stdout earlier in the test.

Attempts to correct test race condition seen in
https://travis-ci.org/yui/yeti/jobs/20017403
---
 test/functional/junit.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/functional/junit.js b/test/functional/junit.js
index f1ed788d..264a4a1d 100644
--- a/test/functional/junit.js
+++ b/test/functional/junit.js
@@ -32,6 +32,8 @@ vows.describe("Yeti JUnit Functional").addBatch({
                     vow.callback(null, topic);
                 });
 
+                topic.stdout.startCapture();
+
                 topic.fe.route([
                     "node",
                     "cli.js",
@@ -90,8 +92,6 @@ vows.describe("Yeti JUnit Functional").addBatch({
                             vow.callback(null, topic);
                         });
 
-                        topic.stdout.startCapture();
-
                         topic.stdin.write("\n"); // Enter
                     },
                     "is ok": function (topic) {

From 9b274ba26513513090232f56ab7848e45817b00d Mon Sep 17 00:00:00 2001
From: Reid Burke <me@reidburke.com>
Date: Tue, 4 Mar 2014 16:18:39 -0800
Subject: [PATCH 7/7] Add --isolate to Vows command.

Attempt to fix XML prolog test failure in Travis by
running that functional test file by itself. Note that
this only affects files, not individual tests.
---
 Jakefile.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jakefile.js b/Jakefile.js
index 19073ef3..49e4ed6a 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -87,7 +87,7 @@ task("install", function () {
 
 desc("Run all of Yeti's functional tests");
 task("test-functional", function () {
-    var args = ["--spec"];
+    var args = ["--isolate", "--spec"];
     bin("vows", args.concat(getTestFiles("functional")), complete);
 }, {
     async: true
@@ -95,7 +95,7 @@ task("test-functional", function () {
 
 desc("Run all of Yeti's unit tests");
 task("test-unit", function () {
-    var args = [];
+    var args = ["--isolate"];
     if (process.env.TRAVIS) {
         args.push("--spec");
     }