From 555f42d5b0e0776fc4ca6293cba9edae90da7497 2013-10-17 21:09:16
From: Thomas Kluyver <takowl@gmail.com>
Date: 2013-10-17 21:09:16
Subject: [PATCH] Add test for and fix REST save with rename

---

diff --git a/IPython/html/services/notebooks/filenbmanager.py b/IPython/html/services/notebooks/filenbmanager.py
index 31428a0..66058d0 100644
--- a/IPython/html/services/notebooks/filenbmanager.py
+++ b/IPython/html/services/notebooks/filenbmanager.py
@@ -254,7 +254,7 @@ class FileNotebookManager(NotebookManager):
             except Exception as e:
                 raise web.HTTPError(400, u'Unexpected error while saving notebook as script: %s %s' % (py_path, e))
 
-        model = self.get_notebook_model(name, path, content=False)
+        model = self.get_notebook_model(new_name, new_path, content=False)
         return model
 
     def update_notebook_model(self, model, name, path=''):
diff --git a/IPython/html/services/notebooks/tests/test_notebooks_api.py b/IPython/html/services/notebooks/tests/test_notebooks_api.py
index d1c6408..d1692d6 100644
--- a/IPython/html/services/notebooks/tests/test_notebooks_api.py
+++ b/IPython/html/services/notebooks/tests/test_notebooks_api.py
@@ -115,6 +115,14 @@ class APITest(NotebookTestBase):
         self.assertEqual(nbnames, {'a.ipynb', 'b.ipynb',
                                    'name with spaces.ipynb', u'unicodé.ipynb'})
 
+    def assert_404(self, name, path):
+        try:
+            self.nb_api.read(name, path)
+        except requests.HTTPError as e:
+            self.assertEqual(e.response.status_code, 404)
+        else:
+            assert False, "Reading a non-existent notebook should fail"
+
     def test_get_contents(self):
         for d, name in self.dirs_nbs:
             nb = self.nb_api.read('%s.ipynb' % name, d+'/').json()
@@ -124,12 +132,7 @@ class APITest(NotebookTestBase):
             self.assertIsInstance(nb['content']['metadata'], dict)
 
         # Name that doesn't exist - should be a 404
-        try:
-            self.nb_api.read('q.ipynb', 'foo')
-        except requests.HTTPError as e:
-            self.assertEqual(e.response.status_code, 404)
-        else:
-            assert False, "Reading a non-existent notebook should fail"
+        self.assert_404('q.ipynb', 'foo')
 
     def _check_nb_created(self, resp, name, path):
         self.assertEqual(resp.status_code, 201)
@@ -198,3 +201,13 @@ class APITest(NotebookTestBase):
             newnb = read(f, format='ipynb')
         self.assertEqual(newnb.worksheets[0].cells[0].source,
                          'Created by test')
+
+        # Save and rename
+        nbmodel= {'name': 'a2.ipynb', 'path':'foo/bar', 'content': nb}
+        resp = self.nb_api.save('a.ipynb', path='foo', body=jsonapi.dumps(nbmodel))
+        saved = resp.json()
+        self.assertEqual(saved['name'], 'a2.ipynb')
+        self.assertEqual(saved['path'], 'foo/bar')
+        assert os.path.isfile(pjoin(self.notebook_dir.name,'foo','bar','a2.ipynb'))
+        assert not os.path.isfile(pjoin(self.notebook_dir.name, 'foo', 'a.ipynb'))
+        self.assert_404('a.ipynb', 'foo')
\ No newline at end of file