From ebef7bae4ca6d027502f27f4afa6543a47639961 Mon Sep 17 00:00:00 2001 From: M Pacer Date: Thu, 22 Mar 2018 17:46:06 -0700 Subject: [PATCH] create new_notebook classmethod creating/switching to new Notebook page --- notebook/tests/selenium/test_markdown.py | 13 +------------ notebook/tests/selenium/utils.py | 9 +++++++++ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/notebook/tests/selenium/test_markdown.py b/notebook/tests/selenium/test_markdown.py index 6c09d9cef0..c109bf7b5c 100644 --- a/notebook/tests/selenium/test_markdown.py +++ b/notebook/tests/selenium/test_markdown.py @@ -10,18 +10,7 @@ @pytest.fixture(scope='module') def notebook(authenticated_browser): - b = authenticated_browser - new_button = b.find_element_by_id('new-buttons') - new_button.click() - kernel_selector = '#kernel-python3 a' - kernel_list = wait_for_selector(b, kernel_selector) - kernel_list[0].click() - window_handle_list = b.window_handles - window_handle_list.remove(b.current_window_handle) - b.switch_to_window(window_handle_list[0]) - kernel_list = wait_for_selector(b, ".cell") - b.execute_script("Jupyter.notebook.set_autosave_interval(0)") - return Notebook(b) + return Notebook.new_notebook(authenticated_browser) def test_markdown_cell(notebook): diff --git a/notebook/tests/selenium/utils.py b/notebook/tests/selenium/utils.py index 9054f70194..07f1b1d74f 100644 --- a/notebook/tests/selenium/utils.py +++ b/notebook/tests/selenium/utils.py @@ -130,6 +130,15 @@ def add_markdown_cell(self, index=-1, content="", render=True): self.add_cell(index, cell_type="markdown") self.edit_cell(index=index, content=content, render=render) + + @classmethod + def new_notebook(cls, browser, kernel_name='kernel-python3'): + # initial_window_handles = browser.window_handles + with new_window(browser, selector=".cell"): + select_kernel(browser, kernel_name=kernel_name) + browser.execute_script("Jupyter.notebook.set_autosave_interval(0)") + return cls(browser) + def select_kernel(browser, kernel_name='kernel-python3'): """Clicks the "new" button and selects a kernel from the options.