fix e2e tests on post-broadcasting

e2e/client/package.json

@@ -19,7 +19,7 @@
     "server": "grunt server",
     "start-client-server": "http-server dist -p 9000 -s &",
     "stop-client-server": "fuser -k 9000/tcp",
-    "protractor": "node run-end-to-end-tests.js",
+    "protractor": "protractor protractor.conf.js",
     "specs--compile": "find ./specs/ -name '*.js' -type f -delete && tsc -p ./specs",
     "specs--watch": "find ./specs/ -name '*.js' -type f -delete && tsc -p ./specs -w",
     "start-test-server": "cd ../server && docker-compose build && docker-compose up -d",

e2e/client/specs/archived_spec.ts

@@ -3,6 +3,7 @@ import {globalSearch} from './helpers/search';
 import {authoring} from './helpers/authoring';
 import {content} from './helpers/content';
 import {monitoring} from './helpers/monitoring';
+import {element, by} from 'protractor';
 
 describe('archived', () => {
     beforeEach(() => {
@@ -31,7 +32,7 @@ describe('archived', () => {
         expect(authoring.edit_correct_button.isDisplayed()).toBe(false);
         expect(authoring.edit_kill_button.isDisplayed()).toBe(false);
         expect(authoring.edit_takedown_button.isDisplayed()).toBe(false);
-        expect(authoring.navbarMenuBtn.isPresent()).toBe(false);
+        expect(element(by.css('[data-test-id="content-create"]')).isPresent()).toBe(false);
         expect(authoring.sendToButton.isDisplayed()).toBe(false);
         authoring.showInfo();
         expect(authoring.isPublishedState()).toBe(true);

e2e/client/specs/authoring_spec.ts

@@ -64,7 +64,9 @@ describe('authoring', () => {
 
     it('authoring operations', () => {
         // allows to create a new empty package
-        monitoring.createItemAction('create_package');
+        el(['content-create']).click();
+        el(['content-create-dropdown', 'create-package']).click();
+
         expect(element(by.className('packaging-screen')).isDisplayed()).toBe(true);
         authoring.close();
 
@@ -252,7 +254,13 @@ describe('authoring', () => {
         authoring.writeText('z');
         element(by.cssContainingText('label', 'Dateline')).click();
         ctrlShiftKey('s');
-        browser.wait(() => element(by.buttonText('Save')).getAttribute('disabled'), 500);
+
+        browser.wait(ECE.attributeEquals(
+            element(by.buttonText('Save')),
+            'disabled',
+            'true',
+        ));
+
         authoring.close();
         monitoring.actionOnItem('Edit', 2, 0);
         browser.sleep(300);
@@ -322,16 +330,31 @@ describe('authoring', () => {
 
     it('toggle auto spellcheck and hold changes', () => {
         monitoring.actionOnItem('Edit', 2, 1);
-        browser.sleep(300);
-        expect(element(by.model('spellcheckMenu.isAuto')).getAttribute('checked')).toBeTruthy();
+
+        browser.wait(ECE.attributeEquals(
+            element(by.model('spellcheckMenu.isAuto')),
+            'checked',
+            'true',
+        ));
+
         authoring.toggleAutoSpellCheck();
-        browser.sleep(300);
-        expect(element(by.model('spellcheckMenu.isAuto')).getAttribute('checked')).toBeFalsy();
+
+        browser.wait(ECE.attributeEquals(
+            element(by.model('spellcheckMenu.isAuto')),
+            'checked',
+            null,
+        ));
+
         authoring.close();
+
         monitoring.actionOnItem('Edit', 2, 2);
-        expect(element(by.model('spellcheckMenu.isAuto')).getAttribute('checked')).toBeFalsy();
-    });
 
+        browser.wait(ECE.attributeEquals(
+            element(by.model('spellcheckMenu.isAuto')),
+            'checked',
+            null,
+        ));
+    });
     it('related item widget', () => {
         monitoring.actionOnItem('Edit', 2, 1);
         authoring.writeText('something');

e2e/client/specs/content_profile_spec.ts

@@ -7,6 +7,7 @@ import {workspace} from './helpers/workspace';
 import {authoring} from './helpers/authoring';
 import {metadata} from './helpers/metadata';
 import {assertToastMsg} from './helpers/utils';
+import {ECE} from '@superdesk/end-to-end-testing-helpers';
 
 describe('Content profiles', () => {
     it('creates corresponding template', () => {
@@ -19,7 +20,6 @@ describe('Content profiles', () => {
         templates.openTemplatesSettings();
         expect(templates.getListCount()).toBeGreaterThan(2);
         templates.edit('Simple');
-        expect(authoring.getAbstractFieldCount()).toEqual(0);
         expect(templates.getContentProfile()).toEqual('Simple');
         templates.cancel();
 
@@ -57,7 +57,6 @@ describe('Content profiles', () => {
         monitoring.openMonitoring();
         workspace.selectDesk('Sports Desk');
         authoring.createTextItemFromTemplate('simple');
-        expect(authoring.getAbstractFieldCount()).toEqual(0);
 
         // publish of the required field will fail
         authoring.setHeaderSluglineText('Story1 slugline');
@@ -89,12 +88,12 @@ describe('Content profiles', () => {
 
         contentProfiles.editContentFields();
 
-        const btns = element.all(by.partialButtonText(FIELD_LABEL));
+        const buttons = element.all(by.partialButtonText(FIELD_LABEL));
 
-        expect(btns.filter((elem) => elem.isDisplayed()).count()).toBe(0);
+        browser.wait(ECE.hasElementCount(buttons, 0));
 
         contentProfiles.openAddFieldDropdown();
 
-        expect(btns.filter((elem) => elem.isDisplayed()).count()).toBe(1);
+        browser.wait(ECE.hasElementCount(buttons, 1));
     });
 });

e2e/client/specs/content_spec.ts

@@ -7,6 +7,7 @@ import {content} from './helpers/content';
 import {authoring} from './helpers/authoring';
 import {multiAction} from './helpers/actions';
 import {ECE, el} from '@superdesk/end-to-end-testing-helpers';
+import {TreeSelectDriver} from './helpers/tree-select-driver';
 
 describe('content', () => {
     var body = element(by.tagName('body'));
@@ -33,8 +34,8 @@ describe('content', () => {
         var embargoTime = (now.getHours() < 10 ? '0' + now.getHours() : now.getHours()) + ':' +
                         (now.getMinutes() < 10 ? '0' + now.getMinutes() : now.getMinutes());
 
-        element(by.model('item.embargo_date')).element(by.tagName('input')).sendKeys(embargoDate);
-        element(by.model('item.embargo_time')).element(by.tagName('input')).sendKeys(embargoTime);
+        el(['authoring', 'interactive-actions-panel', 'embargo', 'date-input']).sendKeys(embargoDate);
+        el(['authoring', 'interactive-actions-panel', 'embargo', 'time-input']).sendKeys(embargoTime);
     }
 
     it('can navigate with keyboard', () => {
@@ -141,7 +142,7 @@ describe('content', () => {
 
         browser.sleep(100);
 
-        multiAction('Multiedit');
+        multiAction('Multi-edit');
         expect(browser.getCurrentUrl()).toMatch(/multiedit$/);
         expect(element.all(by.repeater('board in boards')).count()).toBe(2);
     });
@@ -150,8 +151,7 @@ describe('content', () => {
         workspace.switchToDesk('SPORTS DESK');
         content.setListView();
 
-        element(by.className('sd-create-btn')).click();
-        element(by.id('create_text_article')).click();
+        authoring.createTextItem();
 
         authoring.writeText('Words');
         authoring.save();
@@ -164,8 +164,8 @@ describe('content', () => {
         workspace.switchToDesk('SPORTS DESK');
         content.setListView();
 
-        element(by.className('sd-create-btn')).click();
-        element(by.id('create_package')).click();
+        el(['content-create']).click();
+        el(['content-create-dropdown', 'create-package']).click();
 
         element.all(by.model('item.headline')).first().sendKeys('Empty Package');
         authoring.save();
@@ -220,10 +220,10 @@ describe('content', () => {
 
     it('can display embargo in metadata when set', () => {
         workspace.editItem('item3', 'SPORTS');
-        authoring.sendToButton.click();
+
+        el(['open-send-publish-pane']).click();
 
         setEmbargo();
-        browser.sleep(100);
 
         authoring.closeSendAndPublish();
 
@@ -238,37 +238,46 @@ describe('content', () => {
         content.closePreview();
     });
 
-    it('can enable/disable send based on embargo', () => {
+    it('can set embargo and send', () => {
         // Initial steps before proceeding, to get initial state of send buttons.
         workspace.editItem('item3', 'SPORTS');
         authoring.sendTo('Sports Desk', 'Incoming Stage');
         authoring.confirmSendTo();
 
         workspace.editItem('item3', 'SPORTS');
-        authoring.sendToButton.click().then(() => {
-            // Initial State
-            expect(authoring.sendBtn.isEnabled()).toBe(false);
-        });
 
-        var sidebar = element.all(by.css('.side-panel')).last(),
-            dropdown = sidebar.element(by.css('.dropdown--boxed .dropdown__toggle'));
+        el(['open-send-publish-pane']).click();
+
+        el(['authoring', 'interactive-actions-panel', 'tabs'], by.buttonText('Send to')).click();
+
+        const sendToButton = el(['authoring', 'interactive-actions-panel', 'send']);
 
-        dropdown.waitReady();
-        dropdown.click();
-        sidebar.element(by.buttonText('Sports Desk')).click();
+        browser.wait(ECE.visibilityOf(sendToButton));
+
+        new TreeSelectDriver(
+            el(['interactive-actions-panel', 'destination-select']),
+        ).setValue('Sports Desk');
+
+        const stage = 'two';
 
         // State after selecting different Stage in the same desk
-        sidebar.element(by.buttonText('two')).click();
-        expect(authoring.sendBtn.isEnabled()).toBe(true);
+        el(
+            ['interactive-actions-panel', 'stage-select'],
+            by.cssContainingText('[data-test-id="item"]', stage),
+        ).click();
+
+        expect(sendToButton.isEnabled()).toBe(true);
 
         // State after setting Embargo
         setEmbargo();
         browser.sleep(100);
-        expect(authoring.sendBtn.isEnabled()).toBe(true);
+        expect(sendToButton.isEnabled()).toBe(true);
 
         // State after changing Desk
-        dropdown.click();
-        sidebar.element(by.buttonText('Politic Desk')).click();
-        expect(authoring.sendBtn.isEnabled()).toBe(true);
+        new TreeSelectDriver(
+            el(['interactive-actions-panel', 'destination-select']),
+        ).setValue('Politic Desk');
+
+        expect(sendToButton.isEnabled()).toBe(true);
     });
 });

e2e/client/specs/fetch_spec.ts

@@ -5,7 +5,7 @@ import {content} from './helpers/content';
 import {authoring} from './helpers/authoring';
 import {desks} from './helpers/desks';
 import {multiAction} from './helpers/actions';
-import {ECE, els} from '@superdesk/end-to-end-testing-helpers';
+import {ECE, el, els, s} from '@superdesk/end-to-end-testing-helpers';
 
 describe('fetch', () => {
     beforeEach(() => {
@@ -31,7 +31,7 @@ describe('fetch', () => {
     it('can fetch as', () => {
         workspace.openIngest();
         content.actionOnItem('Fetch To', 0);
-        content.send();
+        el(['interactive-actions-panel', 'fetch']).click();
         workspace.openContent();
         expect(content.count()).toBe(3);
     });
@@ -46,9 +46,9 @@ describe('fetch', () => {
         workspace.openIngest();
         content.actionOnItem('Fetch To', 0);
 
-        var btnFetchAndOpen = element(by.css('[ng-disabled="disableFetchAndOpenButton()"]'));
+        var btnFetchAndOpen = element(s(['interactive-actions-panel', 'fetch-and-open']));
 
-        expect(btnFetchAndOpen.getAttribute('disabled')).toBeFalsy();
+        expect(btnFetchAndOpen.isEnabled()).toBe(true);
 
         // Adding a new desk with no member, which serves as a non-member desk when selected
         desks.openDesksSettings();
@@ -59,21 +59,32 @@ describe('fetch', () => {
         desks.setDeskType('authoring');
         desks.setDeskDefaultContentTemplate('testing');
         desks.setDeskDefaultContentProfile('testing');
-        desks.actionDoneOnGeneralTab();
+        desks.actionSaveAndContinueOnGeneralTab(); // save desk and continue to Stages tab
+
+        desks.editStage('Working Stage');
+        desks.toggleGlobalReadFlag(); // turn OFF Global Read
+        desks.saveEditedStage();
+
+        desks.editStage('Incoming Stage');
+        desks.toggleGlobalReadFlag(); // turn OFF Global Read
+        desks.saveEditedStage();
+
+        desks.actionDoneOnStagesTab();
 
         workspace.openIngest();
         content.actionOnItem('Fetch To', 0);
         authoring.selectDeskforSendTo('Test Desk');
-        expect(btnFetchAndOpen.getAttribute('disabled')).toBeTruthy();
+
+        expect(btnFetchAndOpen.isEnabled()).toBe(false);
     });
 
     it('can hide stage with global read OFF if selected desk as a non-member', () => {
         workspace.openIngest();
         content.actionOnItem('Fetch To', 0);
 
-        var btnFetchAndOpen = element(by.css('[ng-disabled="disableFetchAndOpenButton()"]'));
+        var btnFetchAndOpen = element(s(['interactive-actions-panel', 'fetch-and-open']));
 
-        expect(btnFetchAndOpen.getAttribute('disabled')).toBeFalsy();
+        expect(btnFetchAndOpen.isEnabled()).toBe(true);
 
         // Adding a new desk with no member, which serves as a non-member desk when selected
         desks.openDesksSettings();
@@ -106,11 +117,12 @@ describe('fetch', () => {
         content.actionOnItem('Fetch To', 0);
         authoring.selectDeskforSendTo('Test Desk');
 
-        var sidebar = element.all(by.css('.side-panel')).last();
-
-        expect(sidebar.element(by.buttonText('Working Stage')).isPresent()).toBeTruthy();
-        expect(sidebar.element(by.buttonText('Test Stage')).isPresent()).toBeFalsy();
-        expect(btnFetchAndOpen.getAttribute('disabled')).toBeTruthy();
+        expect(
+            element(s(['interactive-actions-panel', 'stage-select', 'item'], 'Working Stage')).isPresent(),
+        ).toBeTruthy();
+        expect(
+            element(s(['interactive-actions-panel', 'stage-select', 'item'], 'Test Stage')).isPresent(),
+        ).toBeFalsy();
     });
 
     it('can fetch multiple items', () => {
@@ -127,7 +139,7 @@ describe('fetch', () => {
         content.selectItem(0);
         browser.sleep(1000); // Wait for animation
         multiAction('Fetch to');
-        content.send();
+        el(['interactive-actions-panel', 'fetch']).click();
         workspace.openContent();
         expect(content.count()).toBe(3);
     });