Merge pull request #4182 from AndresSan6/merge_selected_cells

Add test for JS function "merge_selected_cells" in test_merge_cells.py

Author: takluyver

notebook/tests/selenium/test_merge_cells.py

@@ -4,29 +4,31 @@ def test_merge_cells(notebook):
     # Add cells to notebook
     a = "foo = 5"
     b = "bar = 10"
-    c = "print(foo)"
-    d = "print(bar)"
+    c = "baz = 15"
+    d = "print(foo)"
+    e = "print(bar)"
+    f = "print(baz)"
     notebook.edit_cell(index=0, content=a)
-    notebook.append(b, c, d)
+    notebook.append(b, c, d, e, f)
 
-    # Before merging, there are 4 separate cells
-    assert notebook.get_cells_contents() == [a, b, c, d]
+    # Before merging, there are 6 separate cells
+    assert notebook.get_cells_contents() == [a, b, c, d, e, f]
 
     # Focus on the second cell and merge it with the cell above
     notebook.focus_cell(1)
     notebook.browser.execute_script("Jupyter.notebook.merge_cell_above();")
     merged_a_b = "%s\n\n%s" % (a, b)
-    assert notebook.get_cells_contents() == [merged_a_b, c, d]
+    assert notebook.get_cells_contents() == [merged_a_b, c, d, e, f]
 
     # Focus on the second cell and merge it with the cell below
     notebook.focus_cell(1)
     notebook.browser.execute_script("Jupyter.notebook.merge_cell_below();")
     merged_c_d = "%s\n\n%s" % (c, d)
-    assert notebook.get_cells_contents() == [merged_a_b, merged_c_d]
+    assert notebook.get_cells_contents() == [merged_a_b, merged_c_d, e, f]
 
-    # Merge everything down to a single cell
-    notebook.focus_cell(0)
-    notebook.browser.execute_script("Jupyter.notebook.merge_cell_below();")
-    merged_all = "%s\n\n%s" % (merged_a_b, merged_c_d)
+    # Merge everything down to a single cell with selected cells
+    notebook.select_cell_range(0,3)
+    notebook.browser.execute_script("Jupyter.notebook.merge_selected_cells();")
+    merged_all = "%s\n\n%s\n\n%s\n\n%s" % (merged_a_b, merged_c_d, e, f)
     assert notebook.get_cells_contents() == [merged_all]
 

notebook/tests/selenium/utils.py

@@ -121,7 +121,7 @@ def cells(self):
         
         """
         return self.browser.find_elements_by_class_name("cell")
-
+    
     @property
     def current_index(self):
         return self.index(self.current_cell)
@@ -151,6 +151,12 @@ def focus_cell(self, index=0):
         cell.click()
         self.to_command_mode()
         self.current_cell = cell
+    
+    def select_cell_range(self, initial_index=0, final_index=0):
+        self.focus_cell(initial_index)
+        self.to_command_mode()
+        for i in range(final_index - initial_index):
+            shift(self.browser, 'j')
 
     def find_and_replace(self, index=0, find_txt='', replace_txt=''):
         self.focus_cell(index)