Refactored dependency used by test mock. Adjusted OSD version used by…

… test workflows. (#318) * Adjusted version of OSD used by unit and cypress tests to align with OSD branching strategy. Signed-off-by: AWSHurneyt <[email protected]> * Refactored the path used to access a dependency, that's used by some unit tests, following migration from EUI to OUI. Updated snapshots and a unit test. Signed-off-by: AWSHurneyt <[email protected]> Signed-off-by: AWSHurneyt <[email protected]>
opensearch-project · Aug 22, 2022 · 9d3813b · 9d3813b
1 parent c062e00
commit 9d3813b
Show file tree

Hide file tree

Showing 30 changed files with 390 additions and 1,932 deletions.
diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml
@@ -7,7 +7,7 @@ on:
     branches:
       - "*"
 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
@@ -7,7 +7,7 @@ on:
     branches:
       - "*"
 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,16 +18,9 @@ exports[`FormikFieldPassword renders 1`] = `
       <span
         class="euiFormControlLayoutCustomIcon"
       >
-        <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"
-        />
+        <div>
+          EuiIconMock
+        </div>
       </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,16 +24,9 @@ exports[`FormikSelect renders 1`] = `
       <span
         class="euiFormControlLayoutCustomIcon"
       >
-        <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"
-        />
+        <div>
+          EuiIconMock
+        </div>
       </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,26 +22,12 @@ exports[`FormikSwitch renders 1`] = `
       <span
         class="euiSwitch__track"
       >
-        <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"
-        />
+        <div>
+          EuiIconMock
+        </div>
+        <div>
+          EuiIconMock
+        </div>
       </span>
     </span>
   </button>

diff --git a/public/components/IconToolTip/__snapshots__/IconToolTip.test.js.snap b/public/components/IconToolTip/__snapshots__/IconToolTip.test.js.snap
@@ -4,15 +4,8 @@ exports[`IconToolTip renders 1`] = `
 <span
   class="euiToolTipAnchor"
 >
-  <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"
-  />
+  <div>
+    EuiIconMock
+  </div>
 </span>
 `;
diff --git a/...Monitor/components/ClusterMetricsMonitor/__snapshots__/ClusterMetricsMonitor.test.js.snap b/...Monitor/components/ClusterMetricsMonitor/__snapshots__/ClusterMetricsMonitor.test.js.snap
@@ -39,17 +39,9 @@ exports[`ClusterMetricsMonitor renders 1`] = `
                 target="_blank"
               >
                 Learn more
-                <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"
-                />
+                <div>
+                  EuiIconMock
+                </div>
                 <span
                   class="euiScreenReaderOnly"
                 >
@@ -114,16 +106,9 @@ exports[`ClusterMetricsMonitor renders 1`] = `
                 data-test-subj="comboBoxToggleListButton"
                 type="button"
               >
-                <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"
-                />
+                <div>
+                  EuiIconMock
+                </div>
               </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,16 +48,9 @@ exports[`MonitorDefinition renders 1`] = `
             <span
               class="euiFormControlLayoutCustomIcon"
             >
-              <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"
-              />
+              <div>
+                EuiIconMock
+              </div>
             </span>
           </div>
         </div>

diff --git a/...Monitor/components/MonitorDefinitionCard/__snapshots__/MonitorDefinitionCard.test.js.snap b/...Monitor/components/MonitorDefinitionCard/__snapshots__/MonitorDefinitionCard.test.js.snap
@@ -24,17 +24,9 @@ exports[`MonitorDefinitionCard renders without AD plugin 1`] = `
         target="_blank"
       >
         Learn more
-        <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"
-        />
+        <div>
+          EuiIconMock
+        </div>
         <span
           class="euiScreenReaderOnly"
         >
@@ -169,20 +161,9 @@ exports[`MonitorDefinitionCard renders without AD plugin 2`] = `
         target="_blank"
       >
         Learn more
-        <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>
+        <div>
+          EuiIconMock
+        </div>
         <span
           class="euiScreenReaderOnly"
         >

diff --git a/...CreateMonitor/components/MonitorExpressions/__snapshots__/MonitorExpressions.test.js.snap b/...CreateMonitor/components/MonitorExpressions/__snapshots__/MonitorExpressions.test.js.snap
@@ -17,16 +17,9 @@ exports[`MonitorExpressions renders 1`] = `
       <span
         class="euiToolTipAnchor"
       >
-        <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"
-        />
+        <div>
+          EuiIconMock
+        </div>
       </span>
     </div>
     <div
@@ -100,16 +93,9 @@ exports[`MonitorExpressions renders 1`] = `
       <span
         class="euiToolTipAnchor"
       >
-        <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"
-        />
+        <div>
+          EuiIconMock
+        </div>
       </span>
     </div>
     <div
@@ -186,16 +172,9 @@ exports[`MonitorExpressions renders 1`] = `
               <span
                 class="euiFormControlLayoutCustomIcon"
               >
-                <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"
-                />
+                <div>
+                  EuiIconMock
+                </div>
               </span>
             </div>
           </div>
@@ -219,16 +198,9 @@ exports[`MonitorExpressions renders 1`] = `
       <span
         class="euiToolTipAnchor"
       >
-        <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"
-        />
+        <div>
+          EuiIconMock
+        </div>
       </span>
     </div>
     <div
@@ -286,16 +258,9 @@ exports[`MonitorExpressions renders 1`] = `
       <span
         class="euiToolTipAnchor"
       >
-        <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"
-        />
+        <div>
+          EuiIconMock
+        </div>
       </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,16 +11,9 @@ exports[`ForExpression renders 1`] = `
     <span
       class="euiToolTipAnchor"
     >
-      <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"
-      />
+      <div>
+        EuiIconMock
+      </div>
     </span>
   </div>
   <div
@@ -97,16 +90,9 @@ exports[`ForExpression renders 1`] = `
             <span
               class="euiFormControlLayoutCustomIcon"
             >
-              <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"
-              />
+              <div>
+                EuiIconMock
+              </div>
             </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,16 +14,9 @@ exports[`WhereExpression renders 1`] = `
     <span
       class="euiToolTipAnchor"
     >
-      <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"
-      />
+      <div>
+        EuiIconMock
+      </div>
     </span>
   </div>
   <div

diff --git a/...ges/CreateMonitor/components/MonitorTimeField/__snapshots__/MonitorTimeField.test.js.snap b/...ges/CreateMonitor/components/MonitorTimeField/__snapshots__/MonitorTimeField.test.js.snap
@@ -69,16 +69,9 @@ exports[`MonitorTimeField renders 1`] = `
               data-test-subj="comboBoxToggleListButton"
               type="button"
             >
-              <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"
-              />
+              <div>
+                EuiIconMock
+              </div>
             </button>
           </div>
         </div>