From fe1d6a5a2e01856726120a9f77a13078b9539dc5 2014-02-03 06:40:33
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: 2014-02-03 06:40:33
Subject: [PATCH] Use wait_for_widget in widgets and string widget tests
---
diff --git a/IPython/html/tests/casperjs/test_cases/widgets.js b/IPython/html/tests/casperjs/test_cases/widgets.js
index c6bec92..9943dd4 100644
--- a/IPython/html/tests/casperjs/test_cases/widgets.js
+++ b/IPython/html/tests/casperjs/test_cases/widgets.js
@@ -23,6 +23,7 @@ casper.notebook_test(function () {
}), 'Notebook widget manager instantiated');
});
+ var textbox = {};
throttle_index = this.append_cell(
'import time\n' +
'textbox = widgets.TextWidget()\n' +
@@ -32,10 +33,9 @@ casper.notebook_test(function () {
' print(len(new))\n' +
' time.sleep(0.5)\n' +
'textbox.on_trait_change(handle_change, "value")\n' +
- 'print("Success")');
+ 'print(textbox.model_id)');
this.execute_cell_then(throttle_index, function(index){
- this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
- 'Test throttling cell executed with correct output');
+ textbox.model_id = this.get_output_cell(index).text.trim();
this.test.assert(this.cell_element_exists(index,
'.widget-area .widget-subarea'),
@@ -48,14 +48,9 @@ casper.notebook_test(function () {
this.sendKeys('.my-throttle-textbox', '....................');
});
- this.waitFor(function check() {
- var outputs = this.evaluate(function(i) {
- return IPython.notebook.get_cell(i).output_area.outputs;
- }, {i : throttle_index});
- var output = outputs[outputs.length-1].text.trim();
- return (output == '20');
-
- }, function then() {
+ this.wait_for_widget(textbox);
+
+ this.then(function () {
var outputs = this.evaluate(function(i) {
return IPython.notebook.get_cell(i).output_area.outputs;
}, {i : throttle_index});
diff --git a/IPython/html/tests/casperjs/test_cases/widgets_string.js b/IPython/html/tests/casperjs/test_cases/widgets_string.js
index a59c0a3..d5ffa07 100644
--- a/IPython/html/tests/casperjs/test_cases/widgets_string.js
+++ b/IPython/html/tests/casperjs/test_cases/widgets_string.js
@@ -38,13 +38,6 @@ casper.notebook_test(function () {
'.widget-area .widget-subarea .widget-hbox-single input[type=text]', 'val')=='xyz',
'Python set textbox value.');
- });
-
- this.wait(500); // Wait for change to execute in kernel
-
- index = this.append_cell('print(string_widget.value)');
- this.execute_cell_then(index, function(index){
-
this.test.assert(this.cell_element_exists(string_index,
'.widget-area .widget-subarea div span.MathJax_Preview'),
'MathJax parsed the LaTeX successfully.');