Fixed snapshot failures. (#311)

* Cherry-picked 2.2 commits. (#306) * Bumping 2.x branch from version 2.1 to 2.2. Bumped terser version to 4.8.1 to address CVE. (#301) Signed-off-by: AWSHurneyt <[email protected]> * Added 2.2 release notes. (#302) * Added 2.2 release notes. Signed-off-by: AWSHurneyt <[email protected]> * Added 2.2 release notes. Signed-off-by: AWSHurneyt <[email protected]> * Refactored test workflows to run on all branches. Signed-off-by: AWSHurneyt <[email protected]> * Refactored test workflows to run on all branches. Signed-off-by: AWSHurneyt <[email protected]> * Fixed failing snapshot tests. Signed-off-by: AWSHurneyt <[email protected]> Signed-off-by: AWSHurneyt <[email protected]> * Adjusted OSD version used by unit and cypress test workflows. Signed-off-by: AWSHurneyt <[email protected]> Signed-off-by: AWSHurneyt <[email protected]>
opensearch-project · Aug 18, 2022 · 2b7b2b2 · 2b7b2b2
1 parent 26a8aee
commit 2b7b2b2
Show file tree

Hide file tree

Showing 29 changed files with 1,931 additions and 397 deletions.
diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml
@@ -2,16 +2,12 @@ name: E2E Cypress tests
 on:
   pull_request:
     branches:
-      - main
-      - 1.x
-      - 2.*
+      - "*"
   push:
     branches:
-      - main
-      - 1.x
-      - 2.*
+      - "*"
 env:
-  OPENSEARCH_DASHBOARDS_VERSION: '2.x'
+  OPENSEARCH_DASHBOARDS_VERSION: '2.2'
   OPENSEARCH_VERSION: '2.2.0-SNAPSHOT'
 jobs:
   tests:

diff --git a/.github/workflows/unit-tests-workflow.yml b/.github/workflows/unit-tests-workflow.yml
@@ -2,16 +2,12 @@ name: Unit tests workflow
 on:
   push:
     branches:
-      - main
-      - 1.x
-      - 2.*
+      - "*"
   pull_request:
     branches:
-      - main
-      - 1.x
-      - 2.*
+      - "*"
 env:
-  OPENSEARCH_DASHBOARDS_VERSION: '2.x'
+  OPENSEARCH_DASHBOARDS_VERSION: '2.2'
 jobs:
   tests:
     name: Run unit tests

diff --git a/...omponents/FormControls/FormikFieldPassword/__snapshots__/FormikFieldPassword.test.js.snap b/...omponents/FormControls/FormikFieldPassword/__snapshots__/FormikFieldPassword.test.js.snap
@@ -18,9 +18,16 @@ exports[`FormikFieldPassword renders 1`] = `
       <span
         class="euiFormControlLayoutCustomIcon"
       >
-        <div>
-          EuiIconMock
-        </div>
+        <svg
+          aria-hidden="true"
+          class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+          focusable="false"
+          height="16"
+          role="img"
+          viewBox="0 0 16 16"
+          width="16"
+          xmlns="http://www.w3.org/2000/svg"
+        />
       </span>
     </div>
   </div>

diff --git a/public/components/FormControls/FormikSelect/__snapshots__/FormikSelect.test.js.snap b/public/components/FormControls/FormikSelect/__snapshots__/FormikSelect.test.js.snap
@@ -24,9 +24,16 @@ exports[`FormikSelect renders 1`] = `
       <span
         class="euiFormControlLayoutCustomIcon"
       >
-        <div>
-          EuiIconMock
-        </div>
+        <svg
+          aria-hidden="true"
+          class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+          focusable="false"
+          height="16"
+          role="img"
+          viewBox="0 0 16 16"
+          width="16"
+          xmlns="http://www.w3.org/2000/svg"
+        />
       </span>
     </div>
   </div>

diff --git a/public/components/FormControls/FormikSwitch/__snapshots__/FormikSwitch.test.js.snap b/public/components/FormControls/FormikSwitch/__snapshots__/FormikSwitch.test.js.snap
@@ -22,12 +22,26 @@ exports[`FormikSwitch renders 1`] = `
       <span
         class="euiSwitch__track"
       >
-        <div>
-          EuiIconMock
-        </div>
-        <div>
-          EuiIconMock
-        </div>
+        <svg
+          aria-hidden="true"
+          class="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon"
+          focusable="false"
+          height="16"
+          role="img"
+          viewBox="0 0 16 16"
+          width="16"
+          xmlns="http://www.w3.org/2000/svg"
+        />
+        <svg
+          aria-hidden="true"
+          class="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon euiSwitch__icon--checked"
+          focusable="false"
+          height="16"
+          role="img"
+          viewBox="0 0 16 16"
+          width="16"
+          xmlns="http://www.w3.org/2000/svg"
+        />
       </span>
     </span>
   </button>

diff --git a/public/components/IconToolTip/__snapshots__/IconToolTip.test.js.snap b/public/components/IconToolTip/__snapshots__/IconToolTip.test.js.snap
@@ -4,8 +4,15 @@ exports[`IconToolTip renders 1`] = `
 <span
   class="euiToolTipAnchor"
 >
-  <div>
-    EuiIconMock
-  </div>
+  <svg
+    aria-hidden="true"
+    class="euiIcon euiIcon--medium euiIcon-isLoading"
+    focusable="false"
+    height="16"
+    role="img"
+    viewBox="0 0 16 16"
+    width="16"
+    xmlns="http://www.w3.org/2000/svg"
+  />
 </span>
 `;
diff --git a/...Monitor/components/ClusterMetricsMonitor/__snapshots__/ClusterMetricsMonitor.test.js.snap b/...Monitor/components/ClusterMetricsMonitor/__snapshots__/ClusterMetricsMonitor.test.js.snap
@@ -39,9 +39,17 @@ exports[`ClusterMetricsMonitor renders 1`] = `
                 target="_blank"
               >
                 Learn more
-                <div>
-                  EuiIconMock
-                </div>
+                <svg
+                  aria-hidden="true"
+                  aria-label="External link"
+                  class="euiIcon euiIcon--small euiIcon-isLoading euiLink__externalIcon"
+                  focusable="false"
+                  height="16"
+                  role="img"
+                  viewBox="0 0 16 16"
+                  width="16"
+                  xmlns="http://www.w3.org/2000/svg"
+                />
                 <span
                   class="euiScreenReaderOnly"
                 >
@@ -106,9 +114,16 @@ exports[`ClusterMetricsMonitor renders 1`] = `
                 data-test-subj="comboBoxToggleListButton"
                 type="button"
               >
-                <div>
-                  EuiIconMock
-                </div>
+                <svg
+                  aria-hidden="true"
+                  class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                  focusable="false"
+                  height="16"
+                  role="img"
+                  viewBox="0 0 16 16"
+                  width="16"
+                  xmlns="http://www.w3.org/2000/svg"
+                />
               </button>
             </div>
           </div>

diff --git a/...s/CreateMonitor/components/MonitorDefinition/__snapshots__/MonitorDefinition.test.js.snap b/...s/CreateMonitor/components/MonitorDefinition/__snapshots__/MonitorDefinition.test.js.snap
@@ -48,9 +48,16 @@ exports[`MonitorDefinition renders 1`] = `
             <span
               class="euiFormControlLayoutCustomIcon"
             >
-              <div>
-                EuiIconMock
-              </div>
+              <svg
+                aria-hidden="true"
+                class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                focusable="false"
+                height="16"
+                role="img"
+                viewBox="0 0 16 16"
+                width="16"
+                xmlns="http://www.w3.org/2000/svg"
+              />
             </span>
           </div>
         </div>

diff --git a/...Monitor/components/MonitorDefinitionCard/__snapshots__/MonitorDefinitionCard.test.js.snap b/...Monitor/components/MonitorDefinitionCard/__snapshots__/MonitorDefinitionCard.test.js.snap
@@ -24,9 +24,17 @@ exports[`MonitorDefinitionCard renders without AD plugin 1`] = `
         target="_blank"
       >
         Learn more
-        <div>
-          EuiIconMock
-        </div>
+        <svg
+          aria-hidden="true"
+          aria-label="External link"
+          class="euiIcon euiIcon--small euiIcon-isLoading euiLink__externalIcon"
+          focusable="false"
+          height="16"
+          role="img"
+          viewBox="0 0 16 16"
+          width="16"
+          xmlns="http://www.w3.org/2000/svg"
+        />
         <span
           class="euiScreenReaderOnly"
         >
@@ -161,9 +169,20 @@ exports[`MonitorDefinitionCard renders without AD plugin 2`] = `
         target="_blank"
       >
         Learn more
-        <div>
-          EuiIconMock
-        </div>
+        <svg
+          aria-label="External link"
+          class="euiIcon euiIcon--small euiLink__externalIcon"
+          focusable="false"
+          height="16"
+          role="img"
+          viewBox="0 0 16 16"
+          width="16"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M13 8.5a.5.5 0 111 0V12a2 2 0 01-2 2H4a2 2 0 01-2-2V4a2 2 0 012-2h3.5a.5.5 0 010 1H4a1 1 0 00-1 1v8a1 1 0 001 1h8a1 1 0 001-1V8.5zm-5.12.339a.5.5 0 11-.706-.707L13.305 2H10.5a.5.5 0 110-1H14a1 1 0 011 1v3.5a.5.5 0 11-1 0V2.72L7.88 8.838z"
+          />
+        </svg>
         <span
           class="euiScreenReaderOnly"
         >

diff --git a/...CreateMonitor/components/MonitorExpressions/__snapshots__/MonitorExpressions.test.js.snap b/...CreateMonitor/components/MonitorExpressions/__snapshots__/MonitorExpressions.test.js.snap
@@ -17,9 +17,16 @@ exports[`MonitorExpressions renders 1`] = `
       <span
         class="euiToolTipAnchor"
       >
-        <div>
-          EuiIconMock
-        </div>
+        <svg
+          aria-hidden="true"
+          class="euiIcon euiIcon--medium euiIcon-isLoading"
+          focusable="false"
+          height="16"
+          role="img"
+          viewBox="0 0 16 16"
+          width="16"
+          xmlns="http://www.w3.org/2000/svg"
+        />
       </span>
     </div>
     <div
@@ -93,9 +100,16 @@ exports[`MonitorExpressions renders 1`] = `
       <span
         class="euiToolTipAnchor"
       >
-        <div>
-          EuiIconMock
-        </div>
+        <svg
+          aria-hidden="true"
+          class="euiIcon euiIcon--medium euiIcon-isLoading"
+          focusable="false"
+          height="16"
+          role="img"
+          viewBox="0 0 16 16"
+          width="16"
+          xmlns="http://www.w3.org/2000/svg"
+        />
       </span>
     </div>
     <div
@@ -172,9 +186,16 @@ exports[`MonitorExpressions renders 1`] = `
               <span
                 class="euiFormControlLayoutCustomIcon"
               >
-                <div>
-                  EuiIconMock
-                </div>
+                <svg
+                  aria-hidden="true"
+                  class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                  focusable="false"
+                  height="16"
+                  role="img"
+                  viewBox="0 0 16 16"
+                  width="16"
+                  xmlns="http://www.w3.org/2000/svg"
+                />
               </span>
             </div>
           </div>
@@ -198,9 +219,16 @@ exports[`MonitorExpressions renders 1`] = `
       <span
         class="euiToolTipAnchor"
       >
-        <div>
-          EuiIconMock
-        </div>
+        <svg
+          aria-hidden="true"
+          class="euiIcon euiIcon--medium euiIcon-isLoading"
+          focusable="false"
+          height="16"
+          role="img"
+          viewBox="0 0 16 16"
+          width="16"
+          xmlns="http://www.w3.org/2000/svg"
+        />
       </span>
     </div>
     <div
@@ -258,9 +286,16 @@ exports[`MonitorExpressions renders 1`] = `
       <span
         class="euiToolTipAnchor"
       >
-        <div>
-          EuiIconMock
-        </div>
+        <svg
+          aria-hidden="true"
+          class="euiIcon euiIcon--medium euiIcon-isLoading"
+          focusable="false"
+          height="16"
+          role="img"
+          viewBox="0 0 16 16"
+          width="16"
+          xmlns="http://www.w3.org/2000/svg"
+        />
       </span>
     </div>
     <div

diff --git a/...onitor/components/MonitorExpressions/expressions/__snapshots__/ForExpression.test.js.snap b/...onitor/components/MonitorExpressions/expressions/__snapshots__/ForExpression.test.js.snap
@@ -11,9 +11,16 @@ exports[`ForExpression renders 1`] = `
     <span
       class="euiToolTipAnchor"
     >
-      <div>
-        EuiIconMock
-      </div>
+      <svg
+        aria-hidden="true"
+        class="euiIcon euiIcon--medium euiIcon-isLoading"
+        focusable="false"
+        height="16"
+        role="img"
+        viewBox="0 0 16 16"
+        width="16"
+        xmlns="http://www.w3.org/2000/svg"
+      />
     </span>
   </div>
   <div
@@ -90,9 +97,16 @@ exports[`ForExpression renders 1`] = `
             <span
               class="euiFormControlLayoutCustomIcon"
             >
-              <div>
-                EuiIconMock
-              </div>
+              <svg
+                aria-hidden="true"
+                class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                focusable="false"
+                height="16"
+                role="img"
+                viewBox="0 0 16 16"
+                width="16"
+                xmlns="http://www.w3.org/2000/svg"
+              />
             </span>
           </div>
         </div>

diff --git a/...itor/components/MonitorExpressions/expressions/__snapshots__/WhereExpression.test.js.snap b/...itor/components/MonitorExpressions/expressions/__snapshots__/WhereExpression.test.js.snap
@@ -14,9 +14,16 @@ exports[`WhereExpression renders 1`] = `
     <span
       class="euiToolTipAnchor"
     >
-      <div>
-        EuiIconMock
-      </div>
+      <svg
+        aria-hidden="true"
+        class="euiIcon euiIcon--medium euiIcon-isLoading"
+        focusable="false"
+        height="16"
+        role="img"
+        viewBox="0 0 16 16"
+        width="16"
+        xmlns="http://www.w3.org/2000/svg"
+      />
     </span>
   </div>
   <div