update tests to work with extended cdn changes

Author: iturgeon

packages/app/obojobo-repository/server/routes/library.test.js

@@ -2,6 +2,7 @@ jest.mock('../models/collection')
 jest.mock('../models/draft_summary')
 jest.mock('obojobo-express/server/models/user')
 jest.mock('../models/draft_permissions')
+jest.mock('../../shared/react-utils')
 jest.mock('trianglify')
 jest.unmock('fs') // need fs working for view rendering
 jest.unmock('express') // we'll use supertest + express for this
@@ -17,14 +18,11 @@ jest.mock(
 jest.setTimeout(10000) // extend test timeout?
 
 const publicLibCollectionId = require('../../shared/publicLibCollectionId')
-
 let trianglify
-
 let Collection
 let DraftSummary
 let UserModel
 let DraftPermissions
-
 // override requireCurrentUser for tests to provide our own user
 let mockCurrentUser
 

packages/app/obojobo-repository/shared/components/module-image.jsx

@@ -5,7 +5,11 @@ const clientGlobals = require('../util/client-globals')
 
 const ModuleImage = props => (
 	<div className="repository--module-icon--image">
-		<img src={`${clientGlobals.staticAssetUrl}/library/module-icon/${props.id}`} width="100%" height="100%" />
+		<img
+			src={`${clientGlobals.staticAssetUrl || ''}/library/module-icon/${props.id}`}
+			width="100%"
+			height="100%"
+		/>
 	</div>
 )
 

packages/app/obojobo-repository/shared/components/pages/page-module-client.test.js

@@ -1,15 +1,20 @@
 jest.mock('../../react-utils')
-jest.mock('./page-module')
-jest.mock('../../reducers/dashboard-reducer')
+jest.mock('./page-module-hoc')
+jest.mock('../../reducers/about-module-reducer')
 
 const ReactUtils = require('../../react-utils')
-const PageModule = require('./page-module')
+const PageModule = require('./page-module-hoc')
+const AboutModuleReducer = require('../../reducers/about-module-reducer')
 
 describe('Client-side Module Page', () => {
 	test('passes the right arguments to ReactUtils.hydrateElWithoutStore', () => {
 		// just need to require this, it will run itself
 		require('./page-module-client')
 
-		expect(ReactUtils.hydrateElWithoutStore).toHaveBeenCalledWith(PageModule, '#react-hydrate-root')
+		expect(ReactUtils.hydrateEl).toHaveBeenCalledWith(
+			PageModule,
+			AboutModuleReducer,
+			'#react-hydrate-root'
+		)
 	})
 })

packages/app/obojobo-repository/shared/components/pages/page-module-hoc.js

@@ -1,5 +1,6 @@
 const PageModule = require('./page-module')
 const connect = require('react-redux').connect
+/* istanbul ignore next */
 const mapStoreStateToProps = state => state
 module.exports = connect(
 	mapStoreStateToProps,

packages/app/obojobo-repository/shared/react-utils.js

@@ -6,8 +6,8 @@ const { middleware } = require('redux-pack')
 // if initial state contains a globals object, we need to copy
 // those globals into clientGlobals so that they can be loaded
 // as global constants anywhere in the application.
-function populateClientGlobals(initialState){
-	if(initialState.globals){
+function populateClientGlobals(initialState) {
+	if (initialState && initialState.globals) {
 		const clientGlobals = require('../shared/util/client-globals')
 		for (const property in initialState.globals) {
 			clientGlobals[property] = initialState.globals[property]

packages/app/obojobo-repository/shared/react-utils.test.js

@@ -5,6 +5,7 @@ jest.mock('react-redux', () => ({
 	Provider: jest.fn()
 }))
 jest.mock('redux-pack')
+jest.mock('../shared/util/client-globals')
 
 let React
 let Redux // { createStore, applyMiddleware }
@@ -32,7 +33,7 @@ describe('react utils', () => {
 		mockReducerFunction: jest.fn()
 	}
 	const mockMiddleware = { middlewareKey: 'middlewareProp' }
-	const mockStore = { storeKey: 'storeProp' }
+	const mockStore = { storeKey: 'storeProp', getState: jest.fn().mockReturnValue({}) }
 
 	beforeAll(() => {
 		global.ReactDOM = {
@@ -161,4 +162,18 @@ describe('react utils', () => {
 			desiredKeyTwo: 'desiredPropTwo'
 		})
 	})
+
+	test('populateClientGlobals ignores missing globals', () => {
+		const clientGlobals = require('../shared/util/client-globals')
+		expect(clientGlobals).not.toHaveProperty('key')
+		reactUtils.populateClientGlobals({ nonGlobals: { key: 'value' } })
+		expect(clientGlobals).not.toHaveProperty('key')
+	})
+
+	test('populateClientGlobals registers globals', () => {
+		const clientGlobals = require('../shared/util/client-globals')
+		expect(clientGlobals).not.toHaveProperty('key')
+		reactUtils.populateClientGlobals({ globals: { key: 'value' } })
+		expect(clientGlobals).toHaveProperty('key', 'value')
+	})
 })

packages/app/obojobo-repository/shared/reducers/about-module-reducer.js

@@ -1,4 +1,6 @@
-function AboutModuleReducer(state, action) {
+/* istanbul ignore next */
+function AboutModuleReducer(state) {
+	/* istanbul ignore next */
 	return state
 }