Update session tests

IPython/html/static/services/sessions/js/session.js

@@ -1,191 +1,203
 // Copyright (c) IPython Development Team.
 // Distributed under the terms of the Modified BSD License.
 
 define([
     'base/js/namespace',
     'jquery',
     'base/js/utils',
     'services/kernels/js/kernel',
 ], function(IPython, $, utils, kernel) {
     "use strict";
 
     var Session = function (options) {
         this.id = null;
         this.notebook_model = {
             name: options.notebook_name,
             path: options.notebook_path
         };
         this.kernel_model = {
             id: null,
             name: options.kernel_name
         };
 
         this.base_url = options.base_url;
         this.ws_url = options.ws_url;
         this.session_service_url = utils.url_join_encode(this.base_url, 'api/sessions');
         this.session_url = null;
 
         this.notebook = options.notebook;
         this.kernel = null;
         this.events = options.events;
     };
 
     /**
      * GET /api/sessions
      */
     Session.prototype.list = function (success, error) {
         $.ajax(this.session_service_url, {
             processData: false,
             cache: false,
             type: "GET",
             dataType: "json",
             success: success,
             error: this._on_error(error)
         });
     };
 
     /**
      * POST /api/sessions
      */
     Session.prototype.start = function (success, error) {
+        if (this.kernel !== null) {
+            throw new Error("session has already been started");
+        };
+
         var that = this;
         var on_success = function (data, status, xhr) {
             var kernel_service_url = utils.url_path_join(that.base_url, "api/kernels");
             that.kernel = new kernel.Kernel(
                 kernel_service_url, that.ws_url, that.notebook,
                 that.kernel_model.id, that.kernel_model.name);
             that.kernel._kernel_started(data.kernel);
             if (success) {
                 success(data, status, xhr);
             }
         };
         var on_error = function (xhr, status, err) {
             that.events.trigger('status_dead.Kernel');
             if (error) {
                 error(xhr, status, err);
             }
         };
 
         $.ajax(this.session_service_url, {
             processData: false,
             cache: false,
             type: "POST",
             data: JSON.stringify(this._get_model()),
             dataType: "json",
             success: this._on_success(on_success),
             error: this._on_error(on_error)
         });
     };
 
     /**
      * GET /api/sessions/[:session_id]
      */
     Session.prototype.get_info = function (success, error) {
         $.ajax(this.session_url, {
             processData: false,
             cache: false,
             type: "GET",
             dataType: "json",
             success: this._on_success(success),
             error: this._on_error(error)
         });
     };
 
     /**
      * PATCH /api/sessions/[:session_id]
      */
     Session.prototype.change = function (notebook_name, notebook_path, kernel_name, success, error) {
-        this.notebook_model.name = notebook_name;
-        this.notebook_model.path = notebook_path;
-        this.kernel_model.name = kernel_name;
+        if (notebook_name !== undefined) {
+            this.notebook_model.name = notebook_name;
+        }
+        if (notebook_path !== undefined) {
+            this.notebook_model.path = notebook_path;
+        }
+        if (kernel_name !== undefined) {
+            this.kernel_model.name = kernel_name;
+        }
+
+        console.log(JSON.stringify(this._get_model()));
 
         $.ajax(this.session_url, {
             processData: false,
             cache: false,
             type: "PATCH",
             data: JSON.stringify(this._get_model()),
-            dataType : "json",
+            dataType: "json",
             success: this._on_success(success),
             error: this._on_error(error)
         });
     };
 
     Session.prototype.rename_notebook = function (name, path, success, error) {
-        this.change(name, path, this.kernel_model.name, success, error);
+        this.change(name, path, undefined, success, error);
     };
 
     /**
      * DELETE /api/sessions/[:session_id]
      */
     Session.prototype.delete = function (success, error) {
         if (this.kernel) {
             this.kernel._kernel_dead();
         }
 
         $.ajax(this.session_url, {
             processData: false,
             cache: false,
             type: "DELETE",
             dataType: "json",
             success: this._on_success(success),
             error: this._on_error(error)
         });
     };
     
     Session.prototype._get_model = function () {
         return {
             notebook: this.notebook_model,
             kernel: this.kernel_model
         };
     };
 
     Session.prototype._update_model = function (data) {
         if (data && data.id) {
             this.id = data.id;
             this.session_url = utils.url_join_encode(this.session_service_url, this.id);
         }
         if (data && data.notebook) {
             this.notebook_model.name = data.notebook.name;
             this.notebook_model.path = data.notebook.path;
         }
         if (data && data.kernel) {
             this.kernel_model.name = data.kernel.name;
             this.kernel_model.id = data.kernel.id;
         }
     };
 
     Session.prototype._on_success = function (success) {
         var that = this;
         return function (data, status, xhr) {
             that._update_model(data);
             if (success) {
                 success(data, status, xhr);
             }
         };
     };
 
     Session.prototype._on_error = function (error) {
         return function (xhr, status, err) {
             utils.log_ajax_error(xhr, status, err);
             if (error) {
                 error(xhr, status, err);
             }
         };
     };
 
 
     var SessionAlreadyStarting = function (message) {
         this.name = "SessionAlreadyStarting";
         this.message = (message || "");
     };
     
     SessionAlreadyStarting.prototype = Error.prototype;
     
     // For backwards compatability.
     IPython.Session = Session;
 
     return {
         Session: Session,
         SessionAlreadyStarting: SessionAlreadyStarting
     };
 });

IPython/html/tests/services/session.js

@@ -1,24 +1,110
 
 //
 // Tests for the Session object
 //
 
 casper.notebook_test(function () {
+    var that = this;
+    var get_info = function () {
+        return that.evaluate(function () {
+            return JSON.parse(JSON.stringify(IPython.notebook.session._get_model()));
+        });
+    };
+
+    // test that the kernel is running
     this.then(function () {
         this.test.assert(this.kernel_running(), 'session: kernel is running');
     });
 
+    // test list
     this.thenEvaluate(function () {
-        IPython.notebook.session.delete();
+        IPython._sessions = null;
+        IPython.notebook.session.list(function (data) {
+            IPython._sessions = data;
+        });
+    });
+    this.waitFor(function () {
+        return this.evaluate(function () {
+            return IPython._sessions !== null;
+        });
+    });
+    this.then(function () {
+        var num_sessions = this.evaluate(function () {
+            return IPython._sessions.length;
+        });
+        this.test.assertEquals(num_sessions, 1, 'one session running');
     });
 
+    // test get_info
+    var session_info = get_info();
+    this.thenEvaluate(function () {
+        IPython._session_info = null;
+        IPython.notebook.session.get_info(function (data) {
+            IPython._session_info = data;
+        });
+    });
     this.waitFor(function () {
         return this.evaluate(function () {
-            return IPython.notebook.kernel.is_fully_disconnected();
+            return IPython._session_info !== null;
         });
     });
+    this.then(function () {
+        var new_session_info = this.evaluate(function () {
+            return IPython._session_info;
+        });
+        this.test.assertEquals(session_info.notebook.name, new_session_info.notebook.name, 'session: notebook name correct');
+        this.test.assertEquals(session_info.notebook.path, new_session_info.notebook.path, 'session: notebook path correct');
+        this.test.assertEquals(session_info.kernel.name, new_session_info.kernel.name, 'session: kernel name correct');
+        this.test.assertEquals(session_info.kernel.id, new_session_info.kernel.id, 'session: kernel id correct');
+    });
+
+    // test rename_notebook
+    //
+    // TODO: the PATCH request isn't supported by phantom, so this test always
+    // fails, see https://github.com/ariya/phantomjs/issues/11384
+    // when this is fixed we can properly run this test
+    //
+    // this.thenEvaluate(function () {
+    //     IPython._renamed = false;
+    //     IPython.notebook.session.rename_notebook(
+    //         "foo",
+    //         "bar",
+    //         function (data) {
+    //             IPython._renamed = true;
+    //         }
+    //     );
+    // });
+    // this.waitFor(function () {
+    //     return this.evaluate(function () {
+    //         return IPython._renamed;
+    //     });
+    // });
+    // this.then(function () {
+    //     var info = get_info();
+    //     this.test.assertEquals(info.notebook.name, "foo", "notebook was renamed");
+    //     this.test.assertEquals(info.notebook.path, "bar", "notebook path was changed");
+    // });
 
+    // test delete
+    this.thenEvaluate(function () {
+        IPython.notebook.session.delete();
+    });
+    this.waitFor(function () {
+        return this.evaluate(function () {
+            return IPython.notebook.kernel.is_fully_disconnected();
+        });
+    });
     this.then(function () {
         this.test.assert(!this.kernel_running(), 'session deletes kernel');
     });
+
+    // test start after delete -- should throw an error
+    this.then(function () {
+        var start = function () {
+            this.evaluate(function () {
+                IPython.notebook.session.start();
+            });
+        };
+        this.test.assertRaises(start, [], 'error raised on start after delete');
+    });
 });