Make channel set lazy and invoke after run all.

(c) Copyright IBM Corp. 2016

Author: poplav

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"
   },

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

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

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')

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.
         })