-
Notifications
You must be signed in to change notification settings - Fork 86
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into fix-e2e-tests-for-authoring-react
- Loading branch information
Showing
449 changed files
with
89,474 additions
and
35,865 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # TAG: AUTHORING-ANGULAR | ||
|
|
||
| AUTHORING-ANGULAR tag is meant to mark code that has to be removed together with angular based authoring component when time comes. |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ | |
| }, | ||
| { | ||
| "name": "session", | ||
| "value": "eyJzZXNzaW9uX3Rva2VuIjoiMDc5ZmI2M2MtZGM5OC00NTBmLWEzM2UtYzE5NzkzNzU2ZGYxIn0.Za43nw.4OjKgOWCcJ3oxa0kHscH-h47aLo", | ||
| "value": "eyJzZXNzaW9uX3Rva2VuIjoiN2VjM2UzYjUtOTc0NC00YjAyLWEzZjktNjdhMjY5NjYzNzMzIn0.Zqu1EQ.jLabsVCRMPN6BkZpxSQnDvNltcs", | ||
| "domain": "localhost", | ||
| "path": "/", | ||
| "expires": -1, | ||
|
|
@@ -27,19 +27,19 @@ | |
| "localStorage": [ | ||
| { | ||
| "name": "sess:id", | ||
| "value": "65ae379f77677941642bb478" | ||
| "value": "66abb510f2ff97e74a138403" | ||
| }, | ||
| { | ||
| "name": "sess:href", | ||
| "value": "auth_db/65ae379f77677941642bb478" | ||
| "value": "auth_db/66abb510f2ff97e74a138403" | ||
| }, | ||
| { | ||
| "name": "sess:user", | ||
| "value": "{\"_id\":\"655494d8dfb36babb9663383\",\"username\":\"admin\",\"email\":\"[email protected]\",\"user_type\":\"administrator\",\"is_active\":true,\"is_support\":false,\"needs_activation\":false,\"is_author\":true,\"private\":false,\"is_enabled\":true,\"password_changed_on\":\"2023-11-15T09:52:24+0000\",\"display_name\":\"admin\",\"sign_off\":\"ADM\",\"role\":null,\"_created\":\"2023-11-15T09:52:24+0000\",\"_updated\":\"2024-01-22T09:38:39+0000\",\"_etag\":\"d7adcb6bc3104208aacdfefeeefd7a01f8949663\",\"invisible_stages\":[],\"last_activity_at\":\"2024-01-22T09:38:39+0000\",\"_links\":{\"self\":{\"title\":\"User\",\"href\":\"users/655494d8dfb36babb9663383\"},\"parent\":{\"title\":\"home\",\"href\":\"/\"},\"collection\":{\"title\":\"users\",\"href\":\"users\"}},\"dateline_source\":\"Short name for your organisation\"}" | ||
| "value": "{\"_id\":\"655494d8dfb36babb9663383\",\"username\":\"admin\",\"email\":\"[email protected]\",\"user_type\":\"administrator\",\"is_active\":true,\"is_support\":false,\"needs_activation\":false,\"is_author\":true,\"private\":false,\"is_enabled\":true,\"password_changed_on\":\"2023-11-15T09:52:24+0000\",\"display_name\":\"John Doe\",\"sign_off\":\"ADM\",\"role\":null,\"_created\":\"2023-11-15T09:52:24+0000\",\"_updated\":\"2024-08-01T16:17:20+0000\",\"_etag\":\"618b115f9c52f9af13cd7ac4326665a5c42947b4\",\"invisible_stages\":[],\"last_activity_at\":\"2024-08-01T16:17:20+0000\",\"first_name\":\"John\",\"last_name\":\"Doe\",\"desk\":\"6554951a71839faddb615a2a\",\"_links\":{\"self\":{\"title\":\"User\",\"href\":\"users/655494d8dfb36babb9663383\"},\"related\":{\"desk\":{\"title\":\"Desk\",\"href\":\"desks/6554951a71839faddb615a2a\"}},\"parent\":{\"title\":\"home\",\"href\":\"/\"},\"collection\":{\"title\":\"users\",\"href\":\"users\"}},\"dateline_source\":\"Short name for your organisation\"}" | ||
| }, | ||
| { | ||
| "name": "sess:token", | ||
| "value": "Basic MDc5ZmI2M2MtZGM5OC00NTBmLWEzM2UtYzE5NzkzNzU2ZGYxOg==" | ||
| "value": "Basic N2VjM2UzYjUtOTc0NC00YjAyLWEzZjktNjdhMjY5NjYzNzMzOg==" | ||
| } | ||
| ] | ||
| } | ||
|
|
||
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 |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| import {test, expect} from '@playwright/test'; | ||
| import {Monitoring} from './page-object-models/monitoring'; | ||
| import {restoreDatabaseSnapshot, s} from './utils'; | ||
| import {TreeSelectDriver} from './utils/tree-select-driver'; | ||
|
|
||
| test.describe('sending an article', async () => { | ||
| test('sending an article to another desk', async ({page}) => { | ||
| const monitoring = new Monitoring(page); | ||
|
|
||
| await restoreDatabaseSnapshot(); | ||
| await page.goto('/#/workspace/monitoring'); | ||
| await monitoring.selectDeskOrWorkspace('Sports'); | ||
|
|
||
| await monitoring.executeActionOnMonitoringItem( | ||
| page.locator(s('monitoring-group=Sports / Working Stage', 'article-item=story 2')), | ||
| 'Edit', | ||
| ); | ||
|
|
||
| await page.locator(s('authoring-topbar', 'open-send-publish-pane')).click(); | ||
| await page.locator(s('interactive-actions-panel', 'tabs')).getByRole('tab', {name: 'Send to'}).click(); | ||
|
|
||
| // selecting other desk | ||
| await new TreeSelectDriver( | ||
| page, | ||
| page.locator(s('destination-select')), | ||
| ).setValue(['Education']); | ||
| await page | ||
| .locator(s('interactive-actions-panel', 'stage-select')) | ||
| .getByRole('radio', {name: 'Working Stage'}) | ||
| .check(); | ||
| await page.locator(s('interactive-actions-panel', 'send')).click(); | ||
|
|
||
| await expect( | ||
| page.locator(s('monitoring-group=Sports / Working Stage', 'article-item=story 2')), | ||
| ).not.toBeVisible(); | ||
| await monitoring.selectDeskOrWorkspace('Education'); | ||
| await expect( | ||
| page.locator(s('monitoring-group=Education / Working Stage', 'article-item=story 2')), | ||
| ).toBeVisible(); | ||
| }); | ||
|
|
||
| test('sending an article to another stage', async ({page}) => { | ||
| const monitoring = new Monitoring(page); | ||
|
|
||
| await restoreDatabaseSnapshot(); | ||
| await page.goto('/#/workspace/monitoring'); | ||
| await monitoring.selectDeskOrWorkspace('Sports'); | ||
|
|
||
| await monitoring.executeActionOnMonitoringItem( | ||
| page.locator(s('monitoring-group=Sports / Working Stage', 'article-item=story 2')), | ||
| 'Edit', | ||
| ); | ||
|
|
||
| await page.locator(s('authoring-topbar', 'open-send-publish-pane')).click(); | ||
| await page.locator(s('interactive-actions-panel', 'tabs')).getByRole('tab', {name: 'Send to'}).click(); | ||
|
|
||
| // selecting other stage | ||
| await page | ||
| .locator(s('interactive-actions-panel', 'stage-select')) | ||
| .getByRole('radio', {name: 'Incoming Stage'}) | ||
| .check(); | ||
| await page.locator(s('interactive-actions-panel', 'send')).click(); | ||
|
|
||
| await expect( | ||
| page.locator(s('monitoring-group=Sports / Working Stage', 'article-item=story 2')), | ||
| ).not.toBeVisible(); | ||
| await expect( | ||
| page.locator(s('monitoring-group=Sports / Incoming Stage', 'article-item=story 2')), | ||
| ).toBeVisible(); | ||
| }); | ||
| }); |
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
Oops, something went wrong.