From 908b9521c5a059a0f19142581140b56f6be1e04c 2014-02-10 22:50:49 From: Jonathan Frederic Date: 2014-02-10 22:50:49 Subject: [PATCH] Added test that shows the problem. --- diff --git a/IPython/html/tests/widgets/widget.js b/IPython/html/tests/widgets/widget.js index db26f99..06623d8 100644 --- a/IPython/html/tests/widgets/widget.js +++ b/IPython/html/tests/widgets/widget.js @@ -8,13 +8,14 @@ var recursive_compare = function(a, b) { if (same) { if (a instanceof Object) { - for (var key in a) { + var key; + for (key in a) { if (a.hasOwnProperty(key) && !recursive_compare(a[key], b[key])) { same = false; break; } } - for (var key in b) { + for (key in b) { if (b.hasOwnProperty(key) && !recursive_compare(a[key], b[key])) { same = false; break; @@ -26,7 +27,7 @@ var recursive_compare = function(a, b) { } return same; -} +}; // Test the widget framework. casper.notebook_test(function () { @@ -58,7 +59,6 @@ casper.notebook_test(function () { var output = that.evaluate(function(input) { var model = new IPython.WidgetModel(IPython.notebook.kernel.widget_manager, undefined); var results = model._pack_models(input); - delete model; return results; }, {input: input}); that.test.assert(recursive_compare(input, output), @@ -68,7 +68,6 @@ casper.notebook_test(function () { var output = that.evaluate(function(input) { var model = new IPython.WidgetModel(IPython.notebook.kernel.widget_manager, undefined); var results = model._unpack_models(input); - delete model; return results; }, {input: input}); that.test.assert(recursive_compare(input, output), @@ -79,15 +78,53 @@ casper.notebook_test(function () { test_unpack(input); }; - test_packing({0: 'hi', 1: 'bye'}) - test_packing(['hi', 'bye']) - test_packing(['hi', 5]) - test_packing(['hi', '5']) - test_packing([1.0, 0]) - test_packing([1.0, false]) - test_packing([1, false]) - test_packing([1, false, {a: 'hi'}]) - test_packing([1, false, ['hi']]) + test_packing({0: 'hi', 1: 'bye'}); + test_packing(['hi', 'bye']); + test_packing(['hi', 5]); + test_packing(['hi', '5']); + test_packing([1.0, 0]); + test_packing([1.0, false]); + test_packing([1, false]); + test_packing([1, false, {a: 'hi'}]); + test_packing([1, false, ['hi']]); + + // Test multi-set, single touch code. First create a custom widget. + this.evaluate(function() { + var MultiSetView = IPython.DOMWidgetView.extend({ + render: function(){ + this.model.set('a', 1); + this.model.set('b', 2); + this.model.set('c', 3); + this.touch(); + }, + }); + WidgetManager.register_widget_view('MultiSetView', MultiSetView); + }, {}); + }); + + // Try creating the multiset widget, verify that sets the values correctly. + var multiset = {}; + multiset.index = this.append_cell( + 'from IPython.utils.traitlets import Unicode, CInt\n' + + 'class MultiSetWidget(widgets.Widget):\n' + + ' _view_name = Unicode("MultiSetView", sync=True)\n' + + ' a = CInt(0, sync=True)\n' + + ' b = CInt(0, sync=True)\n' + + ' c = CInt(0, sync=True)\n' + + 'multiset = MultiSetWidget()\n' + + 'display(multiset)\n' + + 'print(multiset.model_id)'); + this.execute_cell_then(multiset.index, function(index) { + multiset.model_id = this.get_output_cell(index).text.trim(); + }); + + this.wait_for_widget(multiset); + + index = this.append_cell( + 'print("%d%d%d" % (multiset.a, multiset.b, multiset.c))'); + this.execute_cell_then(index, function(index) { + this.test.assertEquals(this.get_output_cell(index).text.trim(), '123', + 'Multiple model.set calls and one view.touch update state in back-end.'); }); var textbox = {};