Merge branch 'GN-101-Fix-failing-tests' into GN-102-BNF-content

nice-digital · Sep 23, 2021 · 2fc7fe6 · 2fc7fe6
2 parents 9c1cfc0 + ed1511f
commit 2fc7fe6
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 80 deletions.
diff --git a/src/Header/Nav/Nav.test.jsx b/src/Header/Nav/Nav.test.jsx
@@ -18,6 +18,7 @@ describe("Nav", () => {
 		isExpanded: false,
 		accountsData: null,
 		service: null,
+		handleScrim: () => {},
 	};
 	const externalServices = services.external;
 

diff --git a/src/Header/Nav/__snapshots__/Nav.test.jsx.snap b/src/Header/Nav/__snapshots__/Nav.test.jsx.snap
@@ -57,6 +57,7 @@ exports[`Nav Matches snapshot with no accounts links 1`] = `
     >
       <NavLinks
         currentService={null}
+        handleScrim={[Function]}
         servicesToDisplay={
           Array [
             Object {
@@ -121,6 +122,7 @@ exports[`Nav Matches snapshot with sub links for selected external service 1`] =
 <Nav
   accountsData={null}
   additionalSubMenuItems={Array []}
+  handleScrim={[Function]}
   isExpanded={false}
   service="link2"
 >
@@ -137,6 +139,7 @@ exports[`Nav Matches snapshot with sub links for selected external service 1`] =
       >
         <NavLinks
           currentService="link2"
+          handleScrim={[Function]}
           servicesToDisplay={
             Array [
               Object {
@@ -287,6 +290,7 @@ exports[`Nav internalServices Matches snapshot with sub links for selected inter
 <Nav
   accountsData={null}
   additionalSubMenuItems={Array []}
+  handleScrim={[Function]}
   isExpanded={false}
   service="internal1"
 >
@@ -303,6 +307,7 @@ exports[`Nav internalServices Matches snapshot with sub links for selected inter
       >
         <NavLinks
           currentService="internal1"
+          handleScrim={[Function]}
           servicesToDisplay={
             Array [
               Object {

diff --git a/src/Header/__snapshots__/Header.test.jsx.snap b/src/Header/__snapshots__/Header.test.jsx.snap
@@ -1,95 +1,103 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Header Matches snapshot 1`] = `
-<div
-  className="header"
->
-  <header
-    aria-label="Site header"
+<Fragment>
+  <span
+    aria-hidden="true"
+    className={false}
+    id="scrim"
+  />
+  <div
+    className="header"
   >
-    <ul
-      aria-label="Accessibility links"
-      className="a11yLinks"
+    <header
+      aria-label="Site header"
     >
-      <li>
-        <SkipLink
-          to="#content-start"
-        >
-          Skip to content
-        </SkipLink>
-      </li>
-      <li>
-        <SkipLink
-          to="https://www.nice.org.uk/accessibility"
-        >
-          Accessibility help
-        </SkipLink>
-      </li>
-    </ul>
-    <div
-      className="container"
-    >
-      <a
-        aria-label="Home"
-        className="home"
-        href="https://www.nice.org.uk/"
-        onClick={[Function]}
+      <ul
+        aria-label="Accessibility links"
+        className="a11yLinks"
       >
-        <SvgLogoFull
-          className="icon"
-          height={null}
-          width={null}
-        />
-      </a>
+        <li>
+          <SkipLink
+            to="#content-start"
+          >
+            Skip to content
+          </SkipLink>
+        </li>
+        <li>
+          <SkipLink
+            to="https://www.nice.org.uk/accessibility"
+          >
+            Accessibility help
+          </SkipLink>
+        </li>
+      </ul>
       <div
-        className="wrapper"
+        className="container"
       >
-        <div
-          className="search"
-        >
-          <Search
-            onNavigating="onNavigatingHandler"
-            placeholder="Search NICE…"
-            query=""
-            skipLinkId="content-start"
-            url="/search"
-          />
-        </div>
-        <button
-          aria-controls="header-menu"
-          aria-expanded={false}
-          aria-haspopup="menu"
-          aria-label="Expand site menu"
-          className="mobileMenuBtn"
-          id="header-menu-button"
+        <a
+          aria-label="Home"
+          className="home"
+          href="https://www.nice.org.uk/"
           onClick={[Function]}
-          type="button"
         >
-          Menu
-        </button>
+          <SvgLogoFull
+            className="icon"
+            height={null}
+            width={null}
+          />
+        </a>
         <div
-          className="account"
+          className="wrapper"
         >
-          <Account
-            accountsData={null}
-            environment="live"
-            isLoggedIn={false}
-            onLoginStatusChecked={[Function]}
-            provider="niceAccounts"
-          />
+          <div
+            className="search"
+          >
+            <Search
+              onNavigating="onNavigatingHandler"
+              placeholder="Search NICE…"
+              query=""
+              skipLinkId="content-start"
+              url="/search"
+            />
+          </div>
+          <button
+            aria-controls="header-menu"
+            aria-expanded={false}
+            aria-haspopup="menu"
+            aria-label="Expand site menu"
+            className="mobileMenuBtn"
+            id="header-menu-button"
+            onClick={[Function]}
+            type="button"
+          >
+            Menu
+          </button>
+          <div
+            className="account"
+          >
+            <Account
+              accountsData={null}
+              environment="live"
+              isLoggedIn={false}
+              onLoginStatusChecked={[Function]}
+              provider="niceAccounts"
+            />
+          </div>
         </div>
       </div>
-    </div>
-    <Nav
-      accountsLinks={null}
-      additionalSubMenuItems={Array []}
-      isExpanded={false}
-      onNavigating="onNavigatingHandler"
-      service={null}
-      skipLinkId="content-start"
-    />
-  </header>
-  <CoronaMessage />
-  <OldIEMessage />
-</div>
+      <Nav
+        accountsLinks={null}
+        additionalSubMenuItems={Array []}
+        handleScrim={[Function]}
+        isExpanded={false}
+        onNavigating="onNavigatingHandler"
+        service={null}
+        skipLinkId="content-start"
+      />
+    </header>
+    <CoronaMessage />
+    <OldIEMessage />
+  </div>
+</Fragment>
 `;