Skip to content

Commit

Permalink
Refactored dependency used by test mock. Adjusted OSD version used by…
Browse files Browse the repository at this point in the history 
… test workflows. (#318) (#321)

* 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]>
(cherry picked from commit 9d3813b)

Co-authored-by: AWSHurneyt <[email protected]>
  • Loading branch information
@opensearch-trigger-bot @AWSHurneyt
opensearch-trigger-bot[bot] and AWSHurneyt authored Aug 22, 2022
1 parent 47ddc4b commit 3cc72c2
Show file tree
Hide file tree
Showing 28 changed files with 388 additions and 1,930 deletions.
13 changes: 3 additions & 10 deletions ...omponents/FormControls/FormikFieldPassword/__snapshots__/FormikFieldPassword.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
13 changes: 3 additions & 10 deletions public/components/FormControls/FormikSelect/__snapshots__/FormikSelect.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
26 changes: 6 additions & 20 deletions public/components/FormControls/FormikSwitch/__snapshots__/FormikSwitch.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
13 changes: 3 additions & 10 deletions public/components/IconToolTip/__snapshots__/IconToolTip.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
`;
27 changes: 6 additions & 21 deletions ...Monitor/components/ClusterMetricsMonitor/__snapshots__/ClusterMetricsMonitor.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
Expand Down Expand Up @@ -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>
Expand Down
13 changes: 3 additions & 10 deletions ...s/CreateMonitor/components/MonitorDefinition/__snapshots__/MonitorDefinition.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
31 changes: 6 additions & 25 deletions ...Monitor/components/MonitorDefinitionCard/__snapshots__/MonitorDefinitionCard.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
Expand Down Expand Up @@ -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"
>
Expand Down
65 changes: 15 additions & 50 deletions ...CreateMonitor/components/MonitorExpressions/__snapshots__/MonitorExpressions.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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>
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
26 changes: 6 additions & 20 deletions ...onitor/components/MonitorExpressions/expressions/__snapshots__/ForExpression.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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>
Expand Down
13 changes: 3 additions & 10 deletions ...itor/components/MonitorExpressions/expressions/__snapshots__/WhereExpression.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 3 additions & 10 deletions ...ges/CreateMonitor/components/MonitorTimeField/__snapshots__/MonitorTimeField.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
14 changes: 3 additions & 11 deletions ...ges/CreateMonitor/components/QueryPerformance/__snapshots__/QueryPerformance.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,9 @@ exports[`QueryPerformance 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"
>
Expand Down
Loading

0 comments on commit 3cc72c2

Please sign in to comment.