From fb7410c8ec69009a0d1d281bfcdeabcc4332b896 Mon Sep 17 00:00:00 2001
From: Geoff Schmidt <geoff@geoffschmidt.com>
Date: Fri, 3 Aug 2012 12:28:59 -0700
Subject: [PATCH] finish moving liveui tests to spark

---
 packages/liveui/livedocument_tests.js         | 78 -------------------
 packages/liveui/liveui_tests.html             | 13 ----
 packages/liveui/package.js                    | 12 ---
 packages/spark/package.js                     |  2 +
 packages/spark/spark_tests.js                 |  3 +-
 .../test_form_responder.js}                   |  2 +-
 6 files changed, 5 insertions(+), 105 deletions(-)
 delete mode 100644 packages/liveui/livedocument_tests.js
 delete mode 100644 packages/liveui/liveui_tests.html
 rename packages/{liveui/form_responder.js => spark/test_form_responder.js} (90%)

diff --git a/packages/liveui/livedocument_tests.js b/packages/liveui/livedocument_tests.js
deleted file mode 100644
index 9609352b5b..0000000000
--- a/packages/liveui/livedocument_tests.js
+++ /dev/null
@@ -1,78 +0,0 @@
-Tinytest.add("livedocument - assembly", function(test) {
-
-  var doTest = function(calc) {
-    var onlives = [];
-    var ondeads = [];
-    var frag = Meteor.ui._doc.materialize(
-      calc(function(str, expected) {
-        return Meteor.ui._doc.annotate(str, {onlive: function() {
-          onlives.push(this.id);
-        }, ondead: function() {
-          ondeads.push(this.id);
-        }});
-      }));
-    var groups = [];
-    var html = calc(function(str, expected, noRange) {
-      if (arguments.length > 1)
-        str = expected;
-      if (! noRange)
-        groups.push(str);
-      return str;
-    });
-    var f = WrappedFrag(frag);
-    test.equal(f.html(), html);
-
-    var actualGroups = [];
-    var tempRange = new LiveRange(Meteor.ui._TAG, frag);
-    tempRange.visit(function(isStart, rng) {
-      if (! isStart)
-        actualGroups.push(rangeToHtml(rng));
-    });
-    test.equal(actualGroups.join(','), groups.join(','));
-
-    f.hold();
-    Meteor.flush();
-    test.equal(onlives.length, groups.length);
-    var uniqueOnlives = _.uniq(onlives);
-    test.equal(uniqueOnlives.length, onlives.length);
-    test.equal(ondeads.length, 0);
-    //f.release(); XXXX
-    Meteor.ui._doc.cleanNodes(f.node());
-
-    var numRanges = onlives.length;
-    onlives.length = 0;
-    Meteor.flush();
-    test.equal(onlives.length, 0);
-    test.equal(ondeads.length, numRanges);
-  };
-
-  doTest(function(A) { return "<p>Hello</p>"; });
-  doTest(function(A) { return "<td>Hello</td><td>World</td>"; });
-  doTest(function(A) { return "<td>"+A("Hello")+"</td>"; });
-  doTest(function(A) { return A("<td>"+A("Hello")+"</td>"); });
-  doTest(function(A) { return A(A(A(A(A(A("foo")))))); });
-  doTest(
-    function(A) { return "<div>Yo"+A("<p>Hello "+A(A("World")),"<p>Hello World</p>")+
-                  "</div>"; });
-  doTest(function(A) {
-    return A("<ul>"+A("<li>one","<li>one</li>")+
-             A("<li>two","<li>two</li>")+
-             A("<li>three","<li>three</li>"),
-             "<ul><li>one</li><li>two</li><li>three</li></ul>"); });
-
-  doTest(function(A) {
-    return A("<table>"+A("<tr>"+A("<td>"+A("Hi")+"</td>")+"</tr>")+"</table>",
-             "<table><tbody><tr><td>Hi</td></tr></tbody></table>");
-  });
-
-  test.throws(function() {
-    doTest(function(A) {
-      var z = A("Hello");
-      return z+z;
-    });
-  });
-
-  doTest(function(A) {
-    return '<div foo="'+A('bar', 'bar', true)+'">Hello</div>';
-  });
-});
\ No newline at end of file
diff --git a/packages/liveui/liveui_tests.html b/packages/liveui/liveui_tests.html
deleted file mode 100644
index 5cc77f98d8..0000000000
--- a/packages/liveui/liveui_tests.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<template name="test_renderList_each">
-  Before{{render_count}}
-  {{#each data}}
-    {{name}}{{weather "here"}}
-  {{/each}}
-  Middle
-  {{#each data2}}
-    {{name}}
-  {{else}}
-    Else
-  {{/each}}
-  After
-</template>
diff --git a/packages/liveui/package.js b/packages/liveui/package.js
index fc9cf2c005..1bf98b8cbd 100644
--- a/packages/liveui/package.js
+++ b/packages/liveui/package.js
@@ -18,15 +18,3 @@ Package.on_use(function (api) {
   api.add_files(['liveui.js', 'patcher.js'],
                 'client');
 });
-
-Package.on_test(function (api) {
-  api.use(['tinytest', 'templating', 'htmljs']);
-  api.use(['liveui', 'test-helpers'], 'client');
-
-  api.add_files('form_responder.js', 'server');
-
-  api.add_files([
-    'livedocument_tests.js',
-    'liveui_tests.html'
-  ], 'client');
-});
diff --git a/packages/spark/package.js b/packages/spark/package.js
index b6edda0548..917e3a6267 100644
--- a/packages/spark/package.js
+++ b/packages/spark/package.js
@@ -27,6 +27,8 @@ Package.on_test(function (api) {
   api.use('tinytest');
   api.use(['spark', 'test-helpers'], 'client');
 
+  api.add_files('test_form_responder.js', 'server');
+
   api.add_files([
     'spark_tests.js',
     'patcher_tests.js'
diff --git a/packages/spark/spark_tests.js b/packages/spark/spark_tests.js
index d59d2724bd..14c4e58068 100644
--- a/packages/spark/spark_tests.js
+++ b/packages/spark/spark_tests.js
@@ -2358,7 +2358,7 @@ testAsyncMulti(
       hitlist.push(thing);
     };
 
-    var LIVEUI_TEST_RESPONDER = "/liveui_test_responder";
+    var LIVEUI_TEST_RESPONDER = "/spark_test_responder";
     var IFRAME_URL_1 = LIVEUI_TEST_RESPONDER + "/";
     var IFRAME_URL_2 = "about:blank"; // most cross-browser-compatible
     if (window.opera) // opera doesn't like 'about:blank' form target
@@ -2820,6 +2820,7 @@ Tinytest.add("spark - oldschool branch keys", function(test) {
   // duplicate branch keys; different order
 });
 
+
 // XXX these are old notes copied from liveui_tests.js:
 // TO TEST:
 // - chunk matching
diff --git a/packages/liveui/form_responder.js b/packages/spark/test_form_responder.js
similarity index 90%
rename from packages/liveui/form_responder.js
rename to packages/spark/test_form_responder.js
index 11785289e3..6c424d5264 100644
--- a/packages/liveui/form_responder.js
+++ b/packages/spark/test_form_responder.js
@@ -1,6 +1,6 @@
 (function () {
 
-var TEST_RESPONDER_ROUTE = "/liveui_test_responder";
+var TEST_RESPONDER_ROUTE = "/spark_test_responder";
 
 var respond = function(req, res) {