Update test paths

test/src/notebook/common/undo.spec.ts → test/src/common/undoablevector.spec.ts

@@ -9,7 +9,7 @@ import {
 
 import {
   ObservableUndoableVector, ISerializable
-} from '../../../../lib/notebook/common/undo';
+} from '../../../lib/common/undoablevector';
 
 
 

test/src/index.ts

@@ -18,6 +18,7 @@ import './common/activitymonitor.spec';
 import './common/instancetracker.spec';
 import './common/observablestring.spec';
 import './common/observablevector.spec';
+import './common/undoablevector.spec';
 import './common/vdom.spec';
 
 import './completer/handler.spec';
@@ -61,17 +62,14 @@ import './renderers/latex.spec';
 
 import './rendermime/rendermime.spec';
 
-import './notebook/common/undo.spec';
-
-import './notebook/notebook/actions.spec';
-import './notebook/notebook/default-toolbar.spec';
-import './notebook/notebook/model.spec';
-import './notebook/notebook/modelfactory.spec';
-import './notebook/notebook/panel.spec';
-import './notebook/notebook/trust.spec';
-import './notebook/notebook/widget.spec';
-import './notebook/notebook/widgetfactory.spec';
-
+import './notebook/actions.spec';
+import './notebook/default-toolbar.spec';
+import './notebook/model.spec';
+import './notebook/modelfactory.spec';
+import './notebook/panel.spec';
+import './notebook/trust.spec';
+import './notebook/widget.spec';
+import './notebook/widgetfactory.spec';
 import './notebook/tracker.spec';
 
 import './outputarea/model.spec';

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

@@ -13,24 +13,24 @@ import {
 
 import {
   CodeCellWidget, MarkdownCellWidget, RawCellWidget
-} from '../../../../lib/cells/widget';
+} from '../../../lib/cells/widget';
 
 import {
  NotebookModel
-} from '../../../../lib/notebook/notebook/model';
+} from '../../../lib/notebook/model';
 
 import {
   NotebookActions
-} from '../../../../lib/notebook/notebook/actions';
+} from '../../../lib/notebook/actions';
 
 import {
   Notebook, JUPYTER_CELL_MIME
-} from '../../../../lib/notebook/notebook/widget';
+} from '../../../lib/notebook/widget';
 
 import {
   DEFAULT_CONTENT, createNotebookFactory, clipboard, rendermime,
   mimeTypeService
-} from '../utils';
+} from './utils';
 
 
 const ERROR_INPUT = 'a = foo';

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

@@ -17,47 +17,47 @@ import {
 
 import {
   Context, DocumentRegistry
-} from '../../../../lib/docregistry';
+} from '../../../lib/docregistry';
 
 import {
  CodeCellWidget, MarkdownCellWidget
-} from '../../../../lib/cells/widget';
+} from '../../../lib/cells/widget';
 
 import {
   NotebookActions
-} from '../../../../lib/notebook/notebook/actions';
+} from '../../../lib/notebook/actions';
 
 import {
  ToolbarItems
-} from '../../../../lib/notebook/notebook/default-toolbar';
+} from '../../../lib/notebook/default-toolbar';
 
 import {
  INotebookModel
-} from '../../../../lib/notebook/notebook/model';
+} from '../../../lib/notebook/model';
 
 import {
   JUPYTER_CELL_MIME
-} from '../../../../lib/notebook/notebook/widget';
+} from '../../../lib/notebook/widget';
 
 import {
  NotebookPanel
-} from '../../../../lib/notebook/notebook/panel';
+} from '../../../lib/notebook/panel';
 
 import {
  createInterruptButton,
  createKernelNameItem,
  createKernelStatusItem,
  createRestartButton
-} from '../../../../lib/toolbar/kernel';
+} from '../../../lib/toolbar/kernel';
 
 import {
   createNotebookContext
-} from '../../utils';
+} from '../utils';
 
 import {
   DEFAULT_CONTENT, createNotebookPanelFactory, rendermime, clipboard,
   mimeTypeService
-} from '../utils';
+} from './utils';
 
 
 function startKernel(context: DocumentRegistry.IContext<INotebookModel>): Promise<Kernel.IKernel> {

test/src/notebook/notebook/model.spec.ts → test/src/notebook/model.spec.ts

@@ -17,15 +17,15 @@ import {
 
 import {
   CodeCellModel
-} from '../../../../lib/cells/model';
+} from '../../../lib/cells/model';
 
 import {
   NotebookModel
-} from '../../../../lib/notebook/notebook/model';
+} from '../../../lib/notebook/model';
 
 import {
   DEFAULT_CONTENT
-} from '../utils';
+} from './utils';
 
 
 describe('notebook/notebook/model', () => {

test/src/notebook/notebook/modelfactory.spec.ts → test/src/notebook/modelfactory.spec.ts

@@ -5,15 +5,15 @@ import expect = require('expect.js');
 
 import {
   CodeCellModel
-} from '../../../../lib/cells/model';
+} from '../../../lib/cells/model';
 
 import {
   NotebookModel
-} from '../../../../lib/notebook/notebook/model';
+} from '../../../lib/notebook/model';
 
 import {
   NotebookModelFactory
-} from '../../../../lib/notebook/notebook/modelfactory';
+} from '../../../lib/notebook/modelfactory';
 
 
 describe('notebook/notebook/modelfactory', () => {

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

@@ -9,44 +9,44 @@ import {
 
 import {
   IChangedArgs
-} from '../../../../lib/common/interfaces';
+} from '../../../lib/common/interfaces';
 
 import {
   DocumentRegistry, Context
-} from '../../../../lib/docregistry';
+} from '../../../lib/docregistry';
 
 import {
   CompleterWidget, CompletionHandler
-} from '../../../../lib/completer';
+} from '../../../lib/completer';
 
 import {
   InspectionHandler
-} from '../../../../lib/inspector';
+} from '../../../lib/inspector';
 
 import {
   INotebookModel
-} from '../../../../lib/notebook/notebook/model';
+} from '../../../lib/notebook/model';
 
 import {
   NotebookPanel
-} from '../../../../lib/notebook/notebook/panel';
+} from '../../../lib/notebook/panel';
 
 import {
-  Toolbar
-} from '../../../../lib/toolbar';
+  Notebook
+} from '../../../lib/notebook/widget';
 
 import {
-  Notebook
-} from '../../../../lib/notebook/notebook/widget';
+  Toolbar
+} from '../../../lib/toolbar';
 
 import {
   createNotebookContext
-} from '../../utils';
+} from '../utils';
 
 import {
   DEFAULT_CONTENT, createNotebookPanelFactory, rendermime, clipboard,
   mimeTypeService, editorFactory
-} from '../utils';
+} from './utils';
 
 
 /**

test/src/notebook/notebook/trust.spec.ts → test/src/notebook/trust.spec.ts

@@ -5,19 +5,19 @@ import expect = require('expect.js');
 
 import {
  NotebookModel
-} from '../../../../lib/notebook/notebook/model';
+} from '../../../lib/notebook/model';
 
 import {
   trustNotebook
-} from '../../../../lib/notebook/notebook/trust';
+} from '../../../lib/notebook/trust';
 
 import {
   acceptDialog, dismissDialog
-} from '../../utils';
+} from '../utils';
 
 import {
   DEFAULT_CONTENT
-} from '../utils';
+} from './utils';
 
 
 describe('notebook/notebook/trust', () => {

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

@@ -11,31 +11,31 @@ import {
   Widget, WidgetMessage
 } from 'phosphor/lib/ui/widget';
 
-import {
-  IChangedArgs
-} from '../../../../lib/common/interfaces';
-
 import {
   simulate
 } from 'simulate-event';
 
+import {
+  IChangedArgs
+} from '../../../lib/common/interfaces';
+
 import {
   CodeCellModel, CodeCellWidget, MarkdownCellModel, MarkdownCellWidget,
   RawCellModel, RawCellWidget, BaseCellWidget
-} from '../../../../lib/cells';
+} from '../../../lib/cells';
 
 import {
   INotebookModel, NotebookModel
-} from '../../../../lib/notebook/notebook/model';
+} from '../../../lib/notebook/model';
 
 import {
   Notebook, StaticNotebook
-} from '../../../../lib/notebook/notebook/widget';
+} from '../../../lib/notebook/widget';
 
 import {
   DEFAULT_CONTENT, createNotebookFactory, rendermime, mimeTypeService,
   editorFactory
-} from '../utils';
+} from './utils';
 
 
 const contentFactory = createNotebookFactory();

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

@@ -9,27 +9,27 @@ import {
 
 import {
   INotebookModel
-} from '../../../../lib/notebook/notebook/model';
+} from '../../../lib/notebook/model';
 
 import {
   NotebookPanel
-} from '../../../../lib/notebook/notebook/panel';
+} from '../../../lib/notebook/panel';
 
 import {
   NotebookWidgetFactory
-} from '../../../../lib/notebook/notebook/widgetfactory';
+} from '../../../lib/notebook/widgetfactory';
 
 import {
   Context
-} from '../../../../lib/docregistry/context';
+} from '../../../lib/docregistry/context';
 
 import {
   createNotebookContext
-} from '../../utils';
+} from '../utils';
 
 import {
   createNotebookPanelFactory, clipboard, rendermime, mimeTypeService
-} from '../utils';
+} from './utils';
 
 
 const contentFactory = createNotebookPanelFactory();

test/src/utils.ts

@@ -21,11 +21,11 @@ import {
 
 import {
   INotebookModel
-} from '../../lib/notebook/notebook/model';
+} from '../../lib/notebook/model';
 
 import {
   NotebookModelFactory
-} from '../../lib/notebook/notebook/modelfactory';
+} from '../../lib/notebook/modelfactory';
 
 import {
   TextRenderer, HTMLRenderer