Update tests

test/src/completer/handler.spec.ts

@@ -19,14 +19,14 @@ import {
   ICompletionRequest, ICellEditorWidget, ITextChange
 } from '../../../lib/notebook/cells/editor';
 
-import {
-  createBaseCellRenderer
-} from '../../../lib/notebook/codemirror';
-
 import {
   CompleterWidget, CellCompleterHandler, CompleterModel
 } from '../../../lib/completer';
 
+import {
+  createBaseCellRenderer
+} from '../notebook/utils';
+
 
 const renderer = createBaseCellRenderer();
 

test/src/console/content.spec.ts

@@ -19,10 +19,6 @@ import {
   Widget
 } from 'phosphor/lib/ui/widget';
 
-import {
-  createRenderer
-} from '../../../lib/console/codemirror';
-
 import {
   ConsoleContent
 } from '../../../lib/console/content';
@@ -45,12 +41,16 @@ import {
 
 import {
   createCodeCellRenderer
-} from '../../../lib/notebook/codemirror';
+} from '../notebook/utils';
 
 import {
   defaultRenderMime
 } from '../utils';
 
+import {
+  createRenderer
+} from './utils';
+
 
 class TestContent extends ConsoleContent {
 

test/src/console/foreign.spec.ts

@@ -15,10 +15,6 @@ import {
   Panel
 } from 'phosphor/lib/ui/panel';
 
-import {
-  createCodeCellRenderer
-} from '../../../lib/notebook/codemirror';
-
 import {
   ForeignHandler
 } from '../../../lib/console/foreign';
@@ -27,6 +23,10 @@ import {
   CodeCellModel, CodeCellWidget
 } from '../../../lib/notebook/cells';
 
+import {
+  createCodeCellRenderer
+} from '../notebook/utils';
+
 import {
   defaultRenderMime
 } from '../utils';

test/src/console/panel.spec.ts

@@ -15,10 +15,6 @@ import {
   Widget
 } from 'phosphor/lib/ui/widget';
 
-import {
-  createRenderer
-} from '../../../lib/console/codemirror';
-
 import {
   ConsoleContent
 } from '../../../lib/console/content';
@@ -31,6 +27,10 @@ import {
   defaultRenderMime
 } from '../utils';
 
+import {
+  createRenderer
+} from './utils';
+
 
 class TestPanel extends ConsolePanel {
 

test/src/console/utils.ts

@@ -0,0 +1,19 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+import {
+  editorServices
+} from '../../../lib/codemirror';
+
+import {
+  ConsoleContent
+} from '../../../lib/console';
+
+
+/**
+ * Create a console renderer.
+ */
+export
+function createRenderer(): ConsoleContent.Renderer {
+  return new ConsoleContent.Renderer({ editorServices });
+}

test/src/notebook/cells/editor.spec.ts

@@ -32,7 +32,7 @@ import {
 
 import {
   createCellEditor
-} from '../../../../lib/notebook/codemirror';
+} from '../utils';
 
 
 const UP_ARROW = 38;

test/src/notebook/cells/widget.spec.ts

@@ -21,10 +21,6 @@ import {
   RawCellWidget, CodeCellEditorWidget
 } from '../../../../lib/notebook/cells';
 
-import {
-  createBaseCellRenderer, createCodeCellRenderer, createCellEditor
-} from '../../../../lib/notebook/codemirror';
-
 import {
   OutputAreaWidget
 } from '../../../../lib/notebook/output-area';
@@ -33,6 +29,10 @@ import {
   defaultRenderMime
 } from '../../utils';
 
+import {
+  createBaseCellRenderer, createCodeCellRenderer, createCellEditor
+} from '../utils';
+
 
 const RENDERED_CLASS = 'jp-mod-rendered';
 

test/src/notebook/notebook/actions.spec.ts

@@ -19,10 +19,6 @@ import {
   CodeCellWidget, MarkdownCellWidget, RawCellWidget
 } from '../../../../lib/notebook/cells/widget';
 
-import {
-  createNotebookRenderer
-} from '../../../../lib/notebook/codemirror';
-
 import {
  NotebookModel
 } from '../../../../lib/notebook/notebook/model';
@@ -40,7 +36,7 @@ import {
 } from '../../utils';
 
 import {
-  DEFAULT_CONTENT
+  DEFAULT_CONTENT, createNotebookRenderer
 } from '../utils';
 
 

test/src/notebook/notebook/default-toolbar.spec.ts

@@ -31,10 +31,6 @@ import {
   NotebookActions
 } from '../../../../lib/notebook/notebook/actions';
 
-import {
-  createNotebookPanelRenderer
-} from '../../../../lib/notebook/codemirror';
-
 import {
  ToolbarItems
 } from '../../../../lib/notebook/notebook/default-toolbar';
@@ -63,7 +59,7 @@ import {
 } from '../../utils';
 
 import {
-  DEFAULT_CONTENT
+  DEFAULT_CONTENT, createNotebookPanelRenderer
 } from '../utils';
 
 

test/src/notebook/notebook/panel.spec.ts

@@ -23,10 +23,6 @@ import {
   CompleterWidget
 } from '../../../../lib/completer';
 
-import {
-  createNotebookPanelRenderer
-} from '../../../../lib/notebook/codemirror';
-
 import {
   INotebookModel
 } from '../../../../lib/notebook/notebook/model';
@@ -48,7 +44,7 @@ import {
 } from '../../utils';
 
 import {
-  DEFAULT_CONTENT
+  DEFAULT_CONTENT, createNotebookPanelRenderer
 } from '../utils';
 
 

test/src/notebook/notebook/widget.spec.ts

@@ -28,10 +28,6 @@ import {
   RawCellModel, RawCellWidget, BaseCellWidget
 } from '../../../../lib/notebook/cells';
 
-import {
-  createNotebookRenderer
-} from '../../../../lib/notebook/codemirror';
-
 import {
   INotebookModel, NotebookModel
 } from '../../../../lib/notebook/notebook/model';
@@ -45,7 +41,7 @@ import {
 } from '../../utils';
 
 import {
-  DEFAULT_CONTENT
+  DEFAULT_CONTENT, createNotebookRenderer
 } from '../utils';
 
 

test/src/notebook/notebook/widgetfactory.spec.ts

@@ -11,10 +11,6 @@ import {
   MimeData
 } from 'phosphor/lib/core/mimedata';
 
-import {
-  createNotebookPanelRenderer
-} from '../../../../lib/notebook/codemirror';
-
 import {
   INotebookModel
 } from '../../../../lib/notebook/notebook/model';
@@ -35,6 +31,10 @@ import {
   createNotebookContext, defaultRenderMime
 } from '../../utils';
 
+import {
+  createNotebookPanelRenderer
+} from '../utils';
+
 
 const rendermime = defaultRenderMime();
 const clipboard = new MimeData();

test/src/notebook/tracker.spec.ts

@@ -7,10 +7,6 @@ import {
   MimeData
 } from 'phosphor/lib/core/mimedata';
 
-import {
-  createNotebookPanelRenderer
-} from '../../../lib/notebook/codemirror';
-
 import {
   BaseCellWidget
 } from '../../../lib/notebook/cells';
@@ -28,7 +24,7 @@ import {
 } from '../utils';
 
 import {
-  DEFAULT_CONTENT
+  DEFAULT_CONTENT, createNotebookPanelRenderer
 } from './utils';
 
 

test/src/notebook/utils.ts

@@ -5,9 +5,82 @@ import {
   nbformat
 } from '@jupyterlab/services';
 
+import {
+  editorServices
+} from '../../../lib/codemirror';
+
+import {
+  NotebookPanel, Notebook
+} from '../../../lib/notebook';
+
+import {
+  BaseCellWidget, CodeCellWidget, CodeCellEditorWidget
+} from '../../../lib/notebook/cells';
+
 
 /**
  * The default notebook content.
  */
 export
 const DEFAULT_CONTENT: nbformat.INotebookContent = require('../../../examples/notebook/test.ipynb') as nbformat.INotebookContent;
+
+
+/**
+ * Create a base cell renderer.
+ */
+export
+function createBaseCellRenderer(): BaseCellWidget.Renderer {
+  return new BaseCellWidget.Renderer({
+    editorFactory: host => editorServices.factory.newInlineEditor(host.node, {
+      wordWrap: true
+    })
+  });
+};
+
+
+/**
+ * Create a new code cell renderer.
+ */
+export
+function createCodeCellRenderer(): CodeCellWidget.Renderer {
+  return new CodeCellWidget.Renderer({
+    editorFactory: host => editorServices.factory.newInlineEditor(host.node, {
+      extra: {
+        matchBrackets: true,
+        autoCloseBrackets: true
+      }
+    })
+  });
+}
+
+
+/**
+ * Create a cell editor widget given a factory.
+ */
+export
+function createCellEditor(): CodeCellEditorWidget {
+  return new CodeCellEditorWidget(
+    host => editorServices.factory.newInlineEditor(host.node, {
+      wordWrap: true
+    })
+  );
+}
+
+
+/**
+ * Create a default notebook renderer.
+ */
+export
+function createNotebookRenderer(): Notebook.Renderer {
+  return new Notebook.Renderer({ editorServices });
+}
+
+
+/**
+ * Create a default notebook panel renderer.
+ */
+export
+function createNotebookPanelRenderer(): NotebookPanel.Renderer {
+  const notebookRenderer = createNotebookRenderer();
+  return new NotebookPanel.Renderer({ notebookRenderer });
+}