snippet-service playwright testing

plgd-dev · Jul 1, 2024 · 5907a0e · 5907a0e
1 parent 4aadc19
commit 5907a0e
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 6 deletions.
diff --git a/src/common/constants.ts b/src/common/constants.ts
@@ -97,5 +97,5 @@ export const hasMockApi = (url: string) => {
 export const getApiUrl = (url: string) => {
     const parsedUrl = new URL(url)
 
-    return hasMockApi(parsedUrl.pathname) && parsedUrl.origin ? `${process.env.REACT_APP_MOCK_BASE_URL}${parsedUrl.pathname}` : url
+    return hasMockApi(parsedUrl.pathname) && parsedUrl.origin ? `${process.env.REACT_APP_MOCK_BASE_URL}${parsedUrl.pathname}${parsedUrl.search}` : url
 }
diff --git a/src/common/hooks/use-api.js b/src/common/hooks/use-api.js
@@ -10,7 +10,6 @@ export const getData = async (method, url, options) => {
     const { telemetrySpan, telemetryWebTracer, ...restOptions } = options
 
     if (telemetryWebTracer && telemetrySpan) {
-        console.log('TU')
         const singleSpan = telemetryWebTracer.startSpan(telemetrySpan)
 
         return context.with(

diff --git a/src/common/hooks/use-version.tsx b/src/common/hooks/use-version.tsx
@@ -7,13 +7,14 @@ import FormSelect from '../../components/Atomic/FormSelect'
 import { OptionType } from '../../components/Atomic/FormSelect/FormSelect.types'
 
 type OptionsType = {
+    dataTestId?: string
     i18n: { version: string; selectVersion: string }
     refresh: () => void
     versionData: any
 }
 
 export function useVersion(options: OptionsType) {
-    const { i18n, versionData, refresh } = options
+    const { dataTestId, i18n, versionData, refresh } = options
 
     const [searchParams, setSearchParams] = useSearchParams()
     const [version, setVersion] = useState('')
@@ -37,9 +38,10 @@ export function useVersion(options: OptionsType) {
     }, [versionData, version])
 
     const Selector = () => (
-        <FormGroup inline id='version' marginBottom={false}>
+        <FormGroup inline dataTestId={dataTestId} id='version' marginBottom={false}>
             <FormLabel text={i18n.version} />
             <FormSelect
+                dataTestId={dataTestId?.concat('-select')}
                 onChange={(options: OptionType) => {
                     const v = options.value
                     setSearchParams({ version: v as string })

diff --git a/src/components/Atomic/FormGroup/FormGroup.tsx b/src/components/Atomic/FormGroup/FormGroup.tsx
@@ -12,6 +12,7 @@ export const FormGroupCore: FC<Props> = (props) => {
     const {
         children,
         className,
+        dataTestId,
         error,
         errorTooltip,
         id,
@@ -92,7 +93,12 @@ export const FormGroupCore: FC<Props> = (props) => {
     }
 
     return (
-        <div className={className} css={[marginBottom && !inline && styles.formGroupMargin, fullSize && styles.inlineItemFullSize]} style={style}>
+        <div
+            className={className}
+            css={[marginBottom && !inline && styles.formGroupMargin, fullSize && styles.inlineItemFullSize]}
+            data-test-id={dataTestId}
+            style={style}
+        >
             {getInputs()}
         </div>
     )

diff --git a/src/components/Atomic/FormGroup/FormGroup.types.ts b/src/components/Atomic/FormGroup/FormGroup.types.ts
@@ -3,6 +3,7 @@ import { CSSProperties, ReactNode } from 'react'
 export type Props = {
     children: ReactNode | ReactNode[]
     className?: string
+    dataTestId?: string
     error?: string | boolean
     errorTooltip?: boolean
     fullSize?: boolean

diff --git a/src/components/Atomic/FormSelect/FormSelect.tsx b/src/components/Atomic/FormSelect/FormSelect.tsx
@@ -36,6 +36,7 @@ const FormSelect = forwardRef<any, Props>((props, ref) => {
         className,
         checkboxOptions,
         creatable,
+        dataTestId,
         defaultValue,
         error,
         disabled,
@@ -113,7 +114,7 @@ const FormSelect = forwardRef<any, Props>((props, ref) => {
     const SelectContainer = <Option extends OptionType, IsMulti extends boolean, Group extends GroupBase<Option>>(
         props: ContainerProps<Option, IsMulti, Group>
     ) => (
-        <components.SelectContainer {...props} css={[autoWidth ? styles.selectAutoWidthContainer : styles.selectContainer]}>
+        <components.SelectContainer {...props} css={[autoWidth ? styles.selectAutoWidthContainer : styles.selectContainer]} data-test-id={dataTestId}>
             {props.children}
         </components.SelectContainer>
     )

diff --git a/src/components/Atomic/FormSelect/FormSelect.types.ts b/src/components/Atomic/FormSelect/FormSelect.types.ts
@@ -21,6 +21,7 @@ export type Props = {
     checkboxOptions?: boolean
     className?: string
     creatable?: boolean
+    dataTestId?: string
     defaultValue?: any
     disabled?: boolean
     error?: boolean

diff --git a/src/components/Layout/LeftPanel/LeftPanel.tsx b/src/components/Layout/LeftPanel/LeftPanel.tsx
@@ -121,6 +121,7 @@ const LeftPanelSubItems = (props: LeftPanelSubItemsType) => {
                                             subItem.id === active && styles.subItemLinkActive,
                                             (item.children?.length || 0) - 1 === key && styles.subItemLinkLast,
                                         ]}
+                                        data-test-id={subItem.dataTestId}
                                         href={`${item.link}${subItem.link}`}
                                         onClick={
                                             subItem.disabled
@@ -171,6 +172,7 @@ const LeftPanelSubItems = (props: LeftPanelSubItemsType) => {
                                 <li key={key}>
                                     <a
                                         css={[styles.subItemLink, subItem.id === active && styles.subItemLinkActive, subItem.disabled && styles.disabled]}
+                                        data-test-id={subItem.dataTestId}
                                         href={`${item.link}${subItem.link}`}
                                         onClick={
                                             subItem.disabled