@internetarchive/bookreader 5.0.0-24-sortingstate-1 → 5.0.0-24-sortingstate-5

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

@@ -17,15 +17,6 @@ afterEach(() => {
 
 describe.only('UrlPlugin tests', () => {
   const urlPlugin = new UrlPlugin();
-  const urlSchema = [
-    { name: 'page', position: 'path', default: 'n0' },
-    { name: 'mode', position: 'path', default: '2up' },
-    { name: 'search', position: 'path', deprecated_for: 'q' },
-    { name: 'q', position: 'query_param' },
-    { name: 'sort', position: 'query_param' },
-    { name: 'view', position: 'query_param' },
-    { name: 'admin', position: 'query_param' },
-  ];
 
   describe('urlStateToUrlString tests', () => {
     test('urlStateToUrlString with known states in schema', () => {
@@ -35,8 +26,8 @@ describe.only('UrlPlugin tests', () => {
       const expectedUrlFromState = '/page/n7/mode/1up?q=foo';
       const expectedUrlFromStateWithQueries = '/page/n7/mode/1up?q=hello&view=theater&sort=title_asc';
 
-      expect(urlPlugin.urlStateToUrlString(urlSchema, urlState)).toBe(expectedUrlFromState);
-      expect(urlPlugin.urlStateToUrlString(urlSchema, urlStateWithQueries)).toBe(expectedUrlFromStateWithQueries);
+      expect(urlPlugin.urlStateToUrlString(urlState)).toBe(expectedUrlFromState);
+      expect(urlPlugin.urlStateToUrlString(urlStateWithQueries)).toBe(expectedUrlFromStateWithQueries);
     });
 
     test('urlStateToUrlString with unknown states in schema', () => {
@@ -46,15 +37,15 @@ describe.only('UrlPlugin tests', () => {
       const expectedUrlFromState = '/page/n7/mode/1up';
       const expectedUrlFromStateWithQueries = '/page/n7/mode/1up?q=hello&viewer=theater&sortBy=title_asc';
 
-      expect(urlPlugin.urlStateToUrlString(urlSchema, urlState)).toBe(expectedUrlFromState);
-      expect(urlPlugin.urlStateToUrlString(urlSchema, urlStateWithQueries)).toBe(expectedUrlFromStateWithQueries);
+      expect(urlPlugin.urlStateToUrlString(urlState)).toBe(expectedUrlFromState);
+      expect(urlPlugin.urlStateToUrlString(urlStateWithQueries)).toBe(expectedUrlFromStateWithQueries);
     });
 
     test('urlStateToUrlString with boolean value', () => {
       const urlState = { page: 'n7', mode: '1up', search: 'foo', view: 'theater', wrapper: false };
       const expectedUrlFromState = '/page/n7/mode/1up?q=foo&view=theater&wrapper=false';
 
-      expect(urlPlugin.urlStateToUrlString(urlSchema, urlState)).toBe(expectedUrlFromState);
+      expect(urlPlugin.urlStateToUrlString(urlState)).toBe(expectedUrlFromState);
     });
   });
 
@@ -63,24 +54,24 @@ describe.only('UrlPlugin tests', () => {
       const url = '/page/n7/mode/2up';
       const url1 = '/page/n7/mode/1up';
 
-      expect(urlPlugin.urlStringToUrlState(urlSchema, url)).toEqual({page: 'n7', mode: '2up'});
-      expect(urlPlugin.urlStringToUrlState(urlSchema, url1)).toEqual({page: 'n7', mode: '1up'});
+      expect(urlPlugin.urlStringToUrlState(url)).toEqual({page: 'n7', mode: '2up'});
+      expect(urlPlugin.urlStringToUrlState(url1)).toEqual({page: 'n7', mode: '1up'});
     });
 
     test('urlStringToUrlState with deprecated_for', () => {
       const url = '/page/n7/mode/2up/search/hello';
 
-      expect(urlPlugin.urlStringToUrlState(urlSchema, url)).toEqual({page: 'n7', mode: '2up', q: 'hello'});
+      expect(urlPlugin.urlStringToUrlState(url)).toEqual({page: 'n7', mode: '2up', q: 'hello'});
     });
 
     test('urlStringToUrlState with query string', () => {
       const url = '/page/n7/mode/2up/search/hello?view=theather&foo=bar&sort=title_asc';
       const url1 = '/mode/2up?ref=ol&ui=embed&wrapper=false&view=theater';
 
-      expect(urlPlugin.urlStringToUrlState(urlSchema, url)).toEqual(
+      expect(urlPlugin.urlStringToUrlState(url)).toEqual(
         {page: 'n7', mode: '2up', q: 'hello', view: 'theather', foo: 'bar', sort: 'title_asc'}
       );
-      expect(urlPlugin.urlStringToUrlState(urlSchema, url1)).toEqual(
+      expect(urlPlugin.urlStringToUrlState(url1)).toEqual(
         {page: 'n0', mode: '2up', ref: 'ol', ui: 'embed', wrapper: false, view: 'theater'}
       );
     });
@@ -89,7 +80,7 @@ describe.only('UrlPlugin tests', () => {
       const url = '/page/n7/mode/2up/search/hello';
       urlPlugin.urlState = { q: 'hello' };
 
-      expect(urlPlugin.urlStringToUrlState(urlSchema, url)).toEqual({page: 'n7', mode: '2up', q: 'hello'});
+      expect(urlPlugin.urlStringToUrlState(url)).toEqual({page: 'n7', mode: '2up', q: 'hello'});
     });
   });
 
@@ -123,7 +114,7 @@ describe.only('UrlPlugin tests', () => {
       urlPlugin.urlState = {};
       urlPlugin.urlMode = 'hash';
 
-      urlPlugin.pullFromAddressBar('/page/12');
+      urlPlugin.pullFromAddressBar({ pathname: '/page/12', search: '', hash: '' });
       expect(urlPlugin.urlState).toEqual({page: '12', mode: '2up'});
 
       urlPlugin.pushToAddressBar();
@@ -134,7 +125,7 @@ describe.only('UrlPlugin tests', () => {
       urlPlugin.urlState = {};
       urlPlugin.urlMode = 'hash';
 
-      urlPlugin.pullFromAddressBar('/page/12/search/hello?view=theater');
+      urlPlugin.pullFromAddressBar({ pathname: '/page/12', search: '?q=hello&view=theater', hash: '' });
       expect(urlPlugin.urlState).toEqual({page: '12', mode: '2up', q: 'hello', view: 'theater'});
 
       urlPlugin.pushToAddressBar();
@@ -148,7 +139,7 @@ describe.only('UrlPlugin tests', () => {
       urlPlugin.urlHistoryBasePath = '/details/foo';
       urlPlugin.urlMode = 'history';
 
-      urlPlugin.pullFromAddressBar('/details/foo/page/12');
+      urlPlugin.pullFromAddressBar({ pathname: '/details/foo/page/12', search: '', hash: '' });
       expect(urlPlugin.urlState).toEqual({page: '12', mode: '2up'});
 
       urlPlugin.pushToAddressBar();
@@ -160,7 +151,7 @@ describe.only('UrlPlugin tests', () => {
       urlPlugin.urlHistoryBasePath = '/details/foo';
       urlPlugin.urlMode = 'history';
 
-      urlPlugin.pullFromAddressBar('/details/foo/page/12/search/hello?view=theater');
+      urlPlugin.pullFromAddressBar({ pathname: '/details/foo/page/12', search: '?q=hello&view=theater', hash: '' });
       expect(urlPlugin.urlState).toEqual({page: '12', mode: '2up', q: 'hello', view: 'theater'});
 
       urlPlugin.pushToAddressBar();

package/tests/karma/BookNavigator/volumes/volumes-provider.test.js

@@ -64,7 +64,7 @@ describe('Volumes Provider', () => {
     const baseHost = "https://archive.org";
     const provider = new volumesProvider(baseHost, brOptions, onSortClick);
 
-    expect(provider.sortOrderBy).to.equal("default");
+    expect(provider.sortOrderBy).to.equal("orig_sort");
 
     provider.sortVolumes("title_asc");
     expect(provider.sortOrderBy).to.equal("title_asc");
@@ -74,8 +74,8 @@ describe('Volumes Provider', () => {
     expect(provider.sortOrderBy).to.equal("title_desc");
     expect(provider.sortButton.getHTML()).includes("sort-by desc-icon");
 
-    provider.sortVolumes("default");
-    expect(provider.sortOrderBy).to.equal("default");
+    provider.sortVolumes("orig_sort");
+    expect(provider.sortOrderBy).to.equal("orig_sort");
     expect(provider.sortButton.getHTML()).includes("sort-by neutral-icon");
   });
 
@@ -88,9 +88,9 @@ describe('Volumes Provider', () => {
     const files = Object.keys(parsedFiles).map(item => parsedFiles[item]).sort((a, b) => a.orig_sort - b.orig_sort);
     const origSortTitles = files.map(item => item.title);
 
-    provider.sortVolumes("default");
+    provider.sortVolumes("orig_sort");
 
-    expect(provider.sortOrderBy).to.equal("default");
+    expect(provider.sortOrderBy).to.equal("orig_sort");
     expect(provider.actionButton).to.exist;
 
     const providerFileTitles = provider.viewableFiles.map(item => item.title);
@@ -144,7 +144,7 @@ describe('Volumes Provider', () => {
       const baseHost = "https://archive.org";
       const provider = new volumesProvider(baseHost, brOptions, onSortClick);
 
-      provider.sortOrderBy = 'default';
+      provider.sortOrderBy = 'orig_sort';
       const origSortButton = await fixture(provider.sortButton);
       expect(origSortButton.classList.contains('neutral-icon')).to.be.true;