Merge 2de4db1 into f9af32b

README.md

@@ -5,7 +5,7 @@ Your personal **history** storyboarded with photo and video albums. Associate ph
 * Plot thumbnails on a map
 * Includes administration tools for XML generation
 
-[Demonstration site http://history.domaindesign.ca/](http://history.domaindesign.ca/)
+[Demonstration site https://history.domaindesign.ca/](https://history.domaindesign.ca/)
 ## Project Status:
 | Service | Status |
 |---|---|

ui/app/components/Button/tests/index.test.jsx

@@ -4,7 +4,7 @@ import { fireEvent, render } from '@testing-library/react';
 import Button from '../index';
 
 const handleRoute = () => {};
-const href = 'http://mxstbr.com';
+const href = 'https://history.domaindesign.ca';
 const children = <h1>Test</h1>;
 const renderComponent = (props = {}) => {
   const utils = render(

ui/app/components/ThumbImg/tests/index.test.jsx

@@ -33,7 +33,7 @@ describe('Component - <ThumbImg />', () => {
   test('should not adopt a srcset attribute', () => {
     const { container } = render(<ThumbImg srcset="test-HD.png 2x" />);
     const received = container.querySelector('img').srcset;
-    const expected = 'null';
+    const expected = '';
     expect(received).toEqual(expected);
   });
 });

ui/app/containers/AlbumViewPage/tests/saga.test.js

@@ -1,5 +1,5 @@
 import { Dropbox } from 'dropbox';
-import 'whatwg-fetch';
+import { fetch } from 'whatwg-fetch';
 
 import { call, put, select } from 'redux-saga/effects';
 
@@ -27,7 +27,7 @@ describe('AlbumViewPage Saga', () => {
         expect.hasAssertions();
         const received = generator.next().value;
         const expected = call(
-          [new Dropbox(), 'filesGetTemporaryLink'],
+          [new Dropbox({ fetch }), 'filesGetTemporaryLink'],
           argsAlbumXmlPath(fixtures),
         );
         // Unit test cannot reproduce global fetch so delete
@@ -103,7 +103,7 @@ describe('AlbumViewPage Saga', () => {
         expect.hasAssertions();
         const received = generator.next().value;
         const expected = call(
-          [new Dropbox(), 'filesGetTemporaryLink'],
+          [new Dropbox({ fetch }), 'filesGetTemporaryLink'],
           argsAlbumXmlPath(fixtures),
         );
         expect(received).toEqual(expected);

ui/app/containers/App/tests/__snapshots__/index.test.jsx.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<App /> should render and match the snapshot 1`] = `
-<ForwardRef(App__AppWrapper)>
+<App__AppWrapper>
   <Helmet
     defaultTitle="History"
     defer={true}
@@ -53,6 +53,6 @@ exports[`<App /> should render and match the snapshot 1`] = `
     />
   </Switch>
   <Footer />
-  <UNDEFINED />
-</ForwardRef(App__AppWrapper)>
+  <Memo(GlobalStyleComponent) />
+</App__AppWrapper>
 `;

ui/app/utils/localStorage.js

@@ -5,8 +5,15 @@ const logError = (...message) => console.error(...message);
 
 export function get(host) {
   try {
-    const json = JSON.parse(localStorage.getItem(hostKey));
-    return json[host];
+    if (localStorage) {
+      const json = JSON.parse(localStorage.getItem(hostKey));
+
+      if (json) {
+        return json[host];
+      }
+    }
+
+    return null;
   } catch (e) {
     logError(`Failed to get ${host} to localStorage ${hostKey}`, e);
     return null;
@@ -15,9 +22,14 @@ export function get(host) {
 
 export function update(host, value) {
   try {
-    const json = JSON.parse(localStorage.getItem(hostKey));
-    json[host] = value;
-    localStorage.setItem(hostKey, JSON.stringify(json));
+    if (localStorage) {
+      const json = JSON.parse(localStorage.getItem(hostKey));
+      if (json) {
+        json[host] = value;
+        localStorage.setItem(hostKey, JSON.stringify(json));
+        return;
+      }
+    }
   } catch (e) {
     const json = { [host]: value };
     localStorage.setItem(hostKey, JSON.stringify(json));
@@ -27,9 +39,11 @@ export function update(host, value) {
 
 export function remove(host) {
   try {
-    const json = JSON.parse(localStorage.getItem(hostKey));
-    delete json[host];
-    localStorage.setItem(hostKey, JSON.stringify(json));
+    if (localStorage) {
+      const json = JSON.parse(localStorage.getItem(hostKey));
+      delete json[host];
+      localStorage.setItem(hostKey, JSON.stringify(json));
+    }
   } catch (e) {
     logError(`Failed to remove ${host} from localStorage ${hostKey}`, e);
   }

ui/internals/templates/containers/App/tests/__snapshots__/index.test.jsx.snap

@@ -12,6 +12,6 @@ exports[`<App /> should render and match the snapshot 1`] = `
       component={[Function]}
     />
   </Switch>
-  <UNDEFINED />
+  <Memo(GlobalStyleComponent) />
 </div>
 `;