feat(import): resolve conflicts

src/components/ImportForm/ComponentSection/GitOptions.tsx

@@ -27,14 +27,14 @@ const GitOptions: React.FC<React.PropsWithChildren<GitOptionProps>> = ({
             name="source.git.revision"
             label="Git reference"
             helperText="Optional branch, tag or commit."
-            data-testid="git-reference"
+            data-test="git-reference"
           />
 
           <InputField
             name="source.git.context"
             label="Context directory"
             helperText="Optional subdirectory for the application source code."
-            data-testid="context-dir"
+            data-test="context-dir"
             labelIcon={
               <HelpPopover bodyContent="Make sure this path is correct. You might get an error if your build context folder is your root directory but your Dockerfile is in a subdirectory of that folder." />
             }

src/components/ImportForm/ComponentSection/__tests__/ComponentSection.spec.tsx

@@ -58,10 +58,9 @@ describe('ComponentSection', () => {
 
     await user.type(source, 'https://gitlab.com/abcd/repo.git');
     await user.tab();
-    await waitFor(() => {
+    await waitFor(() =>
       // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-      const inputElement = screen.getByTestId('url-annotation') as HTMLInputElement;
-      expect(inputElement.value).toBe('gitlab.com');
-    });
+      expect((screen.getByTestId('url-annotation') as HTMLInputElement).value).toBe('gitlab.com'),
+    );
   });
 });