Merge pull request #2 from blink1073/pr/609

Update tests

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

@@ -30,11 +30,11 @@ import {
 } from '../../../../lib/notebook/codemirror/cells/editor';
 
 import {
-  CodeMirrorCodeCellWidgetRenderer, defaultCodeMirrorCodeCellWidgetRenderer
+  CodeMirrorCodeCellWidgetRenderer
 } from '../../../../lib/notebook/codemirror/cells/widget';
 
 import {
-  defaultCodeMirrorCodeCellRenderer, defaultCodeMirrorMarkdownCellRenderer, defaultCodeMirrorRawCellRenderer
+  CodeMirrorNotebookRenderer
 } from '../../../../lib/notebook/codemirror/notebook/widget';
 
 import {
@@ -66,8 +66,8 @@ class LogBaseCell extends BaseCellWidget {
 
   constructor() {
     super({
-      renderer: defaultCodeMirrorCodeCellWidgetRenderer
-    })
+      renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
+    });
   }
 
   protected onAfterAttach(msg: Message): void {
@@ -162,7 +162,7 @@ describe('notebook/cells/widget', () => {
 
       it('should create a base cell widget', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         expect(widget).to.be.a(BaseCellWidget);
       });
@@ -187,7 +187,7 @@ describe('notebook/cells/widget', () => {
       it('should be settable', () => {
         let model = new CellModel();
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         expect(widget.model).to.be(null);
         widget.model = model;
@@ -202,7 +202,7 @@ describe('notebook/cells/widget', () => {
 
       it('should emit a signal when the model changes', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         let called = false;
         widget.modelChanged.connect(() => { called = true; });
@@ -213,7 +213,7 @@ describe('notebook/cells/widget', () => {
 
       it('should not emit a signal when the model has not changed', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         let model = new CellModel();
         let called = 0;
@@ -231,14 +231,14 @@ describe('notebook/cells/widget', () => {
 
       it('should be a cell editor widget', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         expect(widget.editor).to.be.a(CodeMirrorCellEditorWidget);
       });
 
       it('should be read-only', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         expect(() => { widget.editor = null; }).to.throwError();
       });
@@ -249,21 +249,21 @@ describe('notebook/cells/widget', () => {
 
       it('should be a string', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         expect(typeof widget.mimetype).to.be('string');
       });
 
       it('should default to text/plain', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         expect(widget.mimetype).to.be('text/plain');
       });
 
       it('should supporting being set to other types', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         widget.mimetype = 'test/test';
         expect(widget.mimetype).to.be('test/test');
@@ -271,7 +271,7 @@ describe('notebook/cells/widget', () => {
 
       it('should be safe to set multiple times', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         widget.mimetype = 'test/test';
         widget.mimetype = 'test/test';
@@ -280,7 +280,7 @@ describe('notebook/cells/widget', () => {
 
       it('should not allow being set to empty or null strings', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         widget.mimetype = null;
         expect(widget.mimetype).to.be('text/plain');
@@ -294,21 +294,21 @@ describe('notebook/cells/widget', () => {
 
       it('should be a boolean', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         expect(typeof widget.readOnly).to.be('boolean');
       });
 
       it('should default to false', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         expect(widget.readOnly).to.be(false);
       });
 
       it('should be settable', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         widget.readOnly = true;
         expect(widget.readOnly).to.be(true);
@@ -330,21 +330,21 @@ describe('notebook/cells/widget', () => {
 
       it('should be a boolean', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         expect(typeof widget.trusted).to.be('boolean');
       });
 
       it('should default to false', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         expect(widget.trusted).to.be(false);
       });
 
       it('should be settable', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         widget.model = new CellModel();
         widget.trusted = true;
@@ -353,7 +353,7 @@ describe('notebook/cells/widget', () => {
 
       it('should do nothing if there is no model', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         expect(widget.trusted).to.be(false);
         widget.trusted = true;
@@ -366,7 +366,7 @@ describe('notebook/cells/widget', () => {
 
       it('should focus the cell editor', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         Widget.attach(widget, document.body);
         expect(widget.editor.hasFocus()).to.be(false);
@@ -381,7 +381,7 @@ describe('notebook/cells/widget', () => {
 
       it('should not throw an error (full test in input area)', () => {
         let widget = new BaseCellWidget({
-          renderer: defaultCodeMirrorCodeCellWidgetRenderer
+          renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer
         });
         expect(() => { widget.setPrompt(void 0); }).to.not.throwError();
         expect(() => { widget.setPrompt(null); }).to.not.throwError();
@@ -395,7 +395,7 @@ describe('notebook/cells/widget', () => {
     describe('#toggleInput()', () => {
 
       it('should toggle whether the input is shown', () => {
-        let widget = new BaseCellWidget({renderer: defaultCodeMirrorCodeCellWidgetRenderer});
+        let widget = new BaseCellWidget({renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer});
         let input = widget.node.getElementsByClassName(INPUT_CLASS)[0];
         Widget.attach(widget, document.body);
         expect(window.getComputedStyle(input).display).to.not.be('none');
@@ -410,13 +410,13 @@ describe('notebook/cells/widget', () => {
     describe('#dispose()', () => {
 
       it('should dispose of the resources held by the widget', () => {
-        let widget = new BaseCellWidget({renderer: defaultCodeMirrorCodeCellWidgetRenderer});
+        let widget = new BaseCellWidget({renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer});
         widget.dispose();
         expect(widget.isDisposed).to.be(true);
       });
 
       it('should be safe to call multiple times', () => {
-        let widget = new BaseCellWidget({renderer: defaultCodeMirrorCodeCellWidgetRenderer});
+        let widget = new BaseCellWidget({renderer: CodeMirrorCodeCellWidgetRenderer.defaultRenderer});
         widget.dispose();
         widget.dispose();
         expect(widget.isDisposed).to.be(true);
@@ -524,7 +524,7 @@ describe('notebook/cells/widget', () => {
       describe('#defaultRenderer', () => {
 
         it('should be a renderer', () => {
-          let defaultRenderer = defaultCodeMirrorCodeCellWidgetRenderer;
+          let defaultRenderer = CodeMirrorCodeCellWidgetRenderer.defaultRenderer;
           expect(defaultRenderer).to.be.a(BaseCellWidget.Renderer);
         });
 
@@ -539,7 +539,7 @@ describe('notebook/cells/widget', () => {
     describe('#constructor()', () => {
 
       it('should create a code cell widget', () => {
-        let widget = new CodeCellWidget({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
+        let widget = new CodeCellWidget({ rendermime, renderer: CodeMirrorNotebookRenderer.defaultCodeCellRenderer });
         expect(widget).to.be.a(CodeCellWidget);
       });
 
@@ -564,13 +564,13 @@ describe('notebook/cells/widget', () => {
     describe('#dispose()', () => {
 
       it('should dispose of the resources held by the widget', () => {
-        let widget = new CodeCellWidget({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
+        let widget = new CodeCellWidget({ rendermime, renderer: CodeMirrorNotebookRenderer.defaultCodeCellRenderer });
         widget.dispose();
         expect(widget.isDisposed).to.be(true);
       });
 
       it('should be safe to call multiple times', () => {
-        let widget = new CodeCellWidget({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
+        let widget = new CodeCellWidget({ rendermime, renderer: CodeMirrorNotebookRenderer.defaultCodeCellRenderer });
         widget.dispose();
         widget.dispose();
         expect(widget.isDisposed).to.be(true);
@@ -581,14 +581,14 @@ describe('notebook/cells/widget', () => {
     describe('#execute()', () => {
 
       it('should fulfill a promise if there is no code to execute', (done) => {
-        let widget = new CodeCellWidget({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
+        let widget = new CodeCellWidget({ rendermime, renderer: CodeMirrorNotebookRenderer.defaultCodeCellRenderer });
         let kernel = new MockKernel();
         widget.model = new CodeCellModel();
         widget.execute(kernel).then(() => { done(); });
       });
 
       it('should fulfill a promise if there is code to execute', (done) => {
-        let widget = new CodeCellWidget({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
+        let widget = new CodeCellWidget({ rendermime, renderer: CodeMirrorNotebookRenderer.defaultCodeCellRenderer });
         let kernel = new MockKernel();
         widget.model = new CodeCellModel();
         widget.model.source = 'foo';
@@ -606,7 +606,7 @@ describe('notebook/cells/widget', () => {
     describe('#onUpdateRequest()', () => {
 
       it('should update the widget', () => {
-        let widget = new LogCodeCell({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
+        let widget = new LogCodeCell({ rendermime, renderer: CodeMirrorNotebookRenderer.defaultCodeCellRenderer });
         expect(widget.methods).to.not.contain('onUpdateRequest');
         sendMessage(widget, WidgetMessage.UpdateRequest);
         expect(widget.methods).to.contain('onUpdateRequest');
@@ -618,7 +618,7 @@ describe('notebook/cells/widget', () => {
 
       it('should fire when the model changes', () => {
         let method = 'onModelChanged';
-        let widget = new LogCodeCell({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
+        let widget = new LogCodeCell({ rendermime, renderer: CodeMirrorNotebookRenderer.defaultCodeCellRenderer });
         expect(widget.methods).to.not.contain(method);
         widget.model = new CodeCellModel();
         expect(widget.methods).to.contain(method);
@@ -630,7 +630,7 @@ describe('notebook/cells/widget', () => {
 
       it('should fire when model state changes', () => {
         let method = 'onModelStateChanged';
-        let widget = new LogCodeCell({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
+        let widget = new LogCodeCell({ rendermime, renderer: CodeMirrorNotebookRenderer.defaultCodeCellRenderer });
         widget.model = new CodeCellModel();
         expect(widget.methods).to.not.contain(method);
         widget.model.source = 'foo';
@@ -643,7 +643,7 @@ describe('notebook/cells/widget', () => {
 
       it('should fire when model metadata changes', () => {
         let method = 'onMetadataChanged';
-        let widget = new LogCodeCell({ rendermime, renderer: defaultCodeMirrorCodeCellRenderer });
+        let widget = new LogCodeCell({ rendermime, renderer: CodeMirrorNotebookRenderer.defaultCodeCellRenderer });
         widget.model = new CodeCellModel();
         expect(widget.methods).to.not.contain(method);
         widget.model.metadataChanged.emit({
@@ -680,7 +680,7 @@ describe('notebook/cells/widget', () => {
       describe('#defaultRenderer', () => {
 
         it('should be a renderer', () => {
-          let defaultRenderer = defaultCodeMirrorCodeCellRenderer;
+          let defaultRenderer = CodeMirrorNotebookRenderer.defaultCodeCellRenderer;
           expect(defaultRenderer).to.be.a(CodeCellWidget.Renderer);
         });
 
@@ -695,7 +695,7 @@ describe('notebook/cells/widget', () => {
     describe('#constructor()', () => {
 
       it('should create a markdown cell widget', () => {
-        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultCodeMirrorMarkdownCellRenderer });
+        let widget = new MarkdownCellWidget({ rendermime, renderer: CodeMirrorNotebookRenderer.defaultMarkdownCellRenderer });
         expect(widget).to.be.a(MarkdownCellWidget);
       });
 
@@ -713,7 +713,7 @@ describe('notebook/cells/widget', () => {
       });
 
       it('should set the default mimetype to text/x-ipythongfm', () => {
-        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultCodeMirrorMarkdownCellRenderer });
+        let widget = new MarkdownCellWidget({ rendermime, renderer: CodeMirrorNotebookRenderer.defaultMarkdownCellRenderer });
         expect(widget.mimetype).to.be('text/x-ipythongfm');
       });
 
@@ -722,7 +722,7 @@ describe('notebook/cells/widget', () => {
     describe('#rendered', () => {
 
       it('should default to true', (done) => {
-        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultCodeMirrorMarkdownCellRenderer });
+        let widget = new MarkdownCellWidget({ rendermime, renderer: CodeMirrorNotebookRenderer.defaultMarkdownCellRenderer });
         Widget.attach(widget, document.body);
         expect(widget.rendered).to.be(true);
         requestAnimationFrame(() => {
@@ -733,7 +733,7 @@ describe('notebook/cells/widget', () => {
       });
 
       it('should unrender the widget', (done) => {
-        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultCodeMirrorMarkdownCellRenderer });
+        let widget = new MarkdownCellWidget({ rendermime, renderer: CodeMirrorNotebookRenderer.defaultMarkdownCellRenderer });
         Widget.attach(widget, document.body);
         widget.rendered = false;
         requestAnimationFrame(() => {
@@ -744,7 +744,7 @@ describe('notebook/cells/widget', () => {
       });
 
       it('should ignore being set to the same value', (done) => {
-        let widget = new LogMarkdownCell({ rendermime, renderer: defaultCodeMirrorMarkdownCellRenderer });
+        let widget = new LogMarkdownCell({ rendermime, renderer: CodeMirrorNotebookRenderer.defaultMarkdownCellRenderer });
         Widget.attach(widget, document.body);
         widget.rendered = false;
         widget.rendered = false;
@@ -762,13 +762,13 @@ describe('notebook/cells/widget', () => {
     describe('#dispose()', () => {
 
       it('should dispose of the resources held by the widget', () => {
-        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultCodeMirrorMarkdownCellRenderer });
+        let widget = new MarkdownCellWidget({ rendermime, renderer: CodeMirrorNotebookRenderer.defaultMarkdownCellRenderer });
         widget.dispose();
         expect(widget.isDisposed).to.be(true);
       });
 
       it('should be safe to call multiple times', () => {
-        let widget = new MarkdownCellWidget({ rendermime, renderer: defaultCodeMirrorMarkdownCellRenderer });
+        let widget = new MarkdownCellWidget({ rendermime, renderer: CodeMirrorNotebookRenderer.defaultMarkdownCellRenderer });
         widget.dispose();
         widget.dispose();
         expect(widget.isDisposed).to.be(true);
@@ -779,7 +779,7 @@ describe('notebook/cells/widget', () => {
     describe('#onUpdateRequest()', () => {
 
       it('should update the widget', () => {
-        let widget = new LogMarkdownCell({ rendermime, renderer: defaultCodeMirrorMarkdownCellRenderer });
+        let widget = new LogMarkdownCell({ rendermime, renderer: CodeMirrorNotebookRenderer.defaultMarkdownCellRenderer });
         expect(widget.methods).to.not.contain('onUpdateRequest');
         sendMessage(widget, WidgetMessage.UpdateRequest);
         expect(widget.methods).to.contain('onUpdateRequest');
@@ -794,7 +794,7 @@ describe('notebook/cells/widget', () => {
     describe('#constructor()', () => {
 
       it('should create a raw cell widget', () => {
-        let widget = new RawCellWidget({renderer:defaultCodeMirrorRawCellRenderer});
+        let widget = new RawCellWidget({renderer:CodeMirrorNotebookRenderer.defaultRawCellRenderer});
         expect(widget).to.be.a(RawCellWidget);
       });
 

test/src/notebook/completion/handler.spec.ts

@@ -24,7 +24,7 @@ import {
 } from '../../../../lib/notebook/completion';
 
 import {
-  defaultCodeMirrorCodeCellWidgetRenderer
+  CodeMirrorCodeCellWidgetRenderer
 } from '../../../../lib/notebook/codemirror/cells/widget';
 
 
@@ -115,7 +115,7 @@ describe('notebook/completion/handler', () => {
 
       it('should be settable', () => {
         let handler = new CellCompletionHandler(new CompletionWidget());
-        let cell = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
+        let cell = new BaseCellWidget({renderer:CodeMirrorCodeCellWidgetRenderer.defaultRenderer});
         expect(handler.activeCell).to.be(null);
         handler.activeCell = cell;
         expect(handler.activeCell).to.be.a(BaseCellWidget);
@@ -124,8 +124,8 @@ describe('notebook/completion/handler', () => {
 
       it('should be resettable', () => {
         let handler = new CellCompletionHandler(new CompletionWidget());
-        let one = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
-        let two = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
+        let one = new BaseCellWidget({renderer:CodeMirrorCodeCellWidgetRenderer.defaultRenderer});
+        let two = new BaseCellWidget({renderer:CodeMirrorCodeCellWidgetRenderer.defaultRenderer});
         expect(handler.activeCell).to.be(null);
         handler.activeCell = one;
         expect(handler.activeCell).to.be.a(BaseCellWidget);
@@ -315,7 +315,7 @@ describe('notebook/completion/handler', () => {
           oldValue: 'fo',
           newValue: 'foo'
         };
-        let cell = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
+        let cell = new BaseCellWidget({renderer:CodeMirrorCodeCellWidgetRenderer.defaultRenderer});
 
         handler.activeCell = cell;
         expect(handler.methods).to.not.contain('onTextChanged');
@@ -338,7 +338,7 @@ describe('notebook/completion/handler', () => {
           oldValue: 'fo',
           newValue: 'foo'
         };
-        let cell = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
+        let cell = new BaseCellWidget({renderer:CodeMirrorCodeCellWidgetRenderer.defaultRenderer});
         let model = completion.model as TestCompletionModel;
 
         handler.activeCell = cell;
@@ -362,7 +362,7 @@ describe('notebook/completion/handler', () => {
           position: 0,
           currentValue: 'foo'
         };
-        let cell = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
+        let cell = new BaseCellWidget({renderer:CodeMirrorCodeCellWidgetRenderer.defaultRenderer});
 
         handler.activeCell = cell;
         expect(handler.methods).to.not.contain('onCompletionRequested');
@@ -384,7 +384,7 @@ describe('notebook/completion/handler', () => {
           position: 0,
           currentValue: 'foo'
         };
-        let cell = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
+        let cell = new BaseCellWidget({renderer:CodeMirrorCodeCellWidgetRenderer.defaultRenderer});
         let model = completion.model as TestCompletionModel;
 
         handler.kernel = new MockKernel();
@@ -414,7 +414,7 @@ describe('notebook/completion/handler', () => {
         let handler = new TestCompletionHandler(completion);
         let model = completion.model as TestCompletionModel;
 
-        handler.activeCell = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
+        handler.activeCell = new BaseCellWidget({renderer:CodeMirrorCodeCellWidgetRenderer.defaultRenderer});
         expect(model.methods).to.not.contain('createPatch');
         completion.selected.emit('foo');
         expect(model.methods).to.contain('createPatch');
@@ -425,7 +425,7 @@ describe('notebook/completion/handler', () => {
         let patch = 'foobar';
         let completion = new CompletionWidget({ model });
         let handler = new TestCompletionHandler(completion);
-        let cell = new BaseCellWidget({renderer:defaultCodeMirrorCodeCellWidgetRenderer});
+        let cell = new BaseCellWidget({renderer:CodeMirrorCodeCellWidgetRenderer.defaultRenderer});
         let request: ICompletionRequest = {
           ch: 0,
           chHeight: 0,

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

@@ -40,7 +40,7 @@ import {
 } from '../utils';
 
 import {
-  defaultCodeMirrorNotebookRenderer
+  CodeMirrorNotebookRenderer
 } from '../../../../lib/notebook/codemirror/notebook/widget';
 
 
@@ -55,9 +55,9 @@ describe('notebook/notebook/actions', () => {
     let kernel: IKernel;
 
     beforeEach(() => {
-      widget = new Notebook({ 
+      widget = new Notebook({
         rendermime: defaultRenderMime(),
-        renderer:defaultCodeMirrorNotebookRenderer
+        renderer: CodeMirrorNotebookRenderer.defaultRenderer
       });
       let model = new NotebookModel();
       model.fromJSON(DEFAULT_CONTENT);

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

@@ -44,7 +44,7 @@ import {
 } from '../utils';
 
 import {
-  defaultCodeMirrorNotebookPanelRenderer
+  CodeMirrorNotebookPanelRenderer
 } from '../../../../lib/notebook/codemirror/notebook/panel';
 
 
@@ -61,9 +61,10 @@ describe('notebook/notebook/default-toolbar', () => {
 
     let panel: NotebookPanel;
     let context: MockContext<NotebookModel>;
+    const renderer = CodeMirrorNotebookPanelRenderer.defaultRenderer;
 
     beforeEach((done) => {
-      panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+      panel = new NotebookPanel({ rendermime, clipboard, renderer });
       let model = new NotebookModel();
       model.fromJSON(DEFAULT_CONTENT);
       context = new MockContext<NotebookModel>(model);

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

@@ -56,7 +56,7 @@ import {
 } from '../utils';
 
 import {
-  defaultCodeMirrorNotebookPanelRenderer, CodeMirrorNotebookPanelRenderer
+  CodeMirrorNotebookPanelRenderer
 } from '../../../../lib/notebook/codemirror/notebook/panel';
 
 
@@ -65,6 +65,7 @@ import {
  */
 const rendermime = defaultRenderMime();
 const clipboard = new MimeData();
+const renderer = CodeMirrorNotebookPanelRenderer.defaultRenderer;
 
 
 class LogNotebookPanel extends NotebookPanel {
@@ -94,7 +95,7 @@ class LogNotebookPanel extends NotebookPanel {
 
 
 function createPanel(): LogNotebookPanel {
-  let panel = new LogNotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+  let panel = new LogNotebookPanel({ rendermime, clipboard, renderer });
   let model = new NotebookModel();
   model.fromJSON(DEFAULT_CONTENT);
   let context = new MockContext<NotebookModel>(model);
@@ -110,15 +111,15 @@ describe('notebook/notebook/panel', () => {
     describe('#constructor()', () => {
 
       it('should create a notebook panel', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer});
         expect(panel).to.be.a(NotebookPanel);
       });
 
 
       it('should accept an optional render', () => {
-        let renderer = new CodeMirrorNotebookPanelRenderer();
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
-        expect(panel.renderer).to.be(renderer);
+        let newRenderer = new CodeMirrorNotebookPanelRenderer();
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer: newRenderer});
+        expect(panel.renderer).to.be(newRenderer);
       });
 
     });
@@ -126,7 +127,7 @@ describe('notebook/notebook/panel', () => {
     describe('#contextChanged', () => {
 
       it('should be emitted when the context on the panel changes', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         let called = false;
         let model = new NotebookModel();
         let context = new MockContext<INotebookModel>(model);
@@ -140,7 +141,7 @@ describe('notebook/notebook/panel', () => {
       });
 
       it('should not be emitted if the context does not change', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         let called = false;
         let model = new NotebookModel();
         let context = new MockContext<INotebookModel>(model);
@@ -171,12 +172,12 @@ describe('notebook/notebook/panel', () => {
     describe('#toolbar', () => {
 
       it('should be the toolbar used by the widget', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         expect(panel.toolbar).to.be.a(NotebookToolbar);
       });
 
       it('should be read-only', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         expect(() => { panel.toolbar = null; }).to.throwError();
       });
 
@@ -185,12 +186,12 @@ describe('notebook/notebook/panel', () => {
     describe('#content', () => {
 
       it('should be the content area used by the widget', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         expect(panel.content).to.be.a(Notebook);
       });
 
       it('should be read-only', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         expect(() => { panel.content = null; }).to.throwError();
       });
 
@@ -206,7 +207,7 @@ describe('notebook/notebook/panel', () => {
       });
 
       it('should be read-only', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         expect(() => { panel.kernel = null; }).to.throwError();
       });
 
@@ -215,12 +216,12 @@ describe('notebook/notebook/panel', () => {
     describe('#rendermime', () => {
 
       it('should be the rendermime instance used by the widget', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         expect(panel.rendermime).to.be(rendermime);
       });
 
       it('should be read-only', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         expect(() => { panel.rendermime = null; }).to.throwError();
       });
 
@@ -235,7 +236,7 @@ describe('notebook/notebook/panel', () => {
       });
 
       it('should be read-only', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         expect(() => { panel.renderer = null; });
       });
 
@@ -244,12 +245,12 @@ describe('notebook/notebook/panel', () => {
     describe('#clipboard', () => {
 
       it('should be the clipboard instance used by the widget', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         expect(panel.clipboard).to.be(clipboard);
       });
 
       it('should be read-only', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         expect(() => { panel.clipboard = null; }).to.throwError();
       });
 
@@ -258,7 +259,7 @@ describe('notebook/notebook/panel', () => {
     describe('#model', () => {
 
       it('should be the model for the widget', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         expect(panel.model).to.be(null);
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
@@ -268,7 +269,7 @@ describe('notebook/notebook/panel', () => {
       });
 
       it('should be read-only', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         expect(() => { panel.model = null; }).to.throwError();
       });
 
@@ -277,12 +278,12 @@ describe('notebook/notebook/panel', () => {
     describe('#context', () => {
 
       it('should get the document context for the widget', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         expect(panel.context).to.be(null);
       });
 
       it('should set the document context for the widget', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
         panel.context = context;
@@ -290,7 +291,7 @@ describe('notebook/notebook/panel', () => {
       });
 
       it('should emit the `contextChanged` signal', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         let called = false;
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
@@ -304,7 +305,7 @@ describe('notebook/notebook/panel', () => {
     describe('#dispose()', () => {
 
       it('should dispose of the resources used by the widget', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
         panel.context = context;
@@ -313,7 +314,7 @@ describe('notebook/notebook/panel', () => {
       });
 
       it('should be safe to call more than once', () => {
-        let panel = new NotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new NotebookPanel({ rendermime, clipboard, renderer });
         panel.dispose();
         panel.dispose();
         expect(panel.isDisposed).to.be(true);
@@ -324,7 +325,7 @@ describe('notebook/notebook/panel', () => {
     describe('#onContextChanged()', () => {
 
       it('should be called when the context changes', () => {
-        let panel = new LogNotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new LogNotebookPanel({ rendermime, clipboard, renderer });
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
         panel.methods = [];
@@ -337,7 +338,7 @@ describe('notebook/notebook/panel', () => {
     describe('#onPopulated()', () => {
 
       it('should initialize the model state', () => {
-        let panel = new LogNotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new LogNotebookPanel({ rendermime, clipboard, renderer });
         let model = new NotebookModel();
         model.fromJSON(DEFAULT_CONTENT);
         expect(model.cells.canUndo).to.be(true);
@@ -378,7 +379,7 @@ describe('notebook/notebook/panel', () => {
       });
 
       it('should be called when the context changes', () => {
-        let panel = new LogNotebookPanel({ rendermime, clipboard, renderer: defaultCodeMirrorNotebookPanelRenderer });
+        let panel = new LogNotebookPanel({ rendermime, clipboard, renderer });
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
         panel.methods = [];
@@ -430,7 +431,7 @@ describe('notebook/notebook/panel', () => {
     describe('.defaultRenderer', () => {
 
       it('should be an instance of a `Renderer`', () => {
-        expect(defaultCodeMirrorNotebookPanelRenderer).to.be.a(NotebookPanel.Renderer);
+        expect(CodeMirrorNotebookPanelRenderer.defaultRenderer).to.be.a(NotebookPanel.Renderer);
       });
 
     });

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

@@ -41,16 +41,17 @@ import {
 } from '../utils';
 
 import {
-  defaultCodeMirrorNotebookRenderer, CodeMirrorNotebookRenderer
+  CodeMirrorNotebookRenderer
 } from '../../../../lib/notebook/codemirror/notebook/widget';
 
 
 const rendermime = defaultRenderMime();
+const renderer = CodeMirrorNotebookRenderer.defaultRenderer;
 
 
 function createWidget(): LogStaticNotebook {
   let model = new NotebookModel();
-  let widget = new LogStaticNotebook({ rendermime, renderer: defaultCodeMirrorNotebookRenderer });
+  let widget = new LogStaticNotebook({ rendermime, renderer });
   widget.model = model;
   return widget;
 }
@@ -137,7 +138,7 @@ class LogNotebook extends Notebook {
 
 function createActiveWidget(): LogNotebook {
   let model = new NotebookModel();
-  let widget = new LogNotebook({ rendermime, renderer: defaultCodeMirrorNotebookRenderer });
+  let widget = new LogNotebook({ rendermime, renderer });
   widget.model = model;
   return widget;
 }
@@ -150,12 +151,12 @@ describe('notebook/notebook/widget', () => {
     describe('#constructor()', () => {
 
       it('should create a notebook widget', () => {
-        let widget = new StaticNotebook({ rendermime, renderer: defaultCodeMirrorNotebookRenderer });
+        let widget = new StaticNotebook({ rendermime, renderer });
         expect(widget).to.be.a(StaticNotebook);
       });
 
       it('should add the `jp-Notebook` class', () => {
-        let widget = new StaticNotebook({ rendermime, renderer: defaultCodeMirrorNotebookRenderer });
+        let widget = new StaticNotebook({ rendermime, renderer });
         expect(widget.hasClass('jp-Notebook')).to.be(true);
       });
 
@@ -170,7 +171,7 @@ describe('notebook/notebook/widget', () => {
     describe('#modelChanged', () => {
 
       it('should be emitted when the model changes', () => {
-        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
+        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer });
         let model = new NotebookModel();
         let called = false;
         widget.modelChanged.connect((sender, args) => {
@@ -187,7 +188,7 @@ describe('notebook/notebook/widget', () => {
     describe('#modelContentChanged', () => {
 
       it('should be emitted when a cell is added', () => {
-        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
+        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer });
         widget.model = new NotebookModel();
         let called = false;
         widget.modelContentChanged.connect(() => { called = true; });
@@ -197,7 +198,7 @@ describe('notebook/notebook/widget', () => {
       });
 
       it('should be emitted when metadata is set', () => {
-        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
+        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer });
         widget.model = new NotebookModel();
         let called = false;
         widget.modelContentChanged.connect(() => { called = true; });
@@ -211,19 +212,19 @@ describe('notebook/notebook/widget', () => {
     describe('#model', () => {
 
       it('should get the model for the widget', () => {
-        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
+        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer });
         expect(widget.model).to.be(null);
       });
 
       it('should set the model for the widget', () => {
-        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
+        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer });
         let model = new NotebookModel();
         widget.model = model;
         expect(widget.model).to.be(model);
       });
 
       it('should emit the `modelChanged` signal', () => {
-        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
+        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer });
         let model = new NotebookModel();
         widget.model = model;
         let called = false;
@@ -233,7 +234,7 @@ describe('notebook/notebook/widget', () => {
       });
 
       it('should be a no-op if the value does not change', () => {
-        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
+        let widget = new StaticNotebook({ rendermime: defaultRenderMime(), renderer });
         let model = new NotebookModel();
         widget.model = model;
         let called = false;
@@ -243,7 +244,7 @@ describe('notebook/notebook/widget', () => {
       });
 
       it('should add the model cells to the layout', () => {
-        let widget = new LogStaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
+        let widget = new LogStaticNotebook({ rendermime: defaultRenderMime(), renderer });
         let model = new NotebookModel();
         model.fromJSON(DEFAULT_CONTENT);
         widget.model = model;
@@ -251,7 +252,7 @@ describe('notebook/notebook/widget', () => {
       });
 
       it('should set the mime types of the cell widgets', () => {
-        let widget = new LogStaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
+        let widget = new LogStaticNotebook({ rendermime: defaultRenderMime(), renderer });
         let model = new NotebookModel();
         let cursor = model.getMetadata('language_info');
         cursor.setValue({ name: 'python', codemirror_mode: 'python' });
@@ -315,7 +316,7 @@ describe('notebook/notebook/widget', () => {
     describe('#rendermime', () => {
 
       it('should be the rendermime instance used by the widget', () => {
-        let widget = new StaticNotebook({ rendermime, renderer: defaultCodeMirrorNotebookRenderer });
+        let widget = new StaticNotebook({ rendermime, renderer });
         expect(widget.rendermime).to.be(rendermime);
       });
 
@@ -329,8 +330,8 @@ describe('notebook/notebook/widget', () => {
     describe('#renderer', () => {
 
       it('should be the cell widget renderer used by the widget', () => {
-        let widget = new StaticNotebook({ rendermime, renderer: defaultCodeMirrorNotebookRenderer });
-        expect(widget.renderer).to.be(defaultCodeMirrorNotebookRenderer);
+        let widget = new StaticNotebook({ rendermime, renderer });
+        expect(widget.renderer).to.be(CodeMirrorNotebookRenderer.defaultRenderer);
       });
 
       it('should be read-only', () => {
@@ -343,12 +344,12 @@ describe('notebook/notebook/widget', () => {
     describe('#codeMimetype', () => {
 
       it('should get the mime type for code cells', () => {
-        let widget = new StaticNotebook({ rendermime, renderer: defaultCodeMirrorNotebookRenderer });
+        let widget = new StaticNotebook({ rendermime, renderer });
         expect(widget.codeMimetype).to.be('text/plain');
       });
 
       it('should be set from language metadata', () => {
-        let widget = new LogStaticNotebook({ rendermime: defaultRenderMime(), renderer: defaultCodeMirrorNotebookRenderer });
+        let widget = new LogStaticNotebook({ rendermime: defaultRenderMime(), renderer });
         let model = new NotebookModel();
         let cursor = model.getMetadata('language_info');
         cursor.setValue({ name: 'python', codemirror_mode: 'python' });
@@ -408,7 +409,7 @@ describe('notebook/notebook/widget', () => {
     describe('#onModelChanged()', () => {
 
       it('should be called when the model changes', () => {
-        let widget = new LogStaticNotebook({ rendermime, renderer: defaultCodeMirrorNotebookRenderer });
+        let widget = new LogStaticNotebook({ rendermime, renderer });
         widget.model = new NotebookModel();
         expect(widget.methods).to.contain('onModelChanged');
       });
@@ -546,7 +547,7 @@ describe('notebook/notebook/widget', () => {
     describe('.defaultRenderer', () => {
 
       it('should be an instance of `StaticNotebook.Renderer', () => {
-        expect(defaultCodeMirrorNotebookRenderer).to.be.a(StaticNotebook.Renderer);
+        expect(CodeMirrorNotebookRenderer.defaultRenderer).to.be.a(StaticNotebook.Renderer);
       });
 
     });

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

@@ -28,12 +28,13 @@ import {
 } from '../../rendermime/rendermime.spec';
 
 import {
-  defaultCodeMirrorNotebookPanelRenderer, CodeMirrorNotebookPanelRenderer
+  CodeMirrorNotebookPanelRenderer
 } from '../../../../lib/notebook/codemirror/notebook/panel';
 
 
 const rendermime = defaultRenderMime();
 const clipboard = new MimeData();
+const renderer = CodeMirrorNotebookPanelRenderer.defaultRenderer;
 
 
 describe('notebook/notebook/widgetfactory', () => {
@@ -43,7 +44,7 @@ describe('notebook/notebook/widgetfactory', () => {
     describe('#constructor()', () => {
 
       it('should create a notebook widget factory', () => {
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, renderer);
         expect(factory).to.be.a(NotebookWidgetFactory);
       });
 
@@ -52,14 +53,14 @@ describe('notebook/notebook/widgetfactory', () => {
     describe('#isDisposed', () => {
 
       it('should get whether the factory has been disposed', () => {
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, renderer);
         expect(factory.isDisposed).to.be(false);
         factory.dispose();
         expect(factory.isDisposed).to.be(true);
       });
 
       it('should be read-only', () => {
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, renderer);
         expect(() => { factory.isDisposed = false; }).to.throwError();
       });
 
@@ -68,13 +69,13 @@ describe('notebook/notebook/widgetfactory', () => {
     describe('#dispose()', () => {
 
       it('should dispose of the resources held by the factory', () => {
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, renderer );
         factory.dispose();
         expect(factory.isDisposed).to.be(true);
       });
 
       it('should be safe to call multiple times', () => {
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, renderer );
         factory.dispose();
         factory.dispose();
         expect(factory.isDisposed).to.be(true);
@@ -87,7 +88,7 @@ describe('notebook/notebook/widgetfactory', () => {
       it('should create a new `NotebookPanel` widget', () => {
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, renderer );
         let panel = factory.createNew(context);
         expect(panel).to.be.a(NotebookPanel);
       });
@@ -95,7 +96,7 @@ describe('notebook/notebook/widgetfactory', () => {
       it('should create a clone of the rendermime', () => {
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, renderer );
         let panel = factory.createNew(context);
         expect(panel.rendermime).to.not.be(rendermime);
       });
@@ -103,7 +104,7 @@ describe('notebook/notebook/widgetfactory', () => {
       it('should start a kernel if one is given', () => {
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, renderer );
         let panel = factory.createNew(context, { name: 'shell' });
         expect(panel.context.kernel.name).to.be('shell');
       });
@@ -111,7 +112,7 @@ describe('notebook/notebook/widgetfactory', () => {
       it('should start a kernel given the default kernel language', () => {
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, renderer );
         let panel = factory.createNew(context);
         expect(panel.context.kernel.name).to.be('python');
       });
@@ -121,7 +122,7 @@ describe('notebook/notebook/widgetfactory', () => {
         let cursor = model.getMetadata('language_info');
         cursor.setValue({ name: 'shell' });
         let context = new MockContext<NotebookModel>(model);
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, renderer );
         let panel = factory.createNew(context);
         expect(panel.context.kernel.name).to.be('shell');
       });
@@ -129,7 +130,7 @@ describe('notebook/notebook/widgetfactory', () => {
       it('should populate the default toolbar items', () => {
         let model = new NotebookModel();
         let context = new MockContext<NotebookModel>(model);
-        let factory = new NotebookWidgetFactory(rendermime, clipboard, defaultCodeMirrorNotebookPanelRenderer);
+        let factory = new NotebookWidgetFactory(rendermime, clipboard, renderer );
         let panel = factory.createNew(context);
         let items = panel.toolbar.list();
         expect(items).to.contain('save');