-
Notifications
You must be signed in to change notification settings - Fork 467
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into 30940-ftm-toolbar-enhancements
- Loading branch information
Showing
10 changed files
with
831 additions
and
916 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 28 additions & 33 deletions
61
e2e/dotcms-e2e-node/frontend/locators/navigation/menuLocators.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,44 @@ | ||
| import { Page, Locator } from "@playwright/test"; | ||
| import {Page, Locator} from '@playwright/test'; | ||
|
|
||
| export class GroupEntriesLocators { | ||
| readonly SITE: Locator; | ||
| readonly CONTENT: Locator; | ||
| readonly SCHEMA: Locator; | ||
|
|
||
| constructor(page: Page) { | ||
| this.SITE = page.getByText("Site", { exact: true }); | ||
| this.CONTENT = page | ||
| .getByRole("complementary") | ||
| .getByText("Content", { exact: true }); | ||
| this.SCHEMA = page.getByText("Schema"); | ||
| } | ||
| readonly SITE: Locator; | ||
| readonly CONTENT: Locator; | ||
| readonly SCHEMA: Locator; | ||
|
|
||
| constructor(page: Page) { | ||
| this.SITE = page.getByText('Site', {exact: true}); | ||
| this.CONTENT = page.getByRole('complementary').getByText('Content', {exact: true}); | ||
| this.SCHEMA = page.getByText('Schema'); | ||
|
|
||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Locators for the tools in the menu | ||
| */ | ||
| export class ToolEntriesLocators { | ||
| readonly SEARCH_ALL: Locator; | ||
| readonly CONTENT_TYPES: Locator; | ||
| readonly CATEGORIES: Locator; | ||
|
|
||
| constructor(page: Page) { | ||
| this.SEARCH_ALL = page.getByRole("link", { name: "Search All" }); | ||
| this.CONTENT_TYPES = page.getByRole("link", { name: "Content Types" }); | ||
| this.CATEGORIES = page.getByRole("link", { name: "Categories" }); | ||
| } | ||
| readonly SEARCH_ALL: Locator; | ||
| readonly CONTENT_TYPES: Locator; | ||
| readonly CATEGORIES: Locator; | ||
|
|
||
|
|
||
| constructor(page: Page) { | ||
| this.SEARCH_ALL = page.getByRole('link', {name: 'Search All'}); | ||
| this.CONTENT_TYPES = page.getByRole('link', {name: 'Content Types'}); | ||
| this.CATEGORIES = page.getByRole('link', { name: 'Categories' }); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Locators for the menu entries | ||
| */ | ||
| export class MenuEntriesLocators { | ||
| readonly EXPAND: Locator; | ||
| readonly COLLAPSE: Locator; | ||
| readonly EXPAND: Locator; | ||
| readonly COLLAPSE: Locator; | ||
|
|
||
| constructor(page: Page) { | ||
| /*this.EXPAND = page.locator('button[ng-reflect-ng-class="[object Object]"]').first(); | ||
| constructor(page: Page) { | ||
| this.EXPAND = page.getByRole('button', { name: '' }); | ||
| this.COLLAPSE = page.locator('button[ng-reflect-ng-class="[object Object]"]').first(); | ||
| this.EXPAND = page.locator('button[ng-reflect-ng-class="[object Object]"]'); | ||
| this.COLLAPSE = page.locator('button[ng-reflect-ng-class="[object Object]"]');*/ | ||
| this.EXPAND = page.getByRole("button", { name: "" }); | ||
| this.COLLAPSE = page | ||
| .locator('button[ng-reflect-ng-class="[object Object]"]') | ||
| .first(); | ||
| } | ||
| } | ||
|
|
||
| } | ||
| } |
61 changes: 33 additions & 28 deletions
61
e2e/dotcms-e2e-node/frontend/tests/contentSearch/contentData.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,46 @@ | ||
|
|
||
| /** | ||
| * Content to add a Rich Text content | ||
| */ | ||
| export const genericContent1 = { | ||
| title: "Automation Test", | ||
| body: "This is a sample content", | ||
| newTitle: "Automation Test edited", | ||
| newBody: "This is a sample content edited", | ||
| }; | ||
| title: "Automation Test", | ||
| body: "This is a sample content", | ||
| newTitle : "Automation Test edited", | ||
| newBody : "This is a sample content edited" | ||
| } | ||
|
|
||
| /** | ||
| * Content actions text content locators | ||
| */ | ||
| export const contentProperties = { | ||
| language: "English (US)", | ||
| publishWfAction: "Publish", | ||
| unpublishWfAction: "Unpublish", | ||
| unlockWfAction: "Unlock", | ||
| archiveWfAction: "Archive", | ||
| deleteWfAction: "Delete", | ||
| }; | ||
| language: "English (US)", | ||
| publishWfAction: "Publish", | ||
| unpublishWfAction: "Unpublish", | ||
| unlockWfAction: "Unlock", | ||
| archiveWfAction: "Archive", | ||
| deleteWfAction: "Delete" | ||
| } | ||
|
|
||
| export const fileAssetContent = { | ||
| title: "File Asset title", | ||
| body: "This is a sample file asset content", | ||
| fromURL: | ||
| "https://upload.wikimedia.org/wikipedia/commons/0/03/DotCMS-logo.svg", | ||
| newFileName: "New file asset.txt", | ||
| newFileText: "This is a new file asset content", | ||
| host: "default", | ||
| }; | ||
| title: "File Asset title", | ||
| body: "This is a sample file asset content", | ||
| fromURL:"https://upload.wikimedia.org/wikipedia/commons/0/03/DotCMS-logo.svg", | ||
| newFileName:"New file asset.txt", | ||
| newFileText:"This is a new file asset content", | ||
| newFileTextEdited:"Validate you are able to edit text on binary fields", | ||
| host:"default" | ||
| } | ||
|
|
||
| export const pageAssetContent = { | ||
| title: "PageAsset1", | ||
| host: "default", | ||
| template: "System Template", | ||
| friendlyName: "friendlyName-test", | ||
| showOnMenu: true, | ||
| sortOrder: "1", | ||
| cacheTTL: 0, | ||
| }; | ||
| title: "PageAsset1", | ||
| host: "default", | ||
| template: "System Template", | ||
| friendlyName: "friendlyName-test", | ||
| showOnMenu: true, | ||
| sortOrder: "1", | ||
| cacheTTL: 0, | ||
| } | ||
|
|
||
|
|
||
|
|
||
|
|
Oops, something went wrong.