From a1b530e28b54714ecdbef70420415865509dabc8 Mon Sep 17 00:00:00 2001 From: "Jessica B. Hamrick" Date: Thu, 29 Oct 2015 12:06:25 -0700 Subject: [PATCH] Fix tests --- notebook/tests/notebook/marks.js | 33 ++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/notebook/tests/notebook/marks.js b/notebook/tests/notebook/marks.js index bb7dc4dc6..a59823491 100644 --- a/notebook/tests/notebook/marks.js +++ b/notebook/tests/notebook/marks.js @@ -13,10 +13,19 @@ casper.notebook_test(function () { index = this.append_cell(c); this.then(function () { + var selectedIndex = this.evaluate(function () { + Jupyter.notebook.select(0); + return Jupyter.notebook.get_selected_index(); + }); + this.test.assertEquals(this.evaluate(function() { return Jupyter.notebook.get_marked_cells().length; - }), 0, 'no cells are marked programmatically'); - + }), 1, 'only one cell is marked programmatically'); + + this.test.assertEquals(this.evaluate(function() { + return Jupyter.notebook.get_marked_indices()[0]; + }), selectedIndex, 'marked cell is selected cell'); + this.test.assertEquals(this.evaluate(function() { return $('.cell.marked').length; }), 0, 'no cells are marked visibily'); @@ -43,14 +52,22 @@ casper.notebook_test(function () { this.test.assertEquals(this.evaluate(function() { return Jupyter.notebook.get_marked_cells().length; - }), 0, 'unmark_all'); - + }), 1, 'unmark_all'); + + this.test.assertEquals(this.evaluate(function() { + return Jupyter.notebook.get_marked_indices()[0]; + }), selectedIndex, 'marked cell is selected cell'); + this.evaluate(function() { Jupyter.notebook.set_marked_indices([1]); }); - - this.test.assertEquals(this.evaluate(function() { - return Jupyter.notebook.get_marked_indices()[0]; - }), 1, 'get/set_marked_indices'); + + this.test.assertEquals(this.evaluate(function() { + return Jupyter.notebook.get_marked_cells().length; + }), 2, 'two cells are marked'); + + this.test.assertEquals(this.evaluate(function() { + return Jupyter.notebook.get_marked_indices(); + }), [selectedIndex, 1], 'get/set_marked_indices'); }); });