mirror of
https://github.com/jupyter/notebook.git
synced 2025-01-24 12:05:22 +08:00
Make a notebook writable after successful save-as (#5296)
* add failing test for readonly notebook * test typing after save-as * make notebook writable after save-as fixes #1324 * fix failing test in travis
This commit is contained in:
parent
7563c54dfc
commit
b278fa67de
@ -2913,13 +2913,16 @@ define([
|
||||
'content': that.toJSON(),
|
||||
'name': nb_name
|
||||
};
|
||||
var start = new Date().getTime();
|
||||
return that.contents.save(nb_path, model)
|
||||
.then(function(data) {
|
||||
d.modal('hide');
|
||||
that.writable = true;
|
||||
that.notebook_name = data.name;
|
||||
that.notebook_path = data.path;
|
||||
that.session.rename_notebook(data.path);
|
||||
that.events.trigger('notebook_renamed.Notebook', data);
|
||||
that.save_notebook_success(start, data);
|
||||
}, function(error) {
|
||||
var msg = i18n.msg._(error.message || 'Unknown error saving notebook');
|
||||
$(".save-message").html(
|
||||
|
80
notebook/tests/selenium/test_save_readonly_as.py
Normal file
80
notebook/tests/selenium/test_save_readonly_as.py
Normal file
@ -0,0 +1,80 @@
|
||||
from notebook.tests.selenium.utils import wait_for_selector, Notebook
|
||||
from selenium.webdriver.common.keys import Keys
|
||||
from selenium.webdriver.support.ui import WebDriverWait
|
||||
|
||||
|
||||
promise_js = """
|
||||
var done = arguments[arguments.length - 1];
|
||||
(%s).then(
|
||||
data => { done(["success", data]); },
|
||||
error => { done(["error", error]); }
|
||||
);
|
||||
"""
|
||||
|
||||
def execute_promise(js, browser):
|
||||
state, data = browser.execute_async_script(promise_js % js)
|
||||
if state == 'success':
|
||||
return data
|
||||
raise Exception(data)
|
||||
|
||||
def wait_for_rename(browser, nbname, timeout=10):
|
||||
wait = WebDriverWait(browser, timeout)
|
||||
def notebook_renamed(browser):
|
||||
elem = browser.find_element_by_id('notebook_name')
|
||||
current_name = browser.execute_script('return arguments[0].innerText', elem)
|
||||
return current_name == nbname
|
||||
return wait.until(notebook_renamed)
|
||||
|
||||
def save_as(nb):
|
||||
JS = 'Jupyter.notebook.save_notebook_as()'
|
||||
return nb.browser.execute_script(JS)
|
||||
|
||||
def get_notebook_name(nb):
|
||||
JS = 'return Jupyter.notebook.notebook_name'
|
||||
return nb.browser.execute_script(JS)
|
||||
|
||||
def refresh_notebook(nb):
|
||||
nb.browser.refresh()
|
||||
nb.__init__(nb.browser)
|
||||
|
||||
def test_save_readonly_notebook_as(notebook):
|
||||
# Make notebook read-only
|
||||
notebook.edit_cell(index=0, content='import os\nimport stat\nos.chmod("'
|
||||
+ notebook.browser.current_url.split('?')[0].split('/')[-1] + '", stat.S_IREAD)\nprint(0)')
|
||||
notebook.browser.execute_script("Jupyter.notebook.get_cell(0).execute();")
|
||||
notebook.wait_for_cell_output(0)
|
||||
refresh_notebook(notebook)
|
||||
# Test that the notebook is read-only
|
||||
assert notebook.browser.execute_script('return Jupyter.notebook.writable') == False
|
||||
|
||||
# Add some content
|
||||
test_content_0 = "print('a simple')\nprint('test script')"
|
||||
notebook.edit_cell(index=0, content=test_content_0)
|
||||
|
||||
# Wait for Save As modal, save
|
||||
save_as(notebook)
|
||||
wait_for_selector(notebook.browser, '.save-message')
|
||||
inp = notebook.browser.find_element_by_xpath('//input[@data-testid="save-as"]')
|
||||
inp.send_keys('writable_notebook.ipynb')
|
||||
inp.send_keys(Keys.RETURN)
|
||||
wait_for_rename(notebook.browser, "writable_notebook")
|
||||
# Test that the name changed
|
||||
assert get_notebook_name(notebook) == "writable_notebook.ipynb"
|
||||
# Test that address bar was updated (TODO: get the base url)
|
||||
assert "writable_notebook.ipynb" in notebook.browser.current_url
|
||||
# Test that it is no longer read-only
|
||||
assert notebook.browser.execute_script('return Jupyter.notebook.writable') == True
|
||||
|
||||
# Add some more content
|
||||
test_content_1 = "print('a second simple')\nprint('script to test save feature')"
|
||||
notebook.add_and_execute_cell(content=test_content_1)
|
||||
# and save the notebook
|
||||
execute_promise("Jupyter.notebook.save_notebook()", notebook.browser)
|
||||
|
||||
# Test that it still contains the content
|
||||
assert notebook.get_cell_contents(index=0) == test_content_0
|
||||
assert notebook.get_cell_contents(index=1) == test_content_1
|
||||
# even after a refresh
|
||||
refresh_notebook(notebook)
|
||||
assert notebook.get_cell_contents(index=0) == test_content_0
|
||||
assert notebook.get_cell_contents(index=1) == test_content_1
|
Loading…
Reference in New Issue
Block a user