Merge branch 'stage' into update_cdk_jbrowse

alliance-genome · May 1, 2024 · c543694 · c543694
2 parents f632691 + 45caf96
commit c543694
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 35 deletions.
diff --git a/.github/workflows/github-actions-PR-validation.yml b/.github/workflows/github-actions-PR-validation.yml
@@ -32,5 +32,8 @@ jobs:
         run: npm install --legacy-peer-deps
       - name: Make Dist Folder
         run: mkdir dist
-      - name: Npm build
-        run: npm run build
+      - name: Run UI Tests and Build
+        run: |
+          npm run build
+          npm test -- --watchAll=false
+
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ nvm is used to manage Node.js versions. [Follow these instructions](https://gith
 Ensure the correct version of Node.js is **installed**, if using the particular version of Node.js for the first time:
 
 ```bash
-nvm install
+nvm install 
 ```
 
 _Note: the command uses **nvm**, not npm. Nvm deals with the version of Node.js itself._

diff --git a/bin/build_sitemap.js b/bin/build_sitemap.js
@@ -25,7 +25,8 @@ var sitemap = sm.createSitemap({
     { url: '/genome-features',      changefreq: 'monthly', priority: 0.7, lastmodrealtime: true },
     { url: '/administrative-supplement',    changefreq: 'monthly', priority: 0.7, lastmodrealtime: true },
     { url: '/phenotypes-and-disease-models',    changefreq: 'monthly', priority: 0.7, lastmodrealtime: true },
-    { url: '/submit-data',    changefreq: 'monthly', priority: 0.7, lastmodrealtime: true }
+    { url: '/submit-data',    changefreq: 'monthly', priority: 0.7, lastmodrealtime: true },
+    { url: '/textpresso',    changefreq: 'monthly', priority: 0.7, lastmodrealtime: true }
   ]
 });
 

diff --git a/src/constants.js b/src/constants.js
@@ -83,27 +83,31 @@ export const NAV_MENU = [
         route: '/swagger-ui',
         external: true,
       },
+      {
+        label: 'AllianceMine',
+        route: '/bluegenes/alliancemine',
+        external: true,
+      },
+      {
+        label: 'JBrowse 2',
+        route: '/jbrowse2/',
+        external: true,
+      },
       {
         label: 'Submit Data',
         route: '/submit-data',
       },
+      {
+        label: 'Textpresso',
+        route: '/textpresso',
+      },
       {
         label: 'Tools and Prototypes',
         route: '/prototypes',
       },
       {
         label: 'COVID-19 Information',
         route: '/coronavirus-resources',
-      },
-      {
-        label: 'AllianceMine',
-        route: '/bluegenes/alliancemine',
-        external: true,
-      },
-      {
-        label: 'JBrowse 2',
-        route: '/jbrowse2/',
-        external: true,
       }
     ]
   },

diff --git a/src/containers/modLanding/tests/Footer/fb_footer.test.js b/src/containers/modLanding/tests/Footer/fb_footer.test.js
@@ -39,10 +39,10 @@ describe('FlyBase footer tests', () => {
     for (let i=0; i<content.footer.length; i++){
 
          let footer = screen.getByTestId("href_footer_" + i);
-         expect(footer).toHaveAttribute('href', content.footer[i][1]);
+         expect(footer).toHaveAttribute('href', content.footer[i][2]);
 
          let label = screen.getByTestId('footer_label_' + i);
-         expect(label).toContainHTML(content.footer[i][0]);
+         expect(label).toContainHTML(content.footer[i][1]);
         }
    });
 

diff --git a/src/containers/modLanding/tests/Footer/go_footer.test.js b/src/containers/modLanding/tests/Footer/go_footer.test.js
@@ -39,10 +39,10 @@ describe('GO footer tests.', () => {
     for (let i=0; i<content.footer.length; i++){
 
          let footer = screen.getByTestId("href_footer_" + i);
-         expect(footer).toHaveAttribute('href', content.footer[i][1]);
+         expect(footer).toHaveAttribute('href', content.footer[i][2]);
 
          let label = screen.getByTestId('footer_label_' + i)
-         expect(label).toContainHTML(content.footer[i][0]);
+         expect(label).toContainHTML(content.footer[i][1]);
         }
    });
 

diff --git a/src/containers/modLanding/tests/Footer/mgi_footer.test.js b/src/containers/modLanding/tests/Footer/mgi_footer.test.js
@@ -39,10 +39,10 @@ describe('Mouse footer tests.', () => {
     for (let i=0; i<content.footer.length; i++){
 
          let footer = screen.getByTestId("href_footer_" + i);
-         expect(footer).toHaveAttribute('href', content.footer[i][1]);
+         expect(footer).toHaveAttribute('href', content.footer[i][2]);
 
          let label = screen.getByTestId('footer_label_' + i)
-         expect(label).toContainHTML(content.footer[i][0]);
+         expect(label).toContainHTML(content.footer[i][1]);
         }
    });
 

diff --git a/src/containers/modLanding/tests/Footer/rgd_footer.test.js b/src/containers/modLanding/tests/Footer/rgd_footer.test.js
@@ -39,10 +39,10 @@ describe('Rat footer tests', () => {
     for (let i=0; i<content.footer.length; i++){
 
          let footer = screen.getByTestId("href_footer_" + i);
-         expect(footer).toHaveAttribute('href', content.footer[i][1]);
+         expect(footer).toHaveAttribute('href', content.footer[i][2]);
 
          let label = screen.getByTestId('footer_label_' + i)
-         expect(label).toContainHTML(content.footer[i][0]);
+         expect(label).toContainHTML(content.footer[i][1]);
         }
    });
 

diff --git a/src/containers/modLanding/tests/Footer/sgd_footer.test.js b/src/containers/modLanding/tests/Footer/sgd_footer.test.js
@@ -39,10 +39,10 @@ describe('Yeast Footer', () => {
     for (let i=0; i<content.footer.length; i++){
 
          let footer = screen.getByTestId("href_footer_" + i);
-         expect(footer).toHaveAttribute('href', content.footer[i][1]);
+         expect(footer).toHaveAttribute('href', content.footer[i][2]);
 
          let label = screen.getByTestId('footer_label_' + i)
-         expect(label).toContainHTML(content.footer[i][0]);
+         expect(label).toContainHTML(content.footer[i][1]);
         }
    });
 

diff --git a/src/containers/modLanding/tests/Footer/wb_footer.test.js b/src/containers/modLanding/tests/Footer/wb_footer.test.js
@@ -39,10 +39,10 @@ describe('WormBase Footer', () => {
     for (let i=0; i<content.footer.length; i++){
 
          let footer = screen.getByTestId("href_footer_" + i);
-         expect(footer).toHaveAttribute('href', content.footer[i][1]);
+         expect(footer).toHaveAttribute('href', content.footer[i][2]);
 
          let label = screen.getByTestId('footer_label_' + i)
-         expect(label).toContainHTML(content.footer[i][0]);
+         expect(label).toContainHTML(content.footer[i][1]);
         }
    });
 

diff --git a/src/containers/modLanding/tests/Footer/zfin_footer.test.js b/src/containers/modLanding/tests/Footer/zfin_footer.test.js
@@ -39,10 +39,10 @@ describe('ZebraFish footer tests', () => {
     for (let i=0; i<content.footer.length; i++){
 
          let footer = screen.getByTestId("href_footer_" + i);
-         expect(footer).toHaveAttribute('href', content.footer[i][1]);
+         expect(footer).toHaveAttribute('href', content.footer[i][2]);
 
          let label = screen.getByTestId('footer_label_' + i)
-         expect(label).toContainHTML(content.footer[i][0]);
+         expect(label).toContainHTML(content.footer[i][1]);
         }
    });
 

diff --git a/src/containers/modLanding/tests/Meetings/meetings_link_only.test.js b/src/containers/modLanding/tests/Meetings/meetings_link_only.test.js
@@ -24,7 +24,7 @@ describe('wormbase static link to meetings', () => {
         expect(div).toContainElement(header2);
         expect(header2).toContainElement(link);
         expect(link).toHaveAttribute('href', content.meetingsURL);
-        expect(link).toHaveTextContent('Click here for the latest meetings from ' + content.modShortName);
+        expect(link).toHaveTextContent(`Discover upcoming ${content.modShortName} related meetings`);
 
     });
 });
diff --git a/src/containers/modLanding/tests/News/news_link_only.test.js b/src/containers/modLanding/tests/News/news_link_only.test.js
@@ -24,7 +24,7 @@ describe('goc static link to news', () => {
         expect(div).toContainElement(header2);
         expect(header2).toContainElement(link);
         expect(link).toHaveAttribute('href', content.newsURL);
-        expect(link).toHaveTextContent('Click here for the latest news from ' + content.modShortName);
+        expect(link).toHaveTextContent('Read the latest news from ' + content.modShortName);
 
     });
 });
diff --git a/src/tests/application.test.js b/src/tests/application.test.js
@@ -14,11 +14,12 @@ global.scrollTo = jest.fn();
 
 describe('ReactApp', () => {
   it('should be able to render to an HTML string', () => {
-    global.window = {
-      location: {
-        hostname: 'www.alliancegenome.org'
-      }
-    };
+    Object.defineProperty(global.window, 'location', {
+      value: {
+        hostname: 'www.alliancegenome.org',
+      },
+    });
+
     let htmlString = renderToString(
       <ReactApp router={MemoryRouter} />
     );