@internetarchive/bookreader 5.0.0-8 → 5.0.0-80

package/tests/e2e/models/Navigation.js

@@ -5,52 +5,35 @@ export default class Navigation {
   constructor() {
     this.topNavShell = new Selector('.BRtoolbar');
     this.bottomNavShell = new Selector('.BRfooter');
-    this.mobileMenu = new Selector('.BRmobileMenu');
-    this.desktop = new DesktopNav(this.bottomNavShell, this.topNavShell);
-    this.mobile = new MobileNav(this.mobileMenu, this.topNavShell);
-  }
-}
+    this.itemNav = Selector('ia-bookreader').shadowRoot().find('iaux-item-navigator').shadowRoot();
 
-/**
- * DesktopNav Model
- * @class
- * @classdesc defines DesktopNav base elements
- */
-class DesktopNav {
-  constructor(bottomToolbar, topToolbar) {
     // flipping
-    this.goLeft = bottomToolbar.find('.BRicon.book_left');
-    this.goRight = bottomToolbar.find('.BRicon.book_right');
-    this.goNext = bottomToolbar.find('.BRicon.book_flip_next');
-    this.goPrev = bottomToolbar.find('.BRicon.book_flip_prev');
+    this.goLeft = this.bottomNavShell.find('.BRicon.book_left');
+    this.goRight = this.bottomNavShell.find('.BRicon.book_right');
+    this.goNext = this.bottomNavShell.find('.BRicon.book_flip_next');
+    this.goPrev = this.bottomNavShell.find('.BRicon.book_flip_prev');
 
     // mode switching
-    this.mode1Up = bottomToolbar.find('.BRicon.onepg');
-    this.mode2Up = bottomToolbar.find('.BRicon.twopg');
-    this.modeThumb = bottomToolbar.find('.BRicon.thumb');
-    this.viewmode = bottomToolbar.find('.BRicon.viewmode');
+    this.mode1Up = this.bottomNavShell.find('.BRicon.onepg');
+    this.mode2Up = this.bottomNavShell.find('.BRicon.twopg');
+    this.modeThumb = this.bottomNavShell.find('.BRicon.thumb');
+    this.viewmode = this.bottomNavShell.find('.BRicon.viewmode');
 
     // zoom
-    this.zoomIn = bottomToolbar.find('.BRicon.zoom_in');
-    this.zoomOut = bottomToolbar.find('.BRicon.zoom_out');
+    this.zoomIn = this.bottomNavShell.find('.BRicon.zoom_in');
+    this.zoomOut = this.bottomNavShell.find('.BRicon.zoom_out');
 
     // search
-    this.searchBox = topToolbar.find('.BRbooksearch.desktop');
-    this.searchPin = bottomToolbar.find('.BRsearch');
-    this.searchNavigation = bottomToolbar.find('.BRsearch-navigation');
+    this.searchIcon = this.itemNav.find('button.shortcut.search');
+    this.searchBox = this.itemNav
+      .find('ia-menu-slider').shadowRoot()
+      .find('ia-book-search-results').shadowRoot()
+      .find('input[name=query]');
+    this.searchPin = this.bottomNavShell.find('.BRsearch');
+    this.searchNavigation = this.bottomNavShell.find('.BRsearch-navigation');
 
     // other
-    this.fullScreen = bottomToolbar.find('.BRicon.full');
-    this.sliderRange = bottomToolbar.find('.ui-slider-range');
-  }
-}
-
-class MobileNav {
-  constructor(mobileMenu, topToolbar) {
-    this.hamburgerButton = topToolbar.find('.BRmobileHamburger');
-    this.menuSearchButton = mobileMenu.find('.BRmobileMenu__search');
-    this.searchBox = mobileMenu.find('#BRsearch_tray');
-    this.searchResults = mobileMenu.find('[data-id="results"]');
-    this.searchResultText = this.searchResults.child(0).find('p');
+    this.fullScreen = this.bottomNavShell.find('.BRicon.full');
+    this.sliderRange = this.bottomNavShell.find('.ui-slider-range');
   }
 }

package/tests/e2e/rightToLeft.test.js

@@ -1,16 +1,15 @@
 import { runBaseTests } from './helpers/base';
 import { runRightToLeftTests } from './helpers/rightToLeft';
+import params from './helpers/params';
 
 import BookReader from './models/BookReader';
 
-const { BASE_URL } = process.env;
-const DEMO_PATH = 'demo-internetarchive.html?ocaid=';
-const OCAIDS = [
+const ocaids = params.ocaids || [
   'gendaitankashu00meijuoft', // Right to Left book
 ];
 
-OCAIDS.forEach(ocaid => {
-  const url = `${BASE_URL}${DEMO_PATH}${ocaid}`;
+ocaids.forEach(ocaid => {
+  const url = `${params.getArchiveUrl(ocaid)}`;
 
   fixture `Base Tests for right to left book: ${ocaid}`.page `${url}`;
   runBaseTests(new BookReader({ pageProgression: 'rl' }));

package/tests/e2e/viewmode.test.js

@@ -1,37 +1,44 @@
 import { Selector } from 'testcafe';
 import BookReader from './models/BookReader';
+import params from './helpers/params';
 
-const { BASE_URL } = process.env;
-
-fixture `Viewmode carousel`.page `${BASE_URL}viewmode-cycle.html`;
-
-test('Clicking `view mode` cycles through view modes', async t => {
-  const { nav } = (new BookReader());
-
-  // viewmode button only appear on mobile devices
-  await t.resizeWindow(400, 800);
-  // Flip forward one
-  await t.pressKey('right');
-
-  // 2up to thumb
-  await t.click(nav.desktop.viewmode);
-  const thumbnailContainer = Selector('.BRmodeThumb');
-  await t.expect(thumbnailContainer.visible).ok();
-  const thumbImages = thumbnailContainer.find('.BRpageview img');
-  await t.expect(thumbImages.count).gt(0);
-
-  // thumb to 1up
-  await t.click(nav.desktop.viewmode);
-  const onePageViewContainer = Selector('.BRpageview');
-  await t.expect(onePageViewContainer.visible).ok();
-  const onePageImages = onePageViewContainer.find('.BRmode1up .BRpagecontainer');
-  // we usually pre-fetch the page in question & 1 before/after it
-  await t.expect(onePageImages.count).gte(3);
-
-  // 1up to 2up
-  await t.click(nav.desktop.viewmode);
-  const twoPageContainer = Selector('.BRtwopageview');
-  await t.expect(twoPageContainer.visible).ok();
-  const twoPageImages = twoPageContainer.find('img.BRpageimage');
-  await t.expect(twoPageImages.count).gte(2);
+const ocaids = params.ocaids || ['goody'];
+
+ocaids.forEach(ocaid => {
+  const url = params.getArchiveUrl(ocaid);
+
+  fixture `Viewmode carousel`.page `${url}`;
+
+  test('Clicking `view mode` cycles through view modes', async t => {
+    const { nav } = (new BookReader());
+
+    // viewmode button only appear on mobile devices
+    await t.resizeWindow(400, 800);
+    // Flip forward one
+    await t.pressKey('right');
+    await t.pressKey('right');
+    await t.pressKey('right');
+
+    // 1up to 2up
+    await t.click(nav.viewmode);
+    const twoPageContainer = Selector('.BRmode2up');
+    await t.expect(twoPageContainer.visible).ok();
+    const twoPageImages = twoPageContainer.find('img.BRpageimage');
+    await t.expect(twoPageImages.count).gte(2);
+
+    // 2up to thumb
+    await t.click(nav.viewmode);
+    const thumbnailContainer = Selector('.BRmodeThumb');
+    await t.expect(thumbnailContainer.visible).ok();
+    const thumbImages = thumbnailContainer.find('.BRpageview img');
+    await t.expect(thumbImages.count).gt(0);
+
+    // thumb to 1up
+    await t.click(nav.viewmode);
+    const onePageViewContainer = Selector('br-mode-1up');
+    await t.expect(onePageViewContainer.visible).ok();
+    const onePageImages = onePageViewContainer.find('.BRmode1up .BRpagecontainer');
+    // we usually pre-fetch the page in question & 1 before/after it
+    await t.expect(onePageImages.count).gte(2);
+  });
 });