@internetarchive/bookreader 5.0.0-88-alpha.11 → 5.0.0-89

package/src/plugins/url/plugin.url.js

@@ -106,7 +106,7 @@ BookReader.prototype.urlStartLocationPolling = function() {
     this.trigger(BookReader.eventNames.stop);
     if (this.animating) {
       // Queue change if animating
-      if (this.autoStop) this.autoStop();
+      this._plugins.autoplay?.stop();
       this.animationFinishedCallback = updateParams;
     } else {
       // update immediately

package/src/util/strings.js

@@ -9,6 +9,7 @@
  * @param {StringWithVars|String} template
  * @param { {[varName: string]: { toString: () => string} } } vars
  * @param { {[varName: string]: { toString: () => string} } } [overrides]
+ * @returns {StringWithVars|string}
  */
 export function applyVariables(template, vars, overrides = {}, possibleFilters = APPLY_FILTERS) {
   return template?.replace(/\{\{([^}]*?)\}\}/g, ($0, $1) => {

package/tests/e2e/autoplay.test.js

@@ -2,12 +2,15 @@ import { ClientFunction } from 'testcafe';
 import params from './helpers/params';
 
 const getLocationHref = ClientFunction(() => window.location.href.toString());
-const FLIP_SPEED = 1000;
-const FIRST_PAGE_DELAY = 2000;
+const FLIP_SPEED = 200;
+const FLIP_DELAY = 500;
 
-fixture `Autoplay plugin`.page `${params.baseUrl}/BookReaderDemo/demo-internetarchive.html?ocaid=goody&autoflip=1`;
+fixture `Autoplay plugin`.page `${params.baseUrl}/BookReaderDemo/demo-internetarchive.html?ocaid=goody&autoflip=1&flipSpeed=${FLIP_SPEED}&flipDelay=${FLIP_DELAY}`;
 
 test('page auto-advances after allotted flip speed and delay', async t => {
-  await t.wait(2 * FLIP_SPEED + FIRST_PAGE_DELAY);
-  await t.expect(getLocationHref()).match(/page\/n3/);
+  // Flips from cover, to #page/n1 to #page/n3, etc
+  await t.expect(getLocationHref()).notMatch(/page\/n\d+/);
+  await t.wait(2 * (FLIP_SPEED + FLIP_DELAY) + 500);
+  // Don't check for a specific page; initial load time can vary
+  await t.expect(getLocationHref()).match(/page\/n\d+/);
 });

package/tests/e2e/helpers/base.js

@@ -78,8 +78,8 @@ export function runBaseTests (br) {
 
     // Check if uses plugin.resume.js
     const usesResume = ClientFunction(() => {
-      const hasResumePlugin = typeof(br.getResumeValue) !== "undefined";
-      const hasResumeValue = hasResumePlugin ? br.getResumeValue() : false;
+      const hasResumePlugin = typeof(br._plugins.resume) !== "undefined";
+      const hasResumeValue = hasResumePlugin ? br._plugins.resume.getResumeValue() : false;
       return hasResumeValue;
     });
 

package/tests/e2e/helpers/mockSearch.js

@@ -4,21 +4,18 @@ export const PAGE_FIRST_RESULT = 30;
 
 export const SEARCH_INSIDE_URL_RE  = /https:\/\/ia[0-9]+\.us\.archive\.org\/fulltext\/inside\.php\?item_id=.*/;
 
-//adding jQueryxxxxxxxx-xxxxxxxx (semi-random numbers) from request url to returned search request object
 /** Mock response for a matching search term. */
 export function mockResponseFound(req, res) {
-  const requestUrl = new URL(req.url);
-  const jqueryUrl = requestUrl.searchParams.get("callback");
-  const wholeString = jqueryUrl + '(' + JSON.stringify(MOCKED_RESPONSE_FOUND) + ')';
-  res.setBody(wholeString);
+  res.headers['Access-Control-Allow-Origin'] = '*';
+  res.headers['Content-Type'] = 'application/json';
+  res.setBody(JSON.stringify(MOCKED_RESPONSE_FOUND));
 }
 
 /** Mock response for a matching search term. */
 export function mockResponseNotFound(req, res) {
-  const requestUrl = new URL(req.url);
-  const jqueryUrl = requestUrl.searchParams.get("callback");
-  const wholeString = jqueryUrl + '(' + JSON.stringify(MOCKED_RESPONSE_NOT_FOUND) + ')';
-  res.setBody(wholeString);
+  res.headers['Access-Control-Allow-Origin'] = '*';
+  res.headers['Content-Type'] = 'application/json';
+  res.setBody(JSON.stringify(MOCKED_RESPONSE_NOT_FOUND));
 }
 
 const PAGE_FIRST_RESULT_ADJUSTED = PAGE_FIRST_RESULT + 12;

package/tests/jest/BookReader/Navbar/Navbar.test.js

@@ -4,17 +4,30 @@ import BookReader from '@/src/BookReader.js';
 
 describe('getNavPageNumHtml', () => {
   const f = getNavPageNumHtml;
-  test('handle n-prefixed page numbers', () => {
+
+  test('handle n-prefixed page numbers-min format', () => {
     expect(f(3, 40, 'n3', '', 40)).toBe('(4 of 40)');
   });
 
-  test('handle regular page numbers', () => {
+  test('handle regular page numbers-min format', () => {
     expect(f(3, 40, '14', '', 40)).toBe('14 of 40');
   });
 
-  test('handle no max page', () => {
+  test('handle no max page-min format', () => {
     expect(f(3, 40, '14', '', null)).toBe('14');
   });
+
+  test('handle n-prefixed page numbers-max format', () => {
+    expect(f(3, 40, 'n3', '', 40, true)).toBe('Page — (4/40)');
+  });
+
+  test('handle regular page numbers-max format', () => {
+    expect(f(3, 40, '14', '', 40, true)).toBe('Page 14 (4/40)');
+  });
+
+  test('handle no max page-max format', () => {
+    expect(f(3, 40, '14', '', null, true)).toBe('Page 14 (4/40)');
+  });
 });
 
 /** @type {BookReader} */

package/tests/jest/BookReader/PageContainer.test.js

@@ -1,4 +1,37 @@
 import {PageContainer, boxToSVGRect, createSVGPageLayer, renderBoxesInPageContainerLayer} from '@/src/BookReader/PageContainer.js';
+import {ImageCache} from '@/src/BookReader/ImageCache.js';
+import {BookModel} from '@/src/BookReader/BookModel.js';
+import { afterEventLoop } from '../utils.js';
+import sinon from 'sinon';
+/** @typedef {import('@/src/BookReader/options.js').BookReaderOptions} BookReaderOptions */
+
+const SAMPLE_BOOK = new BookModel(
+  {
+    data: [
+      [
+        { width: 123, height: 123, uri: 'https://archive.org/image0.jpg', pageNum: '1' },
+      ],
+      [
+        { width: 123, height: 123, uri: 'https://archive.org/image1.jpg', pageNum: '2' },
+        { width: 123, height: 123, uri: 'https://archive.org/image2.jpg', pageNum: '3' },
+      ],
+      [
+        { width: 123, height: 123, uri: 'https://archive.org/image3.jpg', pageNum: '4' },
+        { width: 123, height: 123, uri: 'https://archive.org/image4.jpg', pageNum: '5' },
+      ],
+      [
+        { width: 123, height: 123, uri: 'https://archive.org/image5.jpg', pageNum: '6' },
+      ],
+    ],
+  },
+);
+
+const realGetPageURI = SAMPLE_BOOK.getPageURI;
+SAMPLE_BOOK.getPageURI = function (index, reduce, rotate) {
+  // Need to add a reduce url parameter, since the src is used
+  // for caching
+  return realGetPageURI.call(SAMPLE_BOOK, index, reduce, rotate) + `?reduce=${reduce}`;
+};
 
 describe('constructor', () => {
   test('protected books', () => {
@@ -33,13 +66,15 @@ describe('constructor', () => {
 
 describe('update', () => {
   test('dimensions sets CSS', () => {
-    const pc = new PageContainer(null, {});
+    const imageCache = new ImageCache(SAMPLE_BOOK);
+    const pc = new PageContainer(null, {imageCache});
     pc.update({ dimensions: { left: 20 } });
     expect(pc.$container[0].style.left).toBe('20px');
   });
 
   test('does not create image if empty page', () => {
-    const pc = new PageContainer(null, {});
+    const imageCache = new ImageCache(SAMPLE_BOOK);
+    const pc = new PageContainer(null, {imageCache});
     pc.update({ reduce: null });
     expect(pc.$img).toBeNull();
     pc.update({ reduce: 7 });
@@ -47,71 +82,77 @@ describe('update', () => {
   });
 
   test('does not create image if no reduce', () => {
-    const pc = new PageContainer({index: 17}, {});
+    const imageCache = new ImageCache(SAMPLE_BOOK);
+    const pc = new PageContainer(SAMPLE_BOOK.getPage(3), {imageCache});
     pc.update({ reduce: null });
     expect(pc.$img).toBeNull();
   });
 
-  test('does not set background image if already loaded', () => {
-    const fakeImageCache = {
-      imageLoaded: () => true,
-      image: () => $('<img/>'),
-    };
-    const pc = new PageContainer({index: 12}, {imageCache: fakeImageCache});
-    pc.update({ reduce: 7 });
-    expect(pc.$img[0].style.background).toBe('');
+  test('loads image on initial load', () => {
+    const imageCache = new ImageCache(SAMPLE_BOOK);
+    const pc = new PageContainer(SAMPLE_BOOK.getPage(3), {imageCache});
+    pc.update({ reduce: 7 }); // This will load reduce=8 into memory
+    expect(pc.$container.hasClass('BRpageloading')).toBe(true);
+    expect(pc.$container.children('.BRpageimage').length).toBe(1);
+    pc.$img.trigger('load');
+    expect(pc.$container.hasClass('BRpageloading')).toBe(false);
+    expect(pc.$container.children('.BRpageimage').length).toBe(1);
   });
 
-  test('removes image between updates only if changed', () => {
-    const fakeImageCache = {
-      imageLoaded: () => true,
-      image: (index, reduce) => $(`<img src="page${index}-${reduce}.jpg" />`),
-    };
-    const pc = new PageContainer({index: 12}, {imageCache: fakeImageCache});
-    pc.update({ reduce: 7 });
-    const $im1 = pc.$img;
-    pc.update({ reduce: 7 });
-    expect(pc.$img).toBe($im1);
-    pc.update({ reduce: 16 });
-    expect(pc.$img).not.toBe($im1);
-    expect($im1.parent().length).toBe(0);
-  });
-
-  test('adds/removes loading indicators while loading', () => {
-    const fakeImageCache = {
-      imageLoaded: () => false,
-      image: () => $('<img/>'),
-      getBestLoadedReduce: () => undefined,
-    };
-    const pc = new PageContainer({index: 12}, {imageCache: fakeImageCache, loadingImage: 'loading.gif'});
-    pc.update({ reduce: 7 });
-    expect(pc.$container.hasClass('BRpageloading')).toBe(true);
-    // See https://github.com/jsdom/jsdom/issues/3169
-    // expect(pc.$img.css('background')).toBeTruthy();
-    // expect(pc.$img.css('background').includes('loading.gif')).toBe(true);
-    // expect(pc.$img.css('background').includes(',')).toBe(false);
+  test('does not set loading class if already loaded', () => {
+    const imageCache = new ImageCache(SAMPLE_BOOK);
+    const pc = new PageContainer(SAMPLE_BOOK.getPage(3), {imageCache});
+    pc.update({ reduce: 7 }); // This will load reduce=8 into memory
+    pc.$img.trigger('load');
+    pc.update({ reduce: 6 }); // This will still load reduce=8
+    expect(pc.$container.hasClass('BRpageloading')).toBe(false);
+    expect(pc.$container.children('.BRpageimage').length).toBe(1);
+  });
+
+  test('removes image between updates only if changed', async () => {
+    const clock = sinon.useFakeTimers();
+    const imageCache = new ImageCache(SAMPLE_BOOK);
+    const pc = new PageContainer(SAMPLE_BOOK.getPage(3), {imageCache});
 
-    pc.$img.trigger('loadend');
+    // load reduce=8
+    pc.update({ reduce: 7 });
+    pc.$img.trigger('load');
+    const img1 = pc.$img[0];
+
+    // Should not create a new image; same final reduce
+    pc.update({ reduce: 6 });
+    expect(pc.$img[0]).toBe(img1);
+    expect(pc.$container.children('.BRpageimage').length).toBe(1);
+
+    // Should create a new image; different reduce
+    pc.update({ reduce: 3 });
+    expect(pc.$img[0]).not.toBe(img1);
+    expect(pc.$container.children('.BRpageimage').length).toBe(2);
+
+    pc.$img.trigger('load');
+    // After loading we remove the old image; but not immediately!
+    expect(pc.$container.children('.BRpageimage').length).toBe(2);
     expect(pc.$container.hasClass('BRpageloading')).toBe(false);
-    expect(pc.$img.css('background')).toBeFalsy();
+    // increment time clock 100ms
+    clock.tick(100);
+    // wait for promises to resolve
+    clock.restore();
+    await afterEventLoop();
+    // NOW we remove the old image
+    expect(pc.$container.children('.BRpageimage').length).toBe(1);
   });
 
   test('shows lower res image while loading if one available', () => {
-    const fakeImageCache = {
-      imageLoaded: () => false,
-      image: () => $('<img/>'),
-      getBestLoadedReduce: () => 3,
-    };
-    const fakePage = {
-      index: 12,
-      getURI: () => 'page12.jpg',
-    };
-    const pc = new PageContainer(fakePage, {imageCache: fakeImageCache, loadingImage: 'loading.gif'});
+    const imageCache = new ImageCache(SAMPLE_BOOK);
+    const pc = new PageContainer(SAMPLE_BOOK.getPage(3), {imageCache});
     pc.update({ reduce: 7 });
-    // See https://github.com/jsdom/jsdom/issues/3169
-    // expect(pc.$img.css('background').includes('page12.jpg')).toBe(true);
-    pc.$img.trigger('loadend');
-    expect(pc.$img.css('background')).toBeFalsy();
+    pc.$img.trigger('load');
+
+    pc.update({reduce: 2});
+    expect(pc.$container.hasClass('BRpageloading')).toBe(true);
+    expect(pc.$container.children('.BRpageimage').length).toBe(2);
+    expect(pc.$container.children('.BRpageimage')[0].src).toContain('reduce=4');
+    expect(pc.$img[0].src).toContain('reduce=2');
   });
 });
 

package/tests/jest/BookReader/utils.test.js

@@ -10,6 +10,7 @@ import {
   escapeRegExp,
   getActiveElement,
   isInputActive,
+  parseAnimationSpeed,
   poll,
   polyfillCustomEvent,
   PolyfilledCustomEvent,
@@ -227,3 +228,23 @@ describe('escapeRegex', () => {
     expect(escapeRegExp('https://example.com')).toBe('https://example\\.com');
   });
 });
+
+describe('parseAnimationSpeed', () => {
+  test('Parses numbers', () => {
+    expect(parseAnimationSpeed(100)).toBe(100);
+    expect(parseAnimationSpeed(0)).toBe(0);
+    expect(parseAnimationSpeed(1000)).toBe(1000);
+  });
+
+  test('Parses strings', () => {
+    expect(parseAnimationSpeed('slow')).toBe(600);
+    expect(parseAnimationSpeed('fast')).toBe(200);
+    expect(parseAnimationSpeed('100')).toBe(100);
+  });
+
+  test('Handles invalid input', () => {
+    expect(parseAnimationSpeed('foo')).toBeFalsy();
+    expect(parseAnimationSpeed('')).toBeFalsy();
+    expect(parseAnimationSpeed(null)).toBeFalsy();
+  });
+});

package/tests/jest/BookReader.test.js

@@ -3,6 +3,7 @@ import BookReader, {_modeStringToNumber} from '@/src/BookReader.js';
 import '@/src/plugins/plugin.resume.js';
 import '@/src/plugins/url/plugin.url.js';
 
+/** @type {import('@/src/BookReader.js').default} */
 let br;
 beforeAll(() => {
   document.body.innerHTML = '<div id="BookReader">';
@@ -33,35 +34,35 @@ test('has registered fullscreen toggle event', () => {
 });
 
 test('checks cookie when initParams called', () => {
-  br.getResumeValue = jest.fn(() => 15);
+  br._plugins.resume.getResumeValue = jest.fn(() => 15);
   br.urlReadFragment = jest.fn(() => '');
 
   const params = br.initParams();
-  expect(br.getResumeValue).toHaveBeenCalledTimes(1);
+  expect(br._plugins.resume.getResumeValue).toHaveBeenCalledTimes(1);
   expect(params.init).toBe(true);
   expect(params.index).toBe(15);
   expect(params.fragmentChange).toBe(true);
 });
 
 test('does not check cookie when initParams called', () => {
-  br.getResumeValue = jest.fn(() => null);
+  br._plugins.resume.getResumeValue = jest.fn(() => null);
   br.urlReadFragment = jest.fn(() => '');
-  br.options.enablePageResume = false;
+  br.options.plugins.resume.enabled = false;
 
   const params = br.initParams();
-  expect(br.getResumeValue).toHaveBeenCalledTimes(0);
+  expect(br._plugins.resume.getResumeValue).toHaveBeenCalledTimes(0);
   expect(params.init).toBe(true);
   expect(params.index).toBe(0);
   expect(params.fragmentChange).toBe(false);
 });
 
 test('gets index from fragment when both fragment and cookie when InitParams called', () => {
-  br.getResumeValue = jest.fn(() => 15);
+  br._plugins.resume.getResumeValue = jest.fn(() => 15);
   br.urlReadFragment = jest.fn(() => 'page/n4');
-  br.options.enablePageResume = true;
+  br.options.plugins.resume.enabled = true;
 
   const params = br.initParams();
-  expect(br.getResumeValue).toHaveBeenCalledTimes(1);
+  expect(br._plugins.resume.getResumeValue).toHaveBeenCalledTimes(1);
   expect(params.init).toBe(true);
   expect(params.index).toBe(4);
   expect(params.fragmentChange).toBe(true);
@@ -91,7 +92,7 @@ test('calls switchMode with init option when init called', () => {
 });
 
 test('has suppressFragmentChange true when init with no input', () => {
-  br.getResumeValue = jest.fn(() => null);
+  br._plugins.resume.getResumeValue = jest.fn(() => null);
   br.urlReadFragment = jest.fn(() => '');
   br.urlReadHashFragment = jest.fn(() => '');
   br.switchMode = jest.fn();
@@ -102,7 +103,7 @@ test('has suppressFragmentChange true when init with no input', () => {
 });
 
 test('has suppressFragmentChange false when init with cookie', () => {
-  br.getResumeValue = jest.fn(() => 5);
+  br._plugins.resume.getResumeValue = jest.fn(() => 5);
   br.urlReadFragment = jest.fn(() => '');
   br.switchMode = jest.fn();
 
@@ -112,7 +113,7 @@ test('has suppressFragmentChange false when init with cookie', () => {
 });
 
 test('has suppressFragmentChange false when init with fragment', () => {
-  br.getResumeValue = jest.fn(() => null);
+  br._plugins.resume.getResumeValue = jest.fn(() => null);
   br.urlReadFragment = jest.fn(() => 'mode/1up');
   br.switchMode = jest.fn();
 
@@ -122,7 +123,7 @@ test('has suppressFragmentChange false when init with fragment', () => {
 });
 
 test('has suppressFragmentChange false when init with hash fragment', () => {
-  br.getResumeValue = jest.fn(() => null);
+  br._plugins.resume.getResumeValue = jest.fn(() => null);
   br.urlReadFragment = jest.fn(() => '');
   br.urlReadHashFragment = jest.fn(() => 'mode/1up');
   br.switchMode = jest.fn();

package/tests/jest/plugins/plugin.archive_analytics.test.js

@@ -1,23 +1,20 @@
 import sinon from 'sinon';
-import BookReader from '@/src/BookReader.js';
-import '@/src/plugins/plugin.archive_analytics.js';
-
-describe('archiveAnalyticsSendEvent', () => {
-  const sendEvent = BookReader.prototype.archiveAnalyticsSendEvent;
+import {ArchiveAnalyticsPlugin} from '@/src/plugins/plugin.archive_analytics.js';
 
+describe('sendEvent', () => {
   test('logs if debug set to true', () => {
     const stub = sinon.stub(console, 'log');
-    const FAKE_BR = { options: { enableArchiveAnalytics: true, debugArchiveAnaltyics: true }};
-    sendEvent.call(FAKE_BR);
+    const p = new ArchiveAnalyticsPlugin({});
+    p.setup({ debug: true });
+    p.sendEvent();
     expect(stub.callCount).toBe(1);
     stub.restore();
   });
 
   test('Does not error if window.archive_analytics is undefined', () => {
-    const spy = sinon.spy(sendEvent);
-    const FAKE_BR = { options: { enableArchiveAnalytics: true }};
-    spy.call(FAKE_BR);
+    const p = new ArchiveAnalyticsPlugin({});
+    const spy = sinon.spy(p.sendEvent);
+    p.sendEvent();
     expect(spy.threw()).toBe(false);
   });
 });
-

package/tests/jest/plugins/plugin.autoplay.test.js

@@ -2,12 +2,11 @@
 import BookReader from '@/src/BookReader.js';
 import '@/src/plugins/plugin.autoplay.js';
 
-
+/** @type {BookReader} */
 let br;
 beforeEach(() => {
   document.body.innerHTML = '<div id="BookReader">';
   br = new BookReader();
-  br.init();
 });
 
 afterEach(() => {
@@ -15,34 +14,22 @@ afterEach(() => {
 });
 
 describe('Plugin: Menu Toggle', () => {
-  test('has option flag', () => {
-    expect(BookReader.defaultOptions.enableAutoPlayPlugin).toEqual(true);
-  });
-  test('has added BR property: autoTimer', () => {
-    expect(br).toHaveProperty('autoTimer');
-    expect(br.autoTimer).toEqual(null);
-  });
-  test('has added BR property: flipDelay', () => {
-    expect(br).toHaveProperty('flipDelay');
-    expect(br.flipDelay).toBeTruthy();
-    expect(br.flipDelay).toBeGreaterThan(1);
-  });
   test('autoplay does not start when BookReaderInitializes', () => {
-    br.autoToggle = jest.fn();
+    br._plugins.autoplay.toggle = jest.fn();
     br.init();
-    expect(br.autoToggle).toHaveBeenCalledTimes(0);
+    expect(br._plugins.autoplay.toggle).toHaveBeenCalledTimes(0);
   });
   test('autoplay will run without `flipSpeed` parameters', () => {
-    const initialAutoTimer = br.autoTimer;
+    const initialTimer = br._plugins.autoplay.timer;
     br.next = jest.fn();
-    br.autoStop = jest.fn();
+    br._plugins.autoplay.stop = jest.fn();
     br.init();
-    br.autoToggle();
+    br._plugins.autoplay.toggle();
     // internally referenced functions that fire
     expect(br.next).toHaveBeenCalledTimes(1);
 
-    expect(initialAutoTimer).toBeFalsy();
-    // br.autoTimer changes when autoToggle turns on
-    expect(br.autoTimer).toBeTruthy();
+    expect(initialTimer).toBeFalsy();
+    // timer changes when autoplay turns on
+    expect(br._plugins.autoplay.timer).toBeTruthy();
   });
 });

package/tests/jest/plugins/plugin.resume.test.js

@@ -3,7 +3,9 @@ import '@/src/plugins/plugin.resume.js';
 
 import sinon from 'sinon';
 import * as docCookies from '@/src/util/docCookies.js';
+import { ResumePlugin } from '@/src/plugins/plugin.resume.js';
 
+/** @type {import('@/src/BookReader.js').default} */
 let br;
 beforeAll(() => {
   document.body.innerHTML = '<div id="BookReader">';
@@ -16,21 +18,6 @@ afterEach(() => {
   sinon.restore();
 });
 
-describe('Plugin: Remember Current Page in Cookies', () => {
-  test('has default option flag', () => {
-    expect(BookReader.defaultOptions.enablePageResume).toEqual(true);
-    expect(BookReader.defaultOptions.resumeCookiePath).toEqual(null);
-  });
-
-  test('has added BR property: getResumeValue', () => {
-    expect(br).toHaveProperty('getResumeValue');
-  });
-
-  test('has added BR property: updateResumeValue', () => {
-    expect(br).toHaveProperty('updateResumeValue');
-  });
-});
-
 describe('updateResumeValue', () => {
   /* Mark 2020-05-02
     Skipping while confirming with Neeraj
@@ -42,57 +29,57 @@ describe('updateResumeValue', () => {
     In this branch .toHaveBeenCalledTimes() === 1
   */
   test.skip('starts when BookReaderInit is called', () => {
-    br.updateResumeValue = jest.fn();
+    br._plugins.resume.updateResumeValue = jest.fn();
     br.init();
-    expect(br.updateResumeValue).toHaveBeenCalledTimes(2);
+    expect(br._plugins.resume.updateResumeValue).toHaveBeenCalledTimes(2);
   });
 
   test('handles cookieName=null', () => {
-    const { updateResumeValue } = BookReader.prototype;
+    const p = new ResumePlugin(null);
+    p.setup({ cookiePath: '/details/goody' });
     const setItemSpy = sinon.spy(docCookies, 'setItem');
-    const fakeBr = { options: { resumeCookiePath: '/details/goody' } };
 
-    updateResumeValue.call(fakeBr, 16);
+    p.updateResumeValue(16);
     expect(setItemSpy.callCount).toBe(1);
     expect(setItemSpy.args[0].slice(0, 2)).toEqual(['br-resume', 16]);
     expect(setItemSpy.args[0][3]).toEqual('/details/goody');
   });
 
-  test('handles resumeCookiePath not set', () => {
+  test('handles cookiePath not set', () => {
     const setItemSpy = sinon.spy(docCookies, 'setItem');
     // Save function
-    const saveFn = br.getCookiePath;
-    br.getCookiePath = jest.fn(() => '/details/foo');
-    br.updateResumeValue(16);
+    const saveFn = br._plugins.resume.getCookiePath;
+    br._plugins.resume.getCookiePath = jest.fn(() => '/details/foo');
+    br._plugins.resume.updateResumeValue(16);
     expect(setItemSpy.args[0][3]).toEqual('/details/foo');
     // Restore function
-    br.getCookiePath = saveFn;
+    br._plugins.resume.getCookiePath = saveFn;
   });
 
   test('handles cookie path from URL with decoration', () => {
     const complexPathWithPage = '/details/2008ELMValidityStudyFinalReportRevised/Executive%20Summary%20for%20the%20EPT%26ELM%20Validity%20Studie_20100603%20-%20Copy/page/n1/mode/2up';
     const complexPath = '/details/2008ELMValidityStudyFinalReportRevised/Executive%20Summary%20for%20the%20EPT%26ELM%20Validity%20Studie_20100603%20-%20Copy';
-    expect(br.getCookiePath(complexPathWithPage))
+    expect(br._plugins.resume.getCookiePath(complexPathWithPage))
       .toEqual(complexPath);
 
-    expect(br.getCookiePath('/details/item/mode/1up'))
+    expect(br._plugins.resume.getCookiePath('/details/item/mode/1up'))
       .toEqual('/details/item');
 
-    expect(br.getCookiePath('/details/item/inside/a/long/path/model/is/used'))
+    expect(br._plugins.resume.getCookiePath('/details/item/inside/a/long/path/model/is/used'))
       .toEqual('/details/item/inside/a/long/path/model/is/used');
 
-    expect(br.getCookiePath('/details/item/inside/a/long/path/mode/is/used'))
+    expect(br._plugins.resume.getCookiePath('/details/item/inside/a/long/path/mode/is/used'))
       .toEqual('/details/item/inside/a/long/path');
   });
 
   test('handles cookie path from URL with no decoration', () => {
-    expect(br.getCookiePath('/details/item'))
+    expect(br._plugins.resume.getCookiePath('/details/item'))
       .toEqual('/details/item');
 
-    expect(br.getCookiePath('/details/item/'))
+    expect(br._plugins.resume.getCookiePath('/details/item/'))
       .toEqual('/details/item/');
 
-    expect(br.getCookiePath('/details/item/almost/any/kind/of/long/path'))
+    expect(br._plugins.resume.getCookiePath('/details/item/almost/any/kind/of/long/path'))
       .toEqual('/details/item/almost/any/kind/of/long/path');
   });
 });