Relocate unit tests for obojobo-document-engine and obojobo-express packages

packages/app/obojobo-document-engine/package.json

@@ -67,7 +67,7 @@
 	"jest": {
 		"testURL": "http://localhost:3000/view/00000000-0000-0000-0000-000000000000/visit/1",
 		"testMatch": [
-			"**/__tests__/**/*.js?(x)"
+			"/**/*.test.js?(x)"
 		],
 		"setupFilesAfterEnv": [
 			"./setupTests.js"

packages/app/obojobo-document-engine/__tests__/common/chunk/non-editable-chunk/non-editable-chunk.test.js → packages/app/obojobo-document-engine/src/scripts/common/chunk/non-editable-chunk/non-editable-chunk.test.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import renderer from 'react-test-renderer'
 
-import NonEditableChunk from '../../../../src/scripts/common/chunk/non-editable-chunk/index'
+import NonEditableChunk from './index'
 
 describe('NonEditableChunk', () => {
 	test('renders NonEditableChunk component with className, indent, and children', () => {

packages/app/obojobo-document-engine/__tests__/common/chunk/text-chunk/index.test.js → packages/app/obojobo-document-engine/src/scripts/common/chunk/text-chunk/index.test.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import renderer from 'react-test-renderer'
 
-import TextChunk from '../../../../src/scripts/common/chunk/text-chunk/index'
+import TextChunk from './index'
 
 describe('TextChunk', () => {
 	test('TextChunk component', () => {

packages/app/obojobo-document-engine/__tests__/common/chunk/text-chunk/text-group-adapter.test.js → packages/app/obojobo-document-engine/src/scripts/common/chunk/text-chunk/text-group-adapter.test.js

@@ -1,6 +1,6 @@
-import TextGroupAdapter from '../../../../src/scripts/common/chunk/text-chunk/text-group-adapter'
-import TextGroup from '../../../../src/scripts/common/text-group/text-group'
-import StyleableText from '../../../../src/scripts/common/text/styleable-text'
+import TextGroupAdapter from './text-group-adapter'
+import TextGroup from '../../text-group/text-group'
+import StyleableText from '../../text/styleable-text'
 
 describe('TextGroupAdapter', () => {
 	test('construct with no attributes', () => {

packages/app/obojobo-document-engine/__tests__/common/chunk/text-chunk/text-group-el.test.js → packages/app/obojobo-document-engine/src/scripts/common/chunk/text-chunk/text-group-el.test.js

@@ -1,12 +1,12 @@
 import { mount } from 'enzyme'
 import React from 'react'
 import renderer from 'react-test-renderer'
-import TextGroupEl from '../../../../src/scripts/common/chunk/text-chunk/text-group-el'
-import TextGroup from '../../../../src/scripts/common/text-group/text-group'
-import StyleableText from '../../../../src/scripts/common/text/styleable-text'
-import Dispatcher from '../../../../src/scripts/common/flux/dispatcher'
+import TextGroupEl from './text-group-el'
+import TextGroup from '../../text-group/text-group'
+import StyleableText from '../../text/styleable-text'
+import Dispatcher from '../../flux/dispatcher'
 
-jest.mock('../../../../src/scripts/common/flux/dispatcher')
+jest.mock('../../flux/dispatcher')
 
 describe('TextGroupEl', () => {
 	let tg

packages/app/obojobo-document-engine/__tests__/common/components/anchor.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/anchor.test.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import Anchor from '../../../src/scripts/common/components/anchor'
+import Anchor from './anchor'
 import renderer from 'react-test-renderer'
 
 describe('Anchor', () => {

packages/app/obojobo-document-engine/__tests__/common/components/button-bar.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/button-bar.test.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import ButtonBar from '../../../src/scripts/common/components/button-bar'
+import ButtonBar from './button-bar'
 import renderer from 'react-test-renderer'
 import { mount } from 'enzyme'
 

packages/app/obojobo-document-engine/__tests__/common/components/button.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/button.test.js

@@ -1,9 +1,9 @@
 import React from 'react'
-import Button from '../../../src/scripts/common/components/button'
+import Button from './button'
 import renderer from 'react-test-renderer'
 
-// jest.mock('../../../src/scripts/common/util/isornot')
-jest.mock('../../../src/scripts/common/page/focus')
+// jest.mock('../util/isornot')
+jest.mock('../page/focus')
 
 describe('Button', () => {
 	test('Renders', () => {
@@ -84,7 +84,7 @@ describe('Button', () => {
 	})
 
 	test('focus', () => {
-		const focus = require('../../../src/scripts/common/page/focus').default
+		const focus = require('../page/focus').default
 		const component = renderer.create(<Button value={''}></Button>)
 		expect(focus).not.toHaveBeenCalled()
 		component.getInstance().focus()

packages/app/obojobo-document-engine/__tests__/common/components/delete-button-base.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/delete-button-base.test.js

@@ -1,10 +1,10 @@
 import React from 'react'
-import DeleteButton from '../../../src/scripts/common/components/delete-button'
-import DeleteButtonBase from '../../../src/scripts/common/components/delete-button-base'
+import DeleteButton from './delete-button'
+import DeleteButtonBase from './delete-button-base'
 import { mount } from 'enzyme'
 import renderer from 'react-test-renderer'
 
-jest.mock('../../../src/scripts/common/page/focus')
+jest.mock('../page/focus')
 
 describe('DeleteButton', () => {
 	test('DeleteButton component', () => {
@@ -43,7 +43,7 @@ describe('DeleteButton', () => {
 	})
 
 	test('DeleteButton calls focus callback with ref argument', () => {
-		const focus = require('../../../src/scripts/common/page/focus').default
+		const focus = require('../page/focus').default
 		const wrapper = mount(<DeleteButton focus={focus} />)
 		const inst = wrapper.find(DeleteButtonBase).instance()
 		inst.focus()

packages/app/obojobo-document-engine/src/scripts/common/components/delete-button.test.js

@@ -0,0 +1,12 @@
+import DeleteButtonBase from './delete-button-base'
+import withPageFocus from '../util/with-page-focus'
+
+jest.mock('./delete-button-base')
+jest.mock('../util/with-page-focus')
+
+describe('Delete Button With Focus', () => {
+	test('withPageFocus HOC is applied to DeleteButtonBase', () => {
+		require('./delete-button').default
+		expect(withPageFocus).toHaveBeenCalledWith(DeleteButtonBase)
+	})
+})

packages/app/obojobo-document-engine/__tests__/common/components/edit-button.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/edit-button.test.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import EditButton from '../../../src/scripts/common/components/edit-button'
+import EditButton from './edit-button'
 import renderer from 'react-test-renderer'
 
 describe('EditButton', () => {

packages/app/obojobo-document-engine/__tests__/common/components/focus-blocker.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/focus-blocker.test.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import FocusBlocker from '../../../src/scripts/common/components/focus-blocker'
+import FocusBlocker from './focus-blocker'
 import renderer from 'react-test-renderer'
 
 describe('FocusBlocker', () => {

packages/app/obojobo-document-engine/__tests__/common/components/modal-container.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/modal-container.test.js

@@ -2,7 +2,7 @@ import React from 'react'
 import renderer from 'react-test-renderer'
 import ReactDOM from 'react-dom'
 
-import ModalContainer from '../../../src/scripts/common/components/modal-container'
+import ModalContainer from './modal-container'
 
 describe('ModalContainer', () => {
 	test('ModalContainer component', () => {

packages/app/obojobo-document-engine/__tests__/common/components/modal-portal.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/modal-portal.test.js

@@ -1,11 +1,11 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
-import ModalPortal from '../../../src/scripts/common/components/modal-portal'
+import ModalPortal from './modal-portal'
 import { create, act } from 'react-test-renderer'
 
 // mock external deps
-jest.mock('../../../src/scripts/common/util/wait-for-element')
-jest.mock('../../../src/scripts/common/components/modal-container')
+jest.mock('../util/wait-for-element')
+jest.mock('./modal-container')
 
 describe('ModalPortal', () => {
 	beforeAll(() => {

packages/app/obojobo-document-engine/__tests__/common/components/modal/bubble/bubble.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/modal/bubble/bubble.test.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import renderer from 'react-test-renderer'
 
-import Bubble from '../../../../../src/scripts/common/components/modal/bubble/bubble'
+import Bubble from './bubble'
 
 describe('Bubble', () => {
 	test('Bubble', () => {

packages/app/obojobo-document-engine/__tests__/common/components/modal/bubble/single-input-bubble.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/modal/bubble/single-input-bubble.test.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import SingleInputBubble from '../../../../../src/scripts/common/components/modal/bubble/single-input-bubble'
+import SingleInputBubble from './single-input-bubble'
 import { mount } from 'enzyme'
 
 jest.useFakeTimers()

packages/app/obojobo-document-engine/__tests__/common/components/modal/dialog.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/modal/dialog.test.js

@@ -1,11 +1,9 @@
-import Dialog from '../../../../src/scripts/common/components/modal/dialog'
-import Modal from '../../../../src/scripts/common/components/modal/modal'
+import Dialog from './dialog'
+import Modal from './modal'
 import React from 'react'
 import renderer from 'react-test-renderer'
 
-jest.mock('../../../../src/scripts/common/components/modal/modal', () => props => (
-	<div {...props} />
-))
+jest.mock('./modal', () => props => <div {...props} />)
 
 describe('Dialog', () => {
 	test('basic render', () => {

packages/app/obojobo-document-engine/__tests__/common/components/modal/error-dialog.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/modal/error-dialog.test.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import ErrorDialog from '../../../../src/scripts/common/components/modal/error-dialog'
+import ErrorDialog from './error-dialog'
 import renderer from 'react-test-renderer'
 
 describe('ErrorDialog', () => {

packages/app/obojobo-document-engine/__tests__/common/components/modal/modal.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/modal/modal.test.js

@@ -1,10 +1,10 @@
-import Modal from '../../../../src/scripts/common/components/modal/modal'
-import ModalUtil from '../../../../src/scripts/common/util/modal-util'
+import Modal from './modal'
+import ModalUtil from '../../util/modal-util'
 import React from 'react'
 import { mount } from 'enzyme'
 import renderer from 'react-test-renderer'
 
-jest.mock('../../../../src/scripts/common/util/modal-util')
+jest.mock('../../util/modal-util')
 
 describe('Modal', () => {
 	let onClose, focusOnFirstElement

packages/app/obojobo-document-engine/__tests__/common/components/modal/no-button-modal.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/modal/no-button-modal.test.js

@@ -1,4 +1,4 @@
-import NoButtonModal from '../../../../src/scripts/common/components/modal/no-button-modal'
+import NoButtonModal from './no-button-modal'
 import React from 'react'
 import renderer from 'react-test-renderer'
 

packages/app/obojobo-document-engine/__tests__/common/components/modal/prompt.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/modal/prompt.test.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import { mount } from 'enzyme'
 
-import Prompt from 'src/scripts/common/components/modal/prompt'
+import Prompt from './prompt'
 
 describe('Prompt Modal', () => {
 	beforeEach(() => {

packages/app/obojobo-document-engine/__tests__/common/components/modal/question.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/modal/question.test.js

@@ -1,6 +1,6 @@
 import { shallow } from 'enzyme'
 import React from 'react'
-import Question from '../../../../src/scripts/common/components/modal/question'
+import Question from './question'
 import renderer from 'react-test-renderer'
 
 describe('Question', () => {

packages/app/obojobo-document-engine/__tests__/common/components/modal/simple-dialog.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/modal/simple-dialog.test.js

@@ -1,10 +1,10 @@
 import { mount } from 'enzyme'
 import React from 'react'
 
-jest.mock('../../../../src/scripts/common/util/modal-util')
+jest.mock('../../util/modal-util')
 
-import SimpleDialog from '../../../../src/scripts/common/components/modal/simple-dialog'
-import ModalUtil from '../../../../src/scripts/common/util/modal-util'
+import SimpleDialog from './simple-dialog'
+import ModalUtil from '../../util/modal-util'
 import renderer from 'react-test-renderer'
 
 describe('SimpleDialog', () => {

packages/app/obojobo-document-engine/__tests__/common/components/modal/simple-message.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/modal/simple-message.test.js

@@ -1,6 +1,6 @@
 import { shallow } from 'enzyme'
 import React from 'react'
-import SimpleMessage from '../../../../src/scripts/common/components/modal/simple-message'
+import SimpleMessage from './simple-message'
 import renderer from 'react-test-renderer'
 
 describe('SimpleMessage', () => {

packages/app/obojobo-document-engine/__tests__/common/components/more-info-button.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/more-info-button.test.js

@@ -2,8 +2,8 @@ import React from 'react'
 import renderer from 'react-test-renderer'
 import { mount } from 'enzyme'
 
-import MoreInfoButton from '../../../src/scripts/common/components/more-info-button'
-jest.mock('../../../src/scripts/common/util/uuid', () => {
+import MoreInfoButton from './more-info-button'
+jest.mock('../util/uuid', () => {
 	return () => 'mock-uuid'
 })
 

packages/app/obojobo-document-engine/__tests__/common/components/obojobo-idle-timer.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/obojobo-idle-timer.test.js

@@ -1,12 +1,12 @@
 import React from 'react'
 import TestRenderer from 'react-test-renderer'
-import Dispatcher from '../../../src/scripts/common/flux/dispatcher'
+import Dispatcher from '../flux/dispatcher'
 import IdleTimer from 'react-idle-timer'
-jest.mock('../../../src/scripts/common/flux/dispatcher', () => ({
+jest.mock('../flux/dispatcher', () => ({
 	trigger: jest.fn()
 }))
 
-import ObojoboIdleTimer from '../../../src/scripts/common/components/obojobo-idle-timer'
+import ObojoboIdleTimer from './obojobo-idle-timer'
 
 jest.useFakeTimers()
 

packages/app/obojobo-document-engine/__tests__/common/components/revealable-container.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/revealable-container.test.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import RevealableContainer from '../../../src/scripts/common/components/revealable-container'
+import RevealableContainer from './revealable-container'
 import TestRenderer from 'react-test-renderer'
 
 describe('RevealableContainer', () => {

packages/app/obojobo-document-engine/__tests__/common/components/slider/handle.test..js → packages/app/obojobo-document-engine/src/scripts/common/components/slider/handle.test.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import Handle from '../../../../src/scripts/common/components/slider/handle'
+import Handle from './handle'
 import renderer from 'react-test-renderer'
 
 describe('Handle', () => {

packages/app/obojobo-document-engine/__tests__/common/components/slider/slider-rail.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/slider/slider-rail.test.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import SliderRail from '../../../../src/scripts/common/components/slider/slider-rail'
+import SliderRail from './slider-rail'
 import renderer from 'react-test-renderer'
 
 describe('SliderRail', () => {

packages/app/obojobo-document-engine/__tests__/common/components/slider/slider-util.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/slider/slider-util.test.js

@@ -1,4 +1,4 @@
-import SliderUtils from '../../../../src/scripts/common/components/slider/slider-utils'
+import SliderUtils from './slider-utils'
 
 describe('Slider Update Mode', () => {
 	test('mode4 updates the handle positions', () => {

packages/app/obojobo-document-engine/__tests__/common/components/slider/slider.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/slider/slider.test.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import Slider from '../../../../src/scripts/common/components/slider/slider'
+import Slider from './slider'
 import renderer from 'react-test-renderer'
 import { mount } from 'enzyme'
 

packages/app/obojobo-document-engine/__tests__/common/components/slider/track.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/slider/track.test.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import Track from '../../../../src/scripts/common/components/slider/track'
+import Track from './track'
 import renderer from 'react-test-renderer'
 
 describe('Track', () => {

packages/app/obojobo-document-engine/__tests__/common/components/spinner.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/spinner.test.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import Spinner from '../../../src/scripts/common/components/spinner'
+import Spinner from './spinner'
 import { create, act } from 'react-test-renderer'
 
 describe('Spinner', () => {

packages/app/obojobo-document-engine/__tests__/common/components/switch.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/switch.test.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import Switch from '../../../src/scripts/common/components/switch'
+import Switch from './switch'
 import TestRenderer from 'react-test-renderer'
 import { mount } from 'enzyme'
 

packages/app/obojobo-document-engine/__tests__/common/components/text-menu.test.js → packages/app/obojobo-document-engine/src/scripts/common/components/text-menu.test.js

@@ -2,7 +2,7 @@ import React from 'react'
 import renderer from 'react-test-renderer'
 import { mount } from 'enzyme'
 
-import TextMenu from '../../../src/scripts/common/components/text-menu'
+import TextMenu from './text-menu'
 
 const createRect = () => {
 	return {

packages/app/obojobo-document-engine/__tests__/common/flux/store.test.js → packages/app/obojobo-document-engine/src/scripts/common/flux/store.test.js

@@ -1,7 +1,7 @@
-import Store from '../../../src/scripts/common/flux/store'
-import Dispatcher from '../../../src/scripts/common/flux/dispatcher'
+import Store from './store'
+import Dispatcher from './dispatcher'
 
-jest.mock('../../../src/scripts/common/flux/dispatcher', () => {
+jest.mock('./dispatcher', () => {
 	return {
 		trigger: jest.fn(),
 		on: jest.fn(),

packages/app/obojobo-document-engine/__tests__/common/mockdom/mock-element.test.js → packages/app/obojobo-document-engine/src/scripts/common/mockdom/mock-element.test.js

@@ -1,4 +1,4 @@
-import MockElement from '../../../src/scripts/common/mockdom/mock-element'
+import MockElement from './mock-element'
 
 describe('MockElement', () => {
 	beforeEach(() => {

packages/app/obojobo-document-engine/__tests__/common/mockdom/mock-text-node.test.js → packages/app/obojobo-document-engine/src/scripts/common/mockdom/mock-text-node.test.js

@@ -1,4 +1,4 @@
-import MockTextNode from '../../../src/scripts/common/mockdom/mock-text-node'
+import MockTextNode from './mock-text-node'
 
 describe('MockTextNode', () => {
 	test('creates new instance', () => {