Skip to content
Snippets Groups Projects
Commit 2759fccc authored by Chris Beer's avatar Chris Beer
Browse files

Remove explicit exports for state methods; expecting consumers to use the ES modules directly

parent eb278f01
No related branches found
No related tags found
No related merge requests found
/* global miradorInstance */
describe('Config updating from instance', () => {
beforeAll(async () => {
await page.goto('http://127.0.0.1:4488/__tests__/integration/mirador/');
});
it('can modify the config via api', async () => {
await page.evaluate(() => {
const a = miradorInstance.actions.updateConfig({ foo: 'bat' });
miradorInstance.store.dispatch(a);
});
const config = await page.evaluate(() => (
miradorInstance.store.getState().config
));
await expect(config.foo).toBe('bat');
});
});
......@@ -14,8 +14,7 @@ describe('Import/Export state', () => {
y: 1000,
zoom: 0.001,
};
const f = miradorInstance.actions.importMiradorState(state);
miradorInstance.store.dispatch(f);
miradorInstance.store.dispatch({ state, type: 'mirador/IMPORT_MIRADOR_STATE' });
return windows[0];
});
const mirador = await page.evaluate(() => miradorInstance.store.getState());
......
......@@ -22,14 +22,13 @@ describe('Thumbnail navigation', () => {
it('displays on right side', async () => {
await expect(page).toMatchElement('.mirador-thumb-navigation');
await expect(page).toMatchElement('.mirador-companion-area-far-bottom .mirador-thumb-navigation');
await page.evaluate(() => {
const windowId = await page.evaluate(() => {
const { windows } = miradorInstance.store.getState();
miradorInstance.store.dispatch(
miradorInstance.actions.setWindowThumbnailPosition(
Object.keys(windows)[0], 'far-right',
),
);
return Object.keys(windows)[0];
});
await expect(page).toClick(`#${windowId} button[aria-label="Window views & thumbnail display"]`);
await expect(page).toClick('li', { text: 'Right' });
await expect(page).toMatchElement('.mirador-companion-area-far-right .mirador-thumb-navigation');
});
});
......@@ -12,9 +12,6 @@ describe('MiradorViewer', () => {
instance = new MiradorViewer({});
});
describe('constructor', () => {
it('returns viewer actions', () => {
expect(instance.actions.addWindow).toBeDefined();
});
it('returns viewer store', () => {
expect(instance.store.dispatch).toBeDefined();
});
......
import init from './init';
import * as actions from './state/actions';
import * as selectors from './state/selectors';
export * from './state/reducers';
const exports = {
actions,
selectors,
viewer: init,
};
......
......@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom';
import { Provider } from 'react-redux';
import HotApp from '../components/App';
import createStore from '../state/createStore';
import * as actions from '../state/actions';
import { importConfig } from '../state/actions/config';
import {
filterValidPlugins,
getReducersFromPlugins,
......@@ -24,7 +24,6 @@ class MiradorViewer {
this.processConfig();
const viewer = {
actions,
store: this.store,
};
......@@ -42,9 +41,7 @@ class MiradorViewer {
* Process config into actions
*/
processConfig() {
/** merge type for arrays */
const action = actions.importConfig(this.config);
this.store.dispatch(action);
this.store.dispatch(importConfig(this.config));
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment