start fixing existing tests

__tests__/src/actions/window.test.js

@@ -18,7 +18,10 @@ describe('window actions', () => {
           manifestId: null,
           rangeId: null,
           thumbnailNavigationPosition: 'bottom',
-          xywh: [0, 0, 400, 400],
+          x: 2700,
+          y: 2700,
+          width: 400,
+          height: 400,
           rotation: null,
           view: 'single',
         },

__tests__/src/components/Window.test.js

@@ -6,7 +6,13 @@ import WindowMiddleContent from '../../../src/containers/WindowMiddleContent';
 
 describe('Window', () => {
   let wrapper;
-  const window = { id: 123, xywh: [0, 0, 400, 500] };
+  const window = {
+    id: 123,
+    x: 2700,
+    y: 2700,
+    width: 400,
+    height: 400,
+  };
   it('should render outer element', () => {
     wrapper = shallow(<Window window={window} />);
     expect(wrapper.find('.mirador-window')).toHaveLength(1);

__tests__/src/components/Workspace.test.js

@@ -27,7 +27,7 @@ describe('Workspace', () => {
       const wrapper = createWrapper();
 
       expect(wrapper.matchesElement(
-        <div className="mirador-workspace mirador-workspace-with-control-panel">
+        <div className="mirador-workspace-viewport mirador-workspace-with-control-panel">
           <WorkspaceMosaic windows={windows} />
         </div>,
       )).toBe(true);
@@ -38,7 +38,7 @@ describe('Workspace', () => {
       const wrapper = createWrapper({ workspaceType: 'bubu' });
 
       expect(wrapper.matchesElement(
-        <div className="mirador-workspace mirador-workspace-with-control-panel">
+        <div className="mirador-workspace-viewport mirador-workspace-with-control-panel">
           <Window window={{ id: 1 }} />
           <Window window={{ id: 2 }} />
         </div>,

src/components/Window.js

@@ -88,13 +88,16 @@ class Window extends Component {
 Window.propTypes = {
   window: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
   manifest: PropTypes.object, // eslint-disable-line react/forbid-prop-types
-  updateWindowPosition: PropTypes.func.isRequired,
-  setWindowSize: PropTypes.func.isRequired,
-  workspaceType: PropTypes.string.isRequired,
+  updateWindowPosition: PropTypes.func,
+  setWindowSize: PropTypes.func,
+  workspaceType: PropTypes.string,
 };
 
 Window.defaultProps = {
   manifest: null,
+  updateWindowPosition: () => {},
+  setWindowSize: () => {},
+  workspaceType: '',
 };
 
 export default Window;