From 7cb1e6f821ea4ad4c23a9d4e5b54dd46ec1d5b67 Mon Sep 17 00:00:00 2001
From: Sean Welleck <wellecks@gmail.com>
Date: Tue, 15 Dec 2015 10:48:01 -0600
Subject: [PATCH 1/7] System tests for Scala widgets. (c) Copyright IBM Corp.
 2016

---
 notebooks/tests/Walkthrough-Scala.ipynb | 400 ++++++++++++++++++++++++
 system-test/urth-system-test-specs.js   |  63 +++-
 system-test/utils/boilerplate.js        |  13 +-
 3 files changed, 470 insertions(+), 6 deletions(-)
 create mode 100644 notebooks/tests/Walkthrough-Scala.ipynb

diff --git a/notebooks/tests/Walkthrough-Scala.ipynb b/notebooks/tests/Walkthrough-Scala.ipynb
new file mode 100644
index 00000000..ffe1918f
--- /dev/null
+++ b/notebooks/tests/Walkthrough-Scala.ipynb
@@ -0,0 +1,400 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Declarative Widgets Walkthrough"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Introduction"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Built on top of [IPyWidgets](https://github.com/ipython/ipywidgets) and combined with [Polymer](https://www.polymer-project.org/1.0/) and [Web Components](http://webcomponents.org/), these widgets use a declarative syntax for creating interactive areas that are usable throughout a notebook."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Widgets"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "First we need to add, import, and initialize the widget system:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "// modify to IP and Port of this notebook server\n",
+    "%addjar http://192.168.99.100:9500/nbextensions/urth_widgets/urth-widgets.jar"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": true
+   },
+   "outputs": [],
+   "source": [
+    "import urth.widgets._\n",
+    "initWidgets"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Let's start by creating a \"Hello world\" function."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": true
+   },
+   "outputs": [],
+   "source": [
+    "def greet(name: String = \"world\") = s\"Hello ${name}!\""
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Next, we'll bind to this function and modify the name field to update our greeting."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "%%html\n",
+    "<template is=\"urth-core-bind\">\n",
+    "    <urth-core-function id=\"f\" ref=\"greet\" arg-name=\"{{name}}\" result=\"{{greeting}}\"></urth-core-function>\n",
+    "    <label>Name:</label> <input type=\"text\" value=\"{{name::change}}\"></input><br/>\n",
+    "</template> "
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Note how the default value is set based on the argument passed into the function. We pass the name of our function to the `ref` parameter, then explicitly set the arguments with the `arg-` prefix, and finally bind our output (`result`)."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "%%html\n",
+    "<template is=\"urth-core-bind\">\n",
+    "    <button onClick=\"f.invoke()\">invoke</button><br/>\n",
+    "    <span id=\"test1\">{{greeting}}</span>\n",
+    "</template> "
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Try changing the `Name` argument and clicking the button above to call the `greet` function. The resulting greeting updates based on the current `Name` field."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Click [here](../examples/urth-core-function.ipynb) to learn more about `<urth-core-function>`"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "We can also bind to variables over independent channels."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "%%html\n",
+    "<template is='urth-core-bind' channel='a'>\n",
+    "    <div>Hello <span id=\"test2\">{{user}}</span></div>\n",
+    "    Name: <input value='{{user::input}}'></input>\n",
+    "</template>"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "%%html\n",
+    "<template is='urth-core-bind' channel='b'>\n",
+    "    <div>Hello <span id=\"test3\">{{user}}</span></div>\n",
+    "    Name: <input value='{{user::input}}'></input>\n",
+    "</template>"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Try modifying the `user` defined in channel `a`. This change will not impact the user defined in channel `b`."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Now to something a bit more complex. What if you want to have Scala code that reacts to changes in a value on a template. Lets start with the template below:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "%%html\n",
+    "<template is='urth-core-bind' channel='c'>\n",
+    "    <div>Type something <input value='{{aSomething::input}}'></input></div>\n",
+    "</template>"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Now we can create a Scala function that will watch for changes to the value."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "import urth.widgets.WidgetChannels.channel\n",
+    "\n",
+    "val on_aSomething_change = (oldVal: Option[String], newVal: String) => {\n",
+    "    val msg = s\"Hello from on_aNumber_change! Got ${newVal}\"\n",
+    "    channel(\"c\").set(\"message\", msg)\n",
+    "}\n",
+    "    \n",
+    "channel(\"c\").watch(\"aSomething\", on_aSomething_change)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Lets create a template where we can set a message."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "%%html\n",
+    "<template is='urth-core-bind' channel='c'>\n",
+    "    <span id=\"test4\">{{message}}</span>\n",
+    "</template>"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Now when you type something on the input box, it triggers the Scala function `on_aSomething_change`. This function can then also set values on the channel by using the `set` method. Notice that the template with `{{message}}` is getting updated."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Click [here](../examples/urth-core-bind.ipynb) to learn more about `<urth-core-bind>`"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Support for Spark DataFrames is provided. Below is a DataFrame with some basic contact information."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": true
+   },
+   "outputs": [],
+   "source": [
+    "val sqlContext = new org.apache.spark.sql.SQLContext(sc)\n",
+    "import sqlContext.implicits._"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": true
+   },
+   "outputs": [],
+   "source": [
+    "case class Contact(name: String, email: String)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "val df = sqlContext.createDataFrame(Seq(\n",
+    "    Contact(\"Jane Doe\", \"jane@doe.com\"), \n",
+    "    Contact(\"John Doe\", \"john@doe.com\")))"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Below, we print out the contents of the DataFrame in a more readable format."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "%%html\n",
+    "<template is=\"urth-core-bind\">\n",
+    "    <urth-core-dataframe id=\"f3\" ref=\"df\" value=\"{{contact-info}}\" auto></urth-core-dataframe>\n",
+    "    <template is=\"dom-repeat\" items=\"{{contact-info.data}}\">\n",
+    "      <div class=\"info\">\n",
+    "            <span class=\"test5\">{{item.0}}</span>, <span>{{item.1}}</span>\n",
+    "      </div>\n",
+    "    </template>\n",
+    "</template>"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "By setting the `auto` keyword, the resulting output will update whenever the DataFrame is modified. Try changing which set of contact information is used."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "val df = sqlContext.createDataFrame(Seq(\n",
+    "        Contact(\"Richard Roe\", \"richard@roe.com\"),\n",
+    "        Contact(\"Bob Murphy\", \"bob@murphy.com\")))"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Click [here](../examples/urth-core-dataframe.ipynb) to learn more about `<urth-core-dataframe>`"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "We can also import web components. Below, we bring in the `paper-input` element from the [Polymer Catalog](https://elements.polymer-project.org/)."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "%%html\n",
+    "<link rel='import' href='urth_components/paper-input/paper-input.html' \n",
+    "        is='urth-core-import' package='PolymerElements/paper-input'>\n",
+    "<paper-input label=\"Input label\"></paper-input>"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Click [here](../examples/urth-core-import.ipynb) to learn more about `<urth-core-import>`"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Scala 2.10.4",
+   "language": "scala",
+   "name": "scala"
+  },
+  "language_info": {
+   "name": "scala"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 0
+}
diff --git a/system-test/urth-system-test-specs.js b/system-test/urth-system-test-specs.js
index 810e7b3e..d3f5bd34 100644
--- a/system-test/urth-system-test-specs.js
+++ b/system-test/urth-system-test-specs.js
@@ -5,7 +5,7 @@ var wd = require('wd');
 var Boilerplate = require('./utils/boilerplate');
 var boilerplate = new Boilerplate();
 
-describe('Widgets System Test', function() {
+describe('Widgets Python System Test', function() {
     boilerplate.setup(this.title, '/notebooks/tests/Walkthrough.ipynb');
 
     it('should not execute Urth.whenReady API until components have upgraded', function(done) {
@@ -86,3 +86,64 @@ describe('Widgets System Test', function() {
             .nodeify(done);
     });
 });
+
+describe('Widgets Scala System Test', function() {
+    boilerplate.setup(this.title, '/notebooks/tests/Walkthrough-Scala.ipynb');
+
+    var timeout = 30000;
+
+    it('should print the correct variable that is used for urth-core-function', function(done) {
+
+        boilerplate.browser
+            .elementsByCssSelector('div.code_cell').nth(5)
+            .elementByXPath('//button[text()="invoke"]').click()
+            .waitForElementById('test1', wd.asserters.textInclude('world'), timeout)
+            .nodeify(done);
+    });
+
+    it('should bind variable to channel a', function(done) {
+        boilerplate.browser
+            .elementsByCssSelector('div.code_cell').nth(6)
+            .elementByCssSelector('>', 'input')
+            .type('A')
+            .waitForElementById('test2', wd.asserters.textInclude('A'), timeout)
+            .nodeify(done);
+    });
+
+    it('should bind variable to channel b', function(done) {
+        boilerplate.browser
+            .elementsByCssSelector('div.code_cell').nth(7)
+            .elementByCssSelector('>', 'input')
+            .type('B')
+            .waitForElementById('test3', wd.asserters.textInclude('B'), timeout)
+            .nodeify(done);
+    });
+
+    it('should bind variables to channels independently', function(done) {
+        boilerplate.browser
+            .elementsByCssSelector('div.code_cell').nth(6)
+            .elementByCssSelector('>', 'input')
+            .type('2')
+            .elementByCssSelector('#test2')
+            .text().should.eventually.include('A2')
+            .waitForElementById('test2', wd.asserters.textInclude('A2'), timeout)
+            .waitForElementById('test3', wd.asserters.textInclude('B'), timeout)
+            .nodeify(done);
+    });
+
+    it('should watch for changes in a watched variable', function(done) {
+        boilerplate.browser
+            .elementsByCssSelector('div.code_cell').nth(8)
+            .elementByCssSelector('>', 'input')
+            .type('watched message')
+            .waitForElementById('test4', wd.asserters.textInclude('watched message'), timeout)
+            .nodeify(done);
+    });
+
+    it('should update output when DataFrame is modified and set to auto', function(done) {
+        boilerplate.browser
+            .elementsByCssSelector('div.code_cell').nth(14)
+            .waitForElementByClassName('test5', wd.asserters.textInclude('Richard Roe'), timeout)
+            .nodeify(done);
+    });
+});
diff --git a/system-test/utils/boilerplate.js b/system-test/utils/boilerplate.js
index 6d0440cd..12deb9b2 100644
--- a/system-test/utils/boilerplate.js
+++ b/system-test/utils/boilerplate.js
@@ -84,15 +84,18 @@ Boilerplate.prototype.setup = function(testName, startingURL){
     desired.name = testName ? 'Urth Widgets System Test - ' + testName
         : 'Urth Widgets System Test';
 
+    var kernelStartTimeout = 200000;
+    var defaultTimeout = 10000;
+    var runAllCompletionTime = 50000;
     this.browser.init(desired)
         .get(startingURL || '/')
-        .waitForElementByCssSelector('#kernel_indicator_icon.kernel_idle_icon', wd.asserters.isDisplayed, 10000)
-        .waitForElementByLinkText('Cell', wd.asserters.isDisplayed, 10000)
+        .waitForElementByCssSelector("#kernel_indicator_icon.kernel_idle_icon", wd.asserters.isDisplayed, kernelStartTimeout)
+        .waitForElementByLinkText("Cell", wd.asserters.isDisplayed, defaultTimeout)
         .safeExecute('localStorage.clear()')
-        .elementByLinkText('Cell')
+        .elementByLinkText("Cell")
         .click()
-        .waitForElementByLinkText('Run All', wd.asserters.isDisplayed, 10000)
-        .elementByLinkText('Run All')
+        .waitForElementByLinkText("Run All", wd.asserters.isDisplayed, defaultTimeout)
+        .elementByLinkText("Run All")
         .click()
         .eval('!!document.body.createShadowRoot', function(err, value) {
             this.browserSupportsShadowDOM = value;

From 3c2c56f5f6eb3c17aa2ec8478c3ddb4b703b29c6 Mon Sep 17 00:00:00 2001
From: peller <github@peller.org>
Date: Wed, 20 Jan 2016 23:48:38 -0500
Subject: [PATCH 2/7] Add custom asserter to setup to waitFor all output_areas
 before proceeding with tests use localhost:8888 for addjar

(c) Copyright IBM Corp. 2016
---
 notebooks/tests/Walkthrough-Scala.ipynb |  2 +-
 system-test/urth-system-test-specs.js   |  4 ++--
 system-test/urth-viz-table-specs.js     |  2 +-
 system-test/utils/boilerplate.js        | 25 +++++++++++++++++++++++--
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/notebooks/tests/Walkthrough-Scala.ipynb b/notebooks/tests/Walkthrough-Scala.ipynb
index ffe1918f..d20dee00 100644
--- a/notebooks/tests/Walkthrough-Scala.ipynb
+++ b/notebooks/tests/Walkthrough-Scala.ipynb
@@ -44,7 +44,7 @@
    "outputs": [],
    "source": [
     "// modify to IP and Port of this notebook server\n",
-    "%addjar http://192.168.99.100:9500/nbextensions/urth_widgets/urth-widgets.jar"
+    "%addjar http://localhost:8888/nbextensions/urth_widgets/urth-widgets.jar"
    ]
   },
   {
diff --git a/system-test/urth-system-test-specs.js b/system-test/urth-system-test-specs.js
index d3f5bd34..ce04af61 100644
--- a/system-test/urth-system-test-specs.js
+++ b/system-test/urth-system-test-specs.js
@@ -6,7 +6,7 @@ var Boilerplate = require('./utils/boilerplate');
 var boilerplate = new Boilerplate();
 
 describe('Widgets Python System Test', function() {
-    boilerplate.setup(this.title, '/notebooks/tests/Walkthrough.ipynb');
+    boilerplate.setup(this.title, '/notebooks/tests/Walkthrough.ipynb', 8);
 
     it('should not execute Urth.whenReady API until components have upgraded', function(done) {
         boilerplate.browser
@@ -88,7 +88,7 @@ describe('Widgets Python System Test', function() {
 });
 
 describe('Widgets Scala System Test', function() {
-    boilerplate.setup(this.title, '/notebooks/tests/Walkthrough-Scala.ipynb');
+    boilerplate.setup(this.title, '/notebooks/tests/Walkthrough-Scala.ipynb', 8);
 
     var timeout = 30000;
 
diff --git a/system-test/urth-viz-table-specs.js b/system-test/urth-viz-table-specs.js
index 2aabf7ac..02652a81 100644
--- a/system-test/urth-viz-table-specs.js
+++ b/system-test/urth-viz-table-specs.js
@@ -22,7 +22,7 @@ describe('Urth Viz Table Test', function() {
         .catch(tagChaiAssertionError);
     };
 
-    boilerplate.setup(this.title, '/notebooks/tests/urth-viz-table.ipynb');
+    boilerplate.setup(this.title, '/notebooks/tests/urth-viz-table.ipynb', 3);
 
     it('should run all cells and find a handsontable in the 3rd output area', function(done) {
         boilerplate.browser
diff --git a/system-test/utils/boilerplate.js b/system-test/utils/boilerplate.js
index 12deb9b2..2d6dabd2 100644
--- a/system-test/utils/boilerplate.js
+++ b/system-test/utils/boilerplate.js
@@ -18,6 +18,13 @@ chai.use(chaiAsPromised);
 chai.should();
 chaiAsPromised.transferPromiseness = wd.transferPromiseness;
 
+// tagging chai assertion errors for retry
+var tagChaiAssertionError = function(err) {
+    // throw error and tag as retriable to poll again
+    err.retriable = err instanceof chai.AssertionError;
+    throw err;
+};
+
 // Configure webdriver
 wd.configureHttp({
     timeout: 60000,
@@ -67,9 +74,21 @@ var Boilerplate = function(){
   * Setups the before and after calls for each of your tests. The boilerplate
   * will start each test on startingURL, which is a relative path to the resource to load.
   */
-Boilerplate.prototype.setup = function(testName, startingURL){
+Boilerplate.prototype.setup = function(testName, startingURL, outputCount){
   var that = this;
 
+  var outputAsserter = new wd.Asserter(
+    function(target) { // browser or el
+      return target
+        .elementsByCss('div.output_area').then(function(nodes) {
+            nodes.should.have.length(outputCount);
+            return target; // this will be returned by waitFor
+            // and ignored by waitForElement.
+        })
+        .catch(tagChaiAssertionError); // tag errors for retry in catch.
+    }
+  );
+
   before(function(done){
     if (args.verbose) {
         // optional logging
@@ -86,7 +105,7 @@ Boilerplate.prototype.setup = function(testName, startingURL){
 
     var kernelStartTimeout = 200000;
     var defaultTimeout = 10000;
-    var runAllCompletionTime = 50000;
+    var runAllCompletionTimeout = 50000;
     this.browser.init(desired)
         .get(startingURL || '/')
         .waitForElementByCssSelector("#kernel_indicator_icon.kernel_idle_icon", wd.asserters.isDisplayed, kernelStartTimeout)
@@ -105,6 +124,8 @@ Boilerplate.prototype.setup = function(testName, startingURL){
         .waitForConditionInBrowser('window.Urth && Urth.kernel && Urth.kernel.is_connected()', 10000)
         .waitForElementByCssSelector('#kernel_indicator_icon.kernel_idle_icon', wd.asserters.isDisplayed, 20000)
         .waitForConditionInBrowser('typeof Urth.whenReady === "function"', 10000)
+        .elementByCssSelector('div.code_cell .input').click() // to keep the first code cell in view on sauce
+        .waitFor(outputAsserter, runAllCompletionTimeout, 1000)
         .nodeify(done);
   }.bind(this));
 

From 7781cfca3f5dd83122115f3f5de283b0ac12e6dc Mon Sep 17 00:00:00 2001
From: peller <github@peller.org>
Date: Mon, 1 Feb 2016 11:24:55 -0500
Subject: [PATCH 3/7] relocated test to etc directory

(c) Copyright IBM Corp. 2016
---
 {notebooks => etc/notebooks}/tests/Walkthrough-Scala.ipynb | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {notebooks => etc/notebooks}/tests/Walkthrough-Scala.ipynb (100%)

diff --git a/notebooks/tests/Walkthrough-Scala.ipynb b/etc/notebooks/tests/Walkthrough-Scala.ipynb
similarity index 100%
rename from notebooks/tests/Walkthrough-Scala.ipynb
rename to etc/notebooks/tests/Walkthrough-Scala.ipynb

From 07807210a3b7306a3a6c9b11e41cb4913ad8b75a Mon Sep 17 00:00:00 2001
From: peller <github@peller.org>
Date: Tue, 2 Feb 2016 23:29:09 -0500
Subject: [PATCH 4/7] Remove '-' from polymer substitution to prevent JSON
 parse error

(c) Copyright IBM Corp. 2016
---
 etc/notebooks/tests/Walkthrough-Scala.ipynb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/notebooks/tests/Walkthrough-Scala.ipynb b/etc/notebooks/tests/Walkthrough-Scala.ipynb
index d20dee00..e21a0bd9 100644
--- a/etc/notebooks/tests/Walkthrough-Scala.ipynb
+++ b/etc/notebooks/tests/Walkthrough-Scala.ipynb
@@ -320,8 +320,8 @@
    "source": [
     "%%html\n",
     "<template is=\"urth-core-bind\">\n",
-    "    <urth-core-dataframe id=\"f3\" ref=\"df\" value=\"{{contact-info}}\" auto></urth-core-dataframe>\n",
-    "    <template is=\"dom-repeat\" items=\"{{contact-info.data}}\">\n",
+    "    <urth-core-dataframe id=\"f3\" ref=\"df\" value=\"{{contactInfo}}\" auto></urth-core-dataframe>\n",
+    "    <template is=\"dom-repeat\" items=\"{{contactInfo.data}}\">\n",
     "      <div class=\"info\">\n",
     "            <span class=\"test5\">{{item.0}}</span>, <span>{{item.1}}</span>\n",
     "      </div>\n",

From 10ce9b8641b74f2ef029bd6682301e734459414e Mon Sep 17 00:00:00 2001
From: Michael Poplavski <mikepop77@gmail.com>
Date: Wed, 6 Apr 2016 09:41:02 -0500
Subject: [PATCH 5/7] Make channel set lazy and invoke after run all.

(c) Copyright IBM Corp. 2016
---
 etc/notebooks/tests/Walkthrough-Scala.ipynb | 34 ++++++++++++++++++---
 system-test/urth-core-bind-specs.js         |  2 +-
 system-test/urth-r-widgets-specs.js         |  2 +-
 system-test/urth-system-test-specs.js       |  5 +--
 system-test/utils/boilerplate.js            |  5 +--
 5 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/etc/notebooks/tests/Walkthrough-Scala.ipynb b/etc/notebooks/tests/Walkthrough-Scala.ipynb
index e21a0bd9..fabbb6c9 100644
--- a/etc/notebooks/tests/Walkthrough-Scala.ipynb
+++ b/etc/notebooks/tests/Walkthrough-Scala.ipynb
@@ -220,9 +220,35 @@
     "val on_aSomething_change = (oldVal: Option[String], newVal: String) => {\n",
     "    val msg = s\"Hello from on_aNumber_change! Got ${newVal}\"\n",
     "    channel(\"c\").set(\"message\", msg)\n",
-    "}\n",
-    "    \n",
-    "channel(\"c\").watch(\"aSomething\", on_aSomething_change)"
+    "}"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "lazy val initChannelWatch = () => {\n",
+    "    channel(\"c\").watch(\"aSomething\", on_aSomething_change)\n",
+    "}"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "%%html\n",
+    "<template is='urth-core-bind'>\n",
+    "    <urth-core-function id='icw' ref='initChannelWatch'></urth-core-function>\n",
+    "    <button onClick='icw.invoke()'>initChannelWatch</button><br/>\n",
+    "</template>"
    ]
   },
   {
@@ -387,7 +413,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Scala 2.10.4",
+   "display_name": "Apache Toree (Scala 2.10.4)",
    "language": "scala",
    "name": "scala"
   },
diff --git a/system-test/urth-core-bind-specs.js b/system-test/urth-core-bind-specs.js
index 76c493af..c377c167 100644
--- a/system-test/urth-core-bind-specs.js
+++ b/system-test/urth-core-bind-specs.js
@@ -7,7 +7,7 @@ var boilerplate = new Boilerplate();
 
 describe('Urth Core Bind', function() {
 
-    boilerplate.setup(this.title, '/notebooks/tests/urth-core-bind.ipynb');
+    boilerplate.setup(this.title, '/notebooks/tests/urth-core-bind.ipynb', 3);
 
     it('should wait for dependency to load', function(done) {
         // Using a random number to protect against the possibility of a previous
diff --git a/system-test/urth-r-widgets-specs.js b/system-test/urth-r-widgets-specs.js
index a7628d09..e950ef10 100644
--- a/system-test/urth-r-widgets-specs.js
+++ b/system-test/urth-r-widgets-specs.js
@@ -6,7 +6,7 @@ var Boilerplate = require('./utils/boilerplate');
 var boilerplate = new Boilerplate();
 
 process.env.PYTHON != "python2" && describe('Widgets R System Test', function() {
-    boilerplate.setup(this.title, '/notebooks/tests/urth-r-widgets.ipynb');
+    boilerplate.setup(this.title, '/notebooks/tests/urth-r-widgets.ipynb', 7);
 
     it('should print the result of a Function Widget invocation', function(done) {
         boilerplate.browser
diff --git a/system-test/urth-system-test-specs.js b/system-test/urth-system-test-specs.js
index ce04af61..20f36ecb 100644
--- a/system-test/urth-system-test-specs.js
+++ b/system-test/urth-system-test-specs.js
@@ -87,8 +87,8 @@ describe('Widgets Python System Test', function() {
     });
 });
 
-describe('Widgets Scala System Test', function() {
-    boilerplate.setup(this.title, '/notebooks/tests/Walkthrough-Scala.ipynb', 8);
+process.env.PYTHON != "python2" && describe('Widgets Scala System Test', function() {
+    boilerplate.setup(this.title, '/notebooks/tests/Walkthrough-Scala.ipynb', 9);
 
     var timeout = 30000;
 
@@ -133,6 +133,7 @@ describe('Widgets Scala System Test', function() {
 
     it('should watch for changes in a watched variable', function(done) {
         boilerplate.browser
+            .elementByXPath('//button[text()="initChannelWatch"]').click()
             .elementsByCssSelector('div.code_cell').nth(8)
             .elementByCssSelector('>', 'input')
             .type('watched message')
diff --git a/system-test/utils/boilerplate.js b/system-test/utils/boilerplate.js
index 2d6dabd2..147e176c 100644
--- a/system-test/utils/boilerplate.js
+++ b/system-test/utils/boilerplate.js
@@ -80,8 +80,9 @@ Boilerplate.prototype.setup = function(testName, startingURL, outputCount){
   var outputAsserter = new wd.Asserter(
     function(target) { // browser or el
       return target
-        .elementsByCss('div.output_area').then(function(nodes) {
-            nodes.should.have.length(outputCount);
+        .elementsByCssSelector('div.output_area').then(function(nodes) {
+            console.log(nodes.length+"/"+outputCount)
+            nodes.should.have.length.above(outputCount-1);
             return target; // this will be returned by waitFor
             // and ignored by waitForElement.
         })

From eb6070b61dc3c81f2320b12f5d0b187caa241e67 Mon Sep 17 00:00:00 2001
From: Michael Poplavski <mikepop77@gmail.com>
Date: Tue, 26 Apr 2016 10:38:10 -0500
Subject: [PATCH 6/7] Run cells individually and not run all on initial
 bootstrap of notebook.

(c) Copyright IBM Corp. 2016
---
 etc/notebooks/tests/Walkthrough-Scala.ipynb |  6 +--
 package.json                                |  3 +-
 system-test/urth-system-test-specs.js       |  6 ++-
 system-test/utils/boilerplate.js            | 54 +++++++++++++++------
 4 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/etc/notebooks/tests/Walkthrough-Scala.ipynb b/etc/notebooks/tests/Walkthrough-Scala.ipynb
index fabbb6c9..524b5c1b 100644
--- a/etc/notebooks/tests/Walkthrough-Scala.ipynb
+++ b/etc/notebooks/tests/Walkthrough-Scala.ipynb
@@ -413,9 +413,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Apache Toree (Scala 2.10.4)",
-   "language": "scala",
-   "name": "scala"
+   "display_name": "Apache_Toree",
+   "language": "",
+   "name": "apache_toree"
   },
   "language_info": {
    "name": "scala"
diff --git a/package.json b/package.json
index 037c91fe..4aef09ec 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "minimist": "latest",
     "selenium-standalone": "latest",
     "web-component-tester": "^4",
-    "vulcanize": "1.14.8"
+    "vulcanize": "1.14.8",
+    "bluebird" : "3.3.5"
   },
   "config": {},
   "scripts": {
diff --git a/system-test/urth-system-test-specs.js b/system-test/urth-system-test-specs.js
index 20f36ecb..29c45035 100644
--- a/system-test/urth-system-test-specs.js
+++ b/system-test/urth-system-test-specs.js
@@ -6,7 +6,7 @@ var Boilerplate = require('./utils/boilerplate');
 var boilerplate = new Boilerplate();
 
 describe('Widgets Python System Test', function() {
-    boilerplate.setup(this.title, '/notebooks/tests/Walkthrough.ipynb', 8);
+    boilerplate.setup(this.title, '/notebooks/tests/Walkthrough.ipynb', 10);
 
     it('should not execute Urth.whenReady API until components have upgraded', function(done) {
         boilerplate.browser
@@ -61,6 +61,8 @@ describe('Widgets Python System Test', function() {
             .type(boilerplate.SPECIAL_KEYS.Enter) // Needed for IE
             .type('watched message')
             .waitForElementById('test4', wd.asserters.textInclude('watched message'), 10000)
+            .elementsByCssSelector('div.output_area').nth(7)
+            .click()
             .nodeify(done);
     });
 
@@ -88,7 +90,7 @@ describe('Widgets Python System Test', function() {
 });
 
 process.env.PYTHON != "python2" && describe('Widgets Scala System Test', function() {
-    boilerplate.setup(this.title, '/notebooks/tests/Walkthrough-Scala.ipynb', 9);
+    boilerplate.setup(this.title, '/notebooks/tests/Walkthrough-Scala.ipynb', 10);
 
     var timeout = 30000;
 
diff --git a/system-test/utils/boilerplate.js b/system-test/utils/boilerplate.js
index 147e176c..bfcd746c 100644
--- a/system-test/utils/boilerplate.js
+++ b/system-test/utils/boilerplate.js
@@ -1,6 +1,6 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
-
+var Promise = require('bluebird');
 var wd = require('wd');
 require('colors');
 var chai = require('chai');
@@ -81,7 +81,7 @@ Boilerplate.prototype.setup = function(testName, startingURL, outputCount){
     function(target) { // browser or el
       return target
         .elementsByCssSelector('div.output_area').then(function(nodes) {
-            console.log(nodes.length+"/"+outputCount)
+            console.log("output areas visible: ", nodes.length, "/", outputCount)
             nodes.should.have.length.above(outputCount-1);
             return target; // this will be returned by waitFor
             // and ignored by waitForElement.
@@ -107,26 +107,48 @@ Boilerplate.prototype.setup = function(testName, startingURL, outputCount){
     var kernelStartTimeout = 200000;
     var defaultTimeout = 10000;
     var runAllCompletionTimeout = 50000;
+
+    function clickTheElement(element) {
+        return new Promise(function(resolve) {
+            var newElement = element.click()
+                      .elementByLinkText("<", "Cell")
+                      .click()
+                      .waitForElementByLinkText("Run Cells", wd.asserters.isDisplayed, 10000)
+                      .elementByLinkText("Run Cells")
+                      .click()
+                      .sleep(5000);
+            resolve(newElement);
+        });
+    }
+
+    function runAllCells(elements, idx) {
+        if (idx > elements.length - 1) {
+            return;
+        }
+
+        var element = elements[idx];
+        clickTheElement(element).then(function(elem) {
+            console.log("running cell: ", idx);
+            runAllCells(elements, idx+1);
+        })
+    }
+
     this.browser.init(desired)
         .get(startingURL || '/')
         .waitForElementByCssSelector("#kernel_indicator_icon.kernel_idle_icon", wd.asserters.isDisplayed, kernelStartTimeout)
-        .waitForElementByLinkText("Cell", wd.asserters.isDisplayed, defaultTimeout)
         .safeExecute('localStorage.clear()')
-        .elementByLinkText("Cell")
-        .click()
-        .waitForElementByLinkText("Run All", wd.asserters.isDisplayed, defaultTimeout)
-        .elementByLinkText("Run All")
-        .click()
-        .eval('!!document.body.createShadowRoot', function(err, value) {
+        .waitForElementByCssSelector('div.output_area', wd.asserters.isDisplayed, defaultTimeout)
+        .setAsyncScriptTimeout(15000)
+        .waitForConditionInBrowser('window.Urth && Urth.kernel && Urth.kernel.is_connected()', defaultTimeout)
+        .waitForElementByCssSelector('#kernel_indicator_icon.kernel_idle_icon', wd.asserters.isDisplayed, kernelStartTimeout)
+        .waitForConditionInBrowser('typeof Urth.whenReady === "function"', kernelStartTimeout)
+        .elementsByCssSelector('div.input').then(function (elements) {
+            runAllCells(elements, 0);
+        })
+        .waitFor(outputAsserter, runAllCompletionTimeout*5, defaultTimeout)
+        .eval("!!document.body.createShadowRoot", function(err, value) {
             this.browserSupportsShadowDOM = value;
         }.bind(this))
-        .waitForElementByCssSelector('div.output_area', wd.asserters.isDisplayed, 10000)
-        .setAsyncScriptTimeout(15000)
-        .waitForConditionInBrowser('window.Urth && Urth.kernel && Urth.kernel.is_connected()', 10000)
-        .waitForElementByCssSelector('#kernel_indicator_icon.kernel_idle_icon', wd.asserters.isDisplayed, 20000)
-        .waitForConditionInBrowser('typeof Urth.whenReady === "function"', 10000)
-        .elementByCssSelector('div.code_cell .input').click() // to keep the first code cell in view on sauce
-        .waitFor(outputAsserter, runAllCompletionTimeout, 1000)
         .nodeify(done);
   }.bind(this));
 

From 516ec4062b625b89bb0885cbe6c1b46f0b9d43c9 Mon Sep 17 00:00:00 2001
From: Michael Poplavski <mikepop77@gmail.com>
Date: Wed, 27 Apr 2016 10:47:33 -0500
Subject: [PATCH 7/7] Run Scala/R only in chrome & run all cells with output
 count asserter

(c) Copyright IBM Corp. 2016
---
 Makefile                                    | 18 +++++-
 etc/notebooks/tests/Walkthrough-Scala.ipynb |  4 +-
 system-test/urth-core-bind-specs.js         |  2 +-
 system-test/urth-r-widgets-specs.js         |  2 +-
 system-test/urth-scala-widgets-specs.js     | 68 +++++++++++++++++++++
 system-test/urth-system-test-specs.js       | 63 +------------------
 system-test/urth-viz-table-specs.js         |  2 +-
 system-test/utils/boilerplate.js            | 54 +++++-----------
 8 files changed, 103 insertions(+), 110 deletions(-)
 create mode 100644 system-test/urth-scala-widgets-specs.js

diff --git a/Makefile b/Makefile
index a1fe55cf..8ece5d0a 100644
--- a/Makefile
+++ b/Makefile
@@ -41,9 +41,11 @@ BROWSER_LIST?=chrome
 ALT_BROWSER_LIST?=chrome
 BASEURL?=http://192.168.99.100:9500
 TEST_TYPE?=local
-SPECS?=system-test/*-specs.js
+SPECS?=system-test/urth-system-test-specs.js system-test/urth-core-bind-specs.js system-test/urth-viz-table-specs.js
 PYTHON2_SPECS?=system-test/urth-system-test-specs.js
-ALT_JUPYTER_SPECS?=system-test/urth-system-test-specs.js system-test/urth-r-widgets-specs.js
+ALT_JUPYTER_SPECS?=system-test/urth-system-test-specs.js
+R_SPECS?=system-test/urth-r-widgets-specs.js
+SCALA_SPECS?=system-test/urth-scala-widgets-specs.js
 ALT_JUPYTER_VERSION?=4.2
 PYTHON?=python3
 TEST_MSG?="Starting system tests"
@@ -394,7 +396,17 @@ system-test-alt-jupyter: TEST_MSG="Starting system tests for Jupyter $(ALT_JUPYT
 system-test-alt-jupyter:
 	@TEST_MSG=$(TEST_MSG) TEST_TYPE=$(TEST_TYPE) BROWSER_LIST="$(ALT_BROWSER_LIST)" JUPYTER=$(JUPYTER) SPECS="$(SPECS)" BASEURL=$(BASEURL) $(MAKE) run-test
 
-system-test-all: system-test-python3 system-test-python2 system-test-alt-jupyter
+system-test-scala: SPECS:=$(SCALA_SPECS)
+system-test-scala: TEST_MSG="Starting system tests for Scala"
+system-test-scala:
+	@TEST_MSG=$(TEST_MSG) TEST_TYPE=$(TEST_TYPE) BROWSER_LIST="$(ALT_BROWSER_LIST)" JUPYTER=$(JUPYTER) SPECS="$(SPECS)" BASEURL=$(BASEURL) $(MAKE) run-test
+
+system-test-r: SPECS:=$(R_SPECS)
+system-test-r: TEST_MSG="Starting system tests for R"
+system-test-r:
+	@TEST_MSG=$(TEST_MSG) TEST_TYPE=$(TEST_TYPE) BROWSER_LIST="$(ALT_BROWSER_LIST)" JUPYTER=$(JUPYTER) SPECS="$(SPECS)" BASEURL=$(BASEURL) $(MAKE) run-test
+
+system-test-all: system-test-python3 system-test-python2 system-test-alt-jupyter system-test-scala system-test-r
 
 start-selenium: node_modules stop-selenium
 	@echo "Installing and starting Selenium Server..."
diff --git a/etc/notebooks/tests/Walkthrough-Scala.ipynb b/etc/notebooks/tests/Walkthrough-Scala.ipynb
index 524b5c1b..38b857ee 100644
--- a/etc/notebooks/tests/Walkthrough-Scala.ipynb
+++ b/etc/notebooks/tests/Walkthrough-Scala.ipynb
@@ -44,14 +44,14 @@
    "outputs": [],
    "source": [
     "// modify to IP and Port of this notebook server\n",
-    "%addjar http://localhost:8888/nbextensions/urth_widgets/urth-widgets.jar"
+    "%addjar http://localhost:8888/nbextensions/declarativewidgets/urth-widgets.jar"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": true
+    "collapsed": false
    },
    "outputs": [],
    "source": [
diff --git a/system-test/urth-core-bind-specs.js b/system-test/urth-core-bind-specs.js
index c377c167..2863344a 100644
--- a/system-test/urth-core-bind-specs.js
+++ b/system-test/urth-core-bind-specs.js
@@ -7,7 +7,7 @@ var boilerplate = new Boilerplate();
 
 describe('Urth Core Bind', function() {
 
-    boilerplate.setup(this.title, '/notebooks/tests/urth-core-bind.ipynb', 3);
+    boilerplate.setup(this.title, '/notebooks/tests/urth-core-bind.ipynb', 4);
 
     it('should wait for dependency to load', function(done) {
         // Using a random number to protect against the possibility of a previous
diff --git a/system-test/urth-r-widgets-specs.js b/system-test/urth-r-widgets-specs.js
index e950ef10..44e1f608 100644
--- a/system-test/urth-r-widgets-specs.js
+++ b/system-test/urth-r-widgets-specs.js
@@ -6,7 +6,7 @@ var Boilerplate = require('./utils/boilerplate');
 var boilerplate = new Boilerplate();
 
 process.env.PYTHON != "python2" && describe('Widgets R System Test', function() {
-    boilerplate.setup(this.title, '/notebooks/tests/urth-r-widgets.ipynb', 7);
+    boilerplate.setup(this.title, '/notebooks/tests/urth-r-widgets.ipynb', 8);
 
     it('should print the result of a Function Widget invocation', function(done) {
         boilerplate.browser
diff --git a/system-test/urth-scala-widgets-specs.js b/system-test/urth-scala-widgets-specs.js
new file mode 100644
index 00000000..804c853c
--- /dev/null
+++ b/system-test/urth-scala-widgets-specs.js
@@ -0,0 +1,68 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+var wd = require('wd');
+var Boilerplate = require('./utils/boilerplate');
+var boilerplate = new Boilerplate();
+
+process.env.PYTHON != "python2" && describe('Widgets Scala System Test', function() {
+    boilerplate.setup(this.title, '/notebooks/tests/Walkthrough-Scala.ipynb', 11);
+
+    var timeout = 30000;
+
+    it('should print the correct variable that is used for urth-core-function', function(done) {
+
+        boilerplate.browser
+            .elementsByCssSelector('div.code_cell').nth(5)
+            .elementByXPath('//button[text()="invoke"]').click()
+            .waitForElementById('test1', wd.asserters.textInclude('world'), timeout)
+            .nodeify(done);
+    });
+
+    it('should bind variable to channel a', function(done) {
+        boilerplate.browser
+            .elementsByCssSelector('div.code_cell').nth(6)
+            .elementByCssSelector('>', 'input')
+            .type('A')
+            .waitForElementById('test2', wd.asserters.textInclude('A'), timeout)
+            .nodeify(done);
+    });
+
+    it('should bind variable to channel b', function(done) {
+        boilerplate.browser
+            .elementsByCssSelector('div.code_cell').nth(7)
+            .elementByCssSelector('>', 'input')
+            .type('B')
+            .waitForElementById('test3', wd.asserters.textInclude('B'), timeout)
+            .nodeify(done);
+    });
+
+    it('should bind variables to channels independently', function(done) {
+        boilerplate.browser
+            .elementsByCssSelector('div.code_cell').nth(6)
+            .elementByCssSelector('>', 'input')
+            .type('2')
+            .elementByCssSelector('#test2')
+            .text().should.eventually.include('A2')
+            .waitForElementById('test2', wd.asserters.textInclude('A2'), timeout)
+            .waitForElementById('test3', wd.asserters.textInclude('B'), timeout)
+            .nodeify(done);
+    });
+
+    it('should watch for changes in a watched variable', function(done) {
+        boilerplate.browser
+            .elementByXPath('//button[text()="initChannelWatch"]').click()
+            .elementsByCssSelector('div.code_cell').nth(8)
+            .elementByCssSelector('>', 'input')
+            .type('watched message')
+            .waitForElementById('test4', wd.asserters.textInclude('watched message'), timeout)
+            .nodeify(done);
+    });
+
+    it('should update output when DataFrame is modified and set to auto', function(done) {
+        boilerplate.browser
+            .elementsByCssSelector('div.code_cell').nth(14)
+            .waitForElementByClassName('test5', wd.asserters.textInclude('Richard Roe'), timeout)
+            .nodeify(done);
+    });
+});
\ No newline at end of file
diff --git a/system-test/urth-system-test-specs.js b/system-test/urth-system-test-specs.js
index 29c45035..fdec215a 100644
--- a/system-test/urth-system-test-specs.js
+++ b/system-test/urth-system-test-specs.js
@@ -6,7 +6,7 @@ var Boilerplate = require('./utils/boilerplate');
 var boilerplate = new Boilerplate();
 
 describe('Widgets Python System Test', function() {
-    boilerplate.setup(this.title, '/notebooks/tests/Walkthrough.ipynb', 10);
+    boilerplate.setup(this.title, '/notebooks/tests/Walkthrough.ipynb', 13);
 
     it('should not execute Urth.whenReady API until components have upgraded', function(done) {
         boilerplate.browser
@@ -89,64 +89,3 @@ describe('Widgets Python System Test', function() {
     });
 });
 
-process.env.PYTHON != "python2" && describe('Widgets Scala System Test', function() {
-    boilerplate.setup(this.title, '/notebooks/tests/Walkthrough-Scala.ipynb', 10);
-
-    var timeout = 30000;
-
-    it('should print the correct variable that is used for urth-core-function', function(done) {
-
-        boilerplate.browser
-            .elementsByCssSelector('div.code_cell').nth(5)
-            .elementByXPath('//button[text()="invoke"]').click()
-            .waitForElementById('test1', wd.asserters.textInclude('world'), timeout)
-            .nodeify(done);
-    });
-
-    it('should bind variable to channel a', function(done) {
-        boilerplate.browser
-            .elementsByCssSelector('div.code_cell').nth(6)
-            .elementByCssSelector('>', 'input')
-            .type('A')
-            .waitForElementById('test2', wd.asserters.textInclude('A'), timeout)
-            .nodeify(done);
-    });
-
-    it('should bind variable to channel b', function(done) {
-        boilerplate.browser
-            .elementsByCssSelector('div.code_cell').nth(7)
-            .elementByCssSelector('>', 'input')
-            .type('B')
-            .waitForElementById('test3', wd.asserters.textInclude('B'), timeout)
-            .nodeify(done);
-    });
-
-    it('should bind variables to channels independently', function(done) {
-        boilerplate.browser
-            .elementsByCssSelector('div.code_cell').nth(6)
-            .elementByCssSelector('>', 'input')
-            .type('2')
-            .elementByCssSelector('#test2')
-            .text().should.eventually.include('A2')
-            .waitForElementById('test2', wd.asserters.textInclude('A2'), timeout)
-            .waitForElementById('test3', wd.asserters.textInclude('B'), timeout)
-            .nodeify(done);
-    });
-
-    it('should watch for changes in a watched variable', function(done) {
-        boilerplate.browser
-            .elementByXPath('//button[text()="initChannelWatch"]').click()
-            .elementsByCssSelector('div.code_cell').nth(8)
-            .elementByCssSelector('>', 'input')
-            .type('watched message')
-            .waitForElementById('test4', wd.asserters.textInclude('watched message'), timeout)
-            .nodeify(done);
-    });
-
-    it('should update output when DataFrame is modified and set to auto', function(done) {
-        boilerplate.browser
-            .elementsByCssSelector('div.code_cell').nth(14)
-            .waitForElementByClassName('test5', wd.asserters.textInclude('Richard Roe'), timeout)
-            .nodeify(done);
-    });
-});
diff --git a/system-test/urth-viz-table-specs.js b/system-test/urth-viz-table-specs.js
index 02652a81..da773944 100644
--- a/system-test/urth-viz-table-specs.js
+++ b/system-test/urth-viz-table-specs.js
@@ -22,7 +22,7 @@ describe('Urth Viz Table Test', function() {
         .catch(tagChaiAssertionError);
     };
 
-    boilerplate.setup(this.title, '/notebooks/tests/urth-viz-table.ipynb', 3);
+    boilerplate.setup(this.title, '/notebooks/tests/urth-viz-table.ipynb', 4);
 
     it('should run all cells and find a handsontable in the 3rd output area', function(done) {
         boilerplate.browser
diff --git a/system-test/utils/boilerplate.js b/system-test/utils/boilerplate.js
index bfcd746c..f5ffabf9 100644
--- a/system-test/utils/boilerplate.js
+++ b/system-test/utils/boilerplate.js
@@ -104,51 +104,25 @@ Boilerplate.prototype.setup = function(testName, startingURL, outputCount){
     desired.name = testName ? 'Urth Widgets System Test - ' + testName
         : 'Urth Widgets System Test';
 
-    var kernelStartTimeout = 200000;
-    var defaultTimeout = 10000;
-    var runAllCompletionTimeout = 50000;
-
-    function clickTheElement(element) {
-        return new Promise(function(resolve) {
-            var newElement = element.click()
-                      .elementByLinkText("<", "Cell")
-                      .click()
-                      .waitForElementByLinkText("Run Cells", wd.asserters.isDisplayed, 10000)
-                      .elementByLinkText("Run Cells")
-                      .click()
-                      .sleep(5000);
-            resolve(newElement);
-        });
-    }
-
-    function runAllCells(elements, idx) {
-        if (idx > elements.length - 1) {
-            return;
-        }
-
-        var element = elements[idx];
-        clickTheElement(element).then(function(elem) {
-            console.log("running cell: ", idx);
-            runAllCells(elements, idx+1);
-        })
-    }
-
     this.browser.init(desired)
         .get(startingURL || '/')
-        .waitForElementByCssSelector("#kernel_indicator_icon.kernel_idle_icon", wd.asserters.isDisplayed, kernelStartTimeout)
+        .waitForElementByCssSelector('#kernel_indicator_icon.kernel_idle_icon', wd.asserters.isDisplayed, 80000)
+        .waitForElementByLinkText('Cell', wd.asserters.isDisplayed, 10000)
         .safeExecute('localStorage.clear()')
-        .waitForElementByCssSelector('div.output_area', wd.asserters.isDisplayed, defaultTimeout)
-        .setAsyncScriptTimeout(15000)
-        .waitForConditionInBrowser('window.Urth && Urth.kernel && Urth.kernel.is_connected()', defaultTimeout)
-        .waitForElementByCssSelector('#kernel_indicator_icon.kernel_idle_icon', wd.asserters.isDisplayed, kernelStartTimeout)
-        .waitForConditionInBrowser('typeof Urth.whenReady === "function"', kernelStartTimeout)
-        .elementsByCssSelector('div.input').then(function (elements) {
-            runAllCells(elements, 0);
-        })
-        .waitFor(outputAsserter, runAllCompletionTimeout*5, defaultTimeout)
-        .eval("!!document.body.createShadowRoot", function(err, value) {
+        .elementByLinkText('Cell')
+        .click()
+        .waitForElementByLinkText('Run All', wd.asserters.isDisplayed, 10000)
+        .elementByLinkText('Run All')
+        .click()
+        .eval('!!document.body.createShadowRoot', function(err, value) {
             this.browserSupportsShadowDOM = value;
         }.bind(this))
+        .waitForElementByCssSelector('div.output_area', wd.asserters.isDisplayed, 10000)
+        .setAsyncScriptTimeout(15000)
+        .waitForConditionInBrowser('window.Urth && Urth.kernel && Urth.kernel.is_connected()', 10000)
+        .waitForElementByCssSelector('#kernel_indicator_icon.kernel_idle_icon', wd.asserters.isDisplayed, 20000)
+        .waitForConditionInBrowser('typeof Urth.whenReady === "function"', 10000)
+        .waitFor(outputAsserter, 250000, 1000)
         .nodeify(done);
   }.bind(this));