From 43f43f6c8ce1d31f530a54d204416f3ae468383c Mon Sep 17 00:00:00 2001
From: Glenn Fischer <gfischer@ub.uni-leipzig.de>
Date: Thu, 14 Mar 2019 09:47:31 +0100
Subject: [PATCH] #2144: replaces html special char by unicode number, adds
test
---
__tests__/src/components/ViewerInfo.test.js | 28 +++++++++++++++++++
__tests__/src/components/WindowViewer.test.js | 1 +
src/components/ViewerInfo.js | 5 +---
3 files changed, 30 insertions(+), 4 deletions(-)
create mode 100644 __tests__/src/components/ViewerInfo.test.js
diff --git a/__tests__/src/components/ViewerInfo.test.js b/__tests__/src/components/ViewerInfo.test.js
new file mode 100644
index 000000000..357d0392d
--- /dev/null
+++ b/__tests__/src/components/ViewerInfo.test.js
@@ -0,0 +1,28 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import { Typography } from '@material-ui/core';
+import { ViewerInfo } from '../../../src/components/ViewerInfo';
+
+/** create wrapper */
+function createWrapper(props) {
+ return shallow(
+ <ViewerInfo
+ canvasCount={8}
+ canvasIndex={2}
+ canvasLabel="testLabel"
+ t={k => k}
+ {...props}
+ />,
+ );
+}
+
+describe('ViewerNavigation', () => {
+ let wrapper;
+
+ it('renders the component', () => {
+ wrapper = createWrapper();
+ expect(wrapper.find(Typography).length).toBe(1);
+ expect(wrapper.find(Typography).at(0)
+ .matchesElement(<Typography>3 of 8 • testLabel</Typography>)).toBe(true);
+ });
+});
diff --git a/__tests__/src/components/WindowViewer.test.js b/__tests__/src/components/WindowViewer.test.js
index 19054e8b1..1b2109690 100644
--- a/__tests__/src/components/WindowViewer.test.js
+++ b/__tests__/src/components/WindowViewer.test.js
@@ -7,6 +7,7 @@ import WindowCanvasNavigationControls from '../../../src/containers/WindowCanvas
import fixture from '../../fixtures/version-2/019.json';
import emptyCanvasFixture from '../../fixtures/version-2/emptyCanvas.json';
import otherContentFixture from '../../fixtures/version-2/299843.json';
+import ViewerInfo from '../../../src/containers/ViewerInfo';
let mockManifest = {
id: 123,
diff --git a/src/components/ViewerInfo.js b/src/components/ViewerInfo.js
index 31c2acd73..94c1b361f 100644
--- a/src/components/ViewerInfo.js
+++ b/src/components/ViewerInfo.js
@@ -20,10 +20,7 @@ export class ViewerInfo extends Component {
<div className={ns('osd-info')}>
<Typography variant="caption" className={ns('canvas-label')}>
{`${canvasIndex + 1} ${t('of')} ${canvasCount}`}
- {
- // eslint-disable-next-line prefer-template
- canvasLabel && ' • ' + canvasLabel
- }
+ {canvasLabel && ` ${String.fromCharCode(8226)} ${canvasLabel}`}
</Typography>
</div>
);
--
GitLab