From d8fa08f20f6688022018a6515d9bccedb2a42267 Mon Sep 17 00:00:00 2001 From: Vasudeva Annam Date: Fri, 18 Oct 2024 11:06:00 +0100 Subject: [PATCH] Revert "Adding and updating alias paths in tsconfig for constants and utils" This reverts commit dd6c180d3ecfcff48a38da434fe5dcabf8c139b3. --- src/vasu-playwright-lib/utils/action-utils.ts | 6 +++--- src/vasu-playwright-lib/utils/assert-utils.ts | 2 +- src/vasu-playwright-lib/utils/element-utils.ts | 4 ++-- src/vasu-playwright-lib/utils/locator-utils.ts | 2 +- src/vasu-playwright-lib/utils/page-utils.ts | 9 +++++++-- tsconfig.json | 3 +-- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/vasu-playwright-lib/utils/action-utils.ts b/src/vasu-playwright-lib/utils/action-utils.ts index d40924e..7e6e644 100644 --- a/src/vasu-playwright-lib/utils/action-utils.ts +++ b/src/vasu-playwright-lib/utils/action-utils.ts @@ -20,10 +20,10 @@ import { UploadOptions, UploadValues, VisibilityOption, -} from '@parameterTypes'; -import { SMALL_TIMEOUT, STANDARD_TIMEOUT } from '@constants/timeouts'; +} from '../types/optional-parameter-types'; +import { SMALL_TIMEOUT, STANDARD_TIMEOUT } from '../constants/timeouts'; import { getLocator, getVisibleLocator } from './locator-utils'; -import { getDefaultLoadState } from '@constants/loadstate'; +import { getDefaultLoadState } from '../constants/loadstate'; import { waitForElementToBeStable } from './element-utils'; /** diff --git a/src/vasu-playwright-lib/utils/assert-utils.ts b/src/vasu-playwright-lib/utils/assert-utils.ts index 2523eb7..5b6d71f 100644 --- a/src/vasu-playwright-lib/utils/assert-utils.ts +++ b/src/vasu-playwright-lib/utils/assert-utils.ts @@ -6,7 +6,7 @@ */ import { Expect, Locator, TestInfo, expect } from '@playwright/test'; -import { ExpectOptions, ExpectTextOptions, SoftOption, TimeoutOption } from '@parameterTypes'; +import { ExpectOptions, ExpectTextOptions, SoftOption, TimeoutOption } from '../types/optional-parameter-types'; import { getLocator } from './locator-utils'; import { getAllPages, getPage } from './page-utils'; import { getAlertText } from './action-utils'; diff --git a/src/vasu-playwright-lib/utils/element-utils.ts b/src/vasu-playwright-lib/utils/element-utils.ts index 76b489a..f3c1b73 100644 --- a/src/vasu-playwright-lib/utils/element-utils.ts +++ b/src/vasu-playwright-lib/utils/element-utils.ts @@ -6,9 +6,9 @@ */ import { Locator } from '@playwright/test'; -import { LocatorWaitOptions, TimeoutOption } from '@parameterTypes'; +import { LocatorWaitOptions, TimeoutOption } from '../types/optional-parameter-types'; import { getAllLocators, getLocator } from './locator-utils'; -import { SMALL_TIMEOUT } from '@constants/timeouts'; +import { SMALL_TIMEOUT } from '../constants/timeouts'; import { wait } from './page-utils'; import { logger } from '../setup'; import { test } from '@playwright/test'; diff --git a/src/vasu-playwright-lib/utils/locator-utils.ts b/src/vasu-playwright-lib/utils/locator-utils.ts index 9cff67d..04c9604 100644 --- a/src/vasu-playwright-lib/utils/locator-utils.ts +++ b/src/vasu-playwright-lib/utils/locator-utils.ts @@ -13,7 +13,7 @@ import { GetByTextOptions, LocatorOptions, LocatorWaitOptions, -} from '@parameterTypes'; +} from '../types/optional-parameter-types'; import { defaultVisibleOnlyOption } from '@constants/loadstate'; import { waitForFirstElementToBeAttached } from '@utils/element-utils'; diff --git a/src/vasu-playwright-lib/utils/page-utils.ts b/src/vasu-playwright-lib/utils/page-utils.ts index 439d8a4..3468b2a 100644 --- a/src/vasu-playwright-lib/utils/page-utils.ts +++ b/src/vasu-playwright-lib/utils/page-utils.ts @@ -7,8 +7,13 @@ import { SMALL_TIMEOUT } from '../constants/timeouts'; import { BrowserContext, Page, Response, expect } from '@playwright/test'; -import { GotoOptions, NavigationOptions, SwitchPageOptions, WaitForLoadStateOptions } from '@parameterTypes'; -import { getDefaultLoadState } from '@constants/loadstate'; +import { + GotoOptions, + NavigationOptions, + SwitchPageOptions, + WaitForLoadStateOptions, +} from '../types/optional-parameter-types'; +import { getDefaultLoadState } from '../constants'; let page: Page; diff --git a/tsconfig.json b/tsconfig.json index 278762b..63efe93 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,8 +12,7 @@ "@pages/*": ["./tests/pages/*"], "@testdata/*": ["./tests/testdata/*"], "@pagesetup": ["./test-setup/page-setup"], - "@constants/*": ["src/vasu-playwright-lib/constants/*"], - "@parameterTypes": ["src/vasu-playwright-lib/types/optional-parameter-types"], + "@constants/*": ["./src/vasu-playwright-lib/constants/*"], "@utils/*": ["src/vasu-playwright-lib/utils/*"] }, // Sets up custom path mappings, enabling to import modules with convenient shorter paths