Skip to content

Commit

Permalink
Merge pull request #14 from Progi1984/moveClassic
Browse files Browse the repository at this point in the history
Moved FO pages to classic directory & Export faker
  • Loading branch information
Progi1984 authored Mar 18, 2024
2 parents ebc086e + a9819ff commit 9da959e
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 9 deletions.
12 changes: 9 additions & 3 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ export {default as dataModules} from '@data/demo/modules';
export {default as dataSocialTitles} from '@data/demo/socialTitles';
export {default as dataTitles} from '@data/demo/titles';

export {default as fakerCustomer} from '@data/faker/customer';
export {default as fakerGroup} from '@data/faker/group';
export {default as fakerModule} from '@data/faker/module';
export {default as fakerTitle} from '@data/faker/title';

// Export Pages
export * as CommonPage from '@pages/commonPage';
// Export Pages BO
Expand All @@ -32,9 +37,10 @@ export {default as boDashboardPage} from '@pages/BO/dashboard';
export {default as boModuleManagerPage} from '@pages/BO/modules/moduleManager';
// Export Pages FO
export * as FOBasePage from '@pages/FO/FOBasePage';
export {default as foCategoryPage} from '@pages/FO/category';
export {default as foHomePage} from '@pages/FO/home';
export {default as foLoginPage} from '@pages/FO/login';
// Export Pages FO/Classic
export {default as foClassicCategoryPage} from '@pages/FO/classic/category';
export {default as foClassicHomePage} from '@pages/FO/classic/home';
export {default as foClassicLoginPage} from '@pages/FO/classic/login';

// Export Modules
export {default as modBlockwishlistBoMain} from '@pages/BO/modules/blockwishlist';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ const psVersion = testContext.getPSVersion();
/* eslint-disable global-require */
function requirePage(): FoCategoryPageInterface {
if (semver.gte(psVersion, '8.0.0')) {
return require('@versions/8.0.0/pages/FO/category');
return require('@versions/8.0.0/pages/FO/classic/category');
}
return require('@versions/8.0.0/pages/FO/category');
return require('@versions/8.0.0/pages/FO/classic/category');
}
/* eslint-enable global-require */

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ const psVersion = testContext.getPSVersion();
/* eslint-disable global-require, @typescript-eslint/no-var-requires */
function requirePage(): FoHomePageInterface {
if (semver.gte(psVersion, '8.0.0')) {
return require('@versions/8.0.0/pages/FO/home').homePage;
return require('@versions/8.0.0/pages/FO/classic/home').homePage;
}
return require('@versions/8.0.0/pages/FO/home').homePage;
return require('@versions/8.0.0/pages/FO/classic/home').homePage;
}
/* eslint-enable global-require, @typescript-eslint/no-var-requires */

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ const psVersion = testContext.getPSVersion();
/* eslint-disable global-require, @typescript-eslint/no-var-requires */
function requirePage(): FoLoginPageInterface {
if (semver.gte(psVersion, '8.0.0')) {
return require('@versions/8.0.0/pages/FO/login').loginPage;
return require('@versions/8.0.0/pages/FO/classic/login').loginPage;
}
return require('@versions/8.0.0/pages/FO/login').loginPage;
return require('@versions/8.0.0/pages/FO/classic/login').loginPage;
}
/* eslint-enable global-require, @typescript-eslint/no-var-requires */

Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 9da959e

Please sign in to comment.