[ADF-5366] initialize discovery and version compatibility service for oauth based session (#6864)

* [ADF-5366] initialize discovery and version compatibility service for oauth based session

* better error message

* * fix spaces

* * revert the search service

* * fix build

* * check properties after type update

* * check properties after type update

* * check properties after type update

* * fix infinite loop

* * fix test without title

* * wait for options

* * wait for session

* Update metadata-content-type.e2e.ts

* Update metadata-content-type.e2e.ts

* Update protractor.excludes.json

* Update protractor.excludes.json

e2e/content-services/metadata/metadata-content-type.e2e.ts

@@ -20,6 +20,7 @@ import {
     BrowserActions,
     LoginPage,
     ModelActions,
+    StringUtil,
     UploadActions,
     UserModel,
     UsersActions,
@@ -30,26 +31,31 @@ import { FileModel } from '../../models/ACS/file.model';
 import { browser } from 'protractor';
 import { MetadataViewPage } from '../../core/pages/metadata-view.page';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
+import { ContentServicesPage } from '../../core/pages/content-services.page';
 
 describe('content type', () => {
     const apiService = new ApiService();
     const usersActions = new UsersActions(apiService);
     const modelActions = new ModelActions(apiService);
+    const uploadActions = new UploadActions(apiService);
 
     const viewerPage = new ViewerPage();
     const metadataViewPage = new MetadataViewPage();
     const navigationBarPage = new NavigationBarPage();
+    const contentServicesPage = new ContentServicesPage();
     const loginPage = new LoginPage();
+    const randomString = StringUtil.generateRandomString();
 
     const model: CustomModel =  {
-        name: 'test',
-        namespaceUri: 'http://www.customModel.com/model/e2e/1.0',
-        namespacePrefix: 'e2e',
+        name: `test-${randomString}`,
+        namespaceUri: `http://www.customModel.com/model/${randomString}/1.0`,
+        namespacePrefix: `e2e-${randomString}`,
         author: 'E2e Automation User',
         description: 'Custom type e2e model',
         status: 'DRAFT'
     };
-    const type: CustomType = { name: 'test', parentName: 'cm:content', title: 'Test type' };
+    const type: CustomType = { name: `test-type-${randomString}`, parentName: 'cm:content', title: `Test type - ${randomString}` };
+    const property = { name: `test-property-${randomString}`, title: `Test property - ${randomString}`, dataType: 'd:text', defaultValue: randomString };
     const pdfFile = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name });
     const docxFileModel = new FileModel({
         name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name,
@@ -60,81 +66,105 @@ describe('content type', () => {
     beforeAll( async () => {
         try {
             await apiService.loginWithProfile('admin');
-
-            const typePaging = await modelActions.listTypes({where: `(namespaceUri matches('http://www.customModel.*'))`});
-            if (typePaging.list.pagination.count === 0) {
-                await modelActions.createModel(model);
-                await modelActions.createType(model.name,  type);
-                await modelActions.activateCustomModel(model.name);
-            }
+            await modelActions.createModel(model);
+            await modelActions.createType(model.name,  type);
+            await modelActions.addPropertyToType(model.name,  type.name, [property]);
+            await modelActions.activateCustomModel(model.name);
+            await modelActions.isCustomTypeSearchable(type.title);
 
             acsUser = await usersActions.createUser();
             await apiService.login(acsUser.username, acsUser.password);
 
-            const uploadActions = new UploadActions(apiService);
             const filePdfNode = await uploadActions.uploadFile(pdfFile.location, pdfFile.name, '-my-');
             pdfFile.id = filePdfNode.entry.id;
             const docsNode = await uploadActions.uploadFile(docxFileModel.location, docxFileModel.name, '-my-');
             docxFileModel.id = docsNode.entry.id;
 
-            await loginPage.login(acsUser.username, acsUser.password);
         } catch (e) {
-            console.error('Failed to setup custom types', JSON.stringify(e, null, 2));
-            fail();
+            fail('Failed to setup custom types :: ' + JSON.stringify(e, null, 2));
         }
     });
 
+    afterAll(async () => {
+        await apiService.login(acsUser.username, acsUser.password);
+        await uploadActions.deleteFileOrFolder(pdfFile.id);
+        await uploadActions.deleteFileOrFolder(docxFileModel.id);
+        try {
+            await apiService.loginWithProfile('admin');
+            await modelActions.deactivateCustomModel(model.name);
+            await modelActions.deleteCustomModel(model.name);
+        } catch (e) {
+            console.error('failed to delete the model', e);
+        }
+    });
+
+    beforeEach( async () => {
+        await loginPage.login(acsUser.username, acsUser.password);
+        await navigationBarPage.navigateToContentServices();
+        await contentServicesPage.contentList.dataTablePage().waitTillContentLoaded();
+        await browser.sleep(8000); // wait for sso session to initiate
+    });
+
+    afterEach( async () => {
+        await navigationBarPage.clickLogoutButton();
+    });
+
     it('[C593560] Should the user be able to select a new content type and save it only after the confirmation dialog',  async () => {
         await BrowserActions.getUrl(browser.baseUrl + `/(overlay:files/${pdfFile.id}/view)`);
-
+        await viewerPage.checkFileIsLoaded(pdfFile.name);
         await viewerPage.clickInfoButton();
         await viewerPage.checkInfoSideBarIsDisplayed();
         await metadataViewPage.clickOnPropertiesTab();
         await metadataViewPage.editIconIsDisplayed();
 
         await expect(await viewerPage.getActiveTab()).toEqual('PROPERTIES');
-        await metadataViewPage.hasContentType('Content');
+        const defaultType  = (await metadataViewPage.hasContentType('Content')) || (await metadataViewPage.hasContentType('cm:content'));
+        await expect(defaultType).toBe(true, 'Content type not found');
 
         await metadataViewPage.editIconClick();
 
-        await metadataViewPage.changeContentType(type.title);
+        await expect(await metadataViewPage.changeContentType(type.title)).toBe(true, 'Failed to update node type.');
         await metadataViewPage.clickSaveMetadata();
-
         await metadataViewPage.checkConfirmDialogDisplayed();
         await metadataViewPage.applyNodeProperties();
 
+        await expect(await metadataViewPage.checkPropertyDisplayed(`properties.${model.namespacePrefix}:${property.name}`))
+            .toContain(property.defaultValue, 'Custom property not found');
+
         await navigationBarPage.clickLogoutButton();
         await loginPage.login(acsUser.username, acsUser.password);
         await navigationBarPage.navigateToContentServices();
-
-        await viewerPage.viewFile(pdfFile.name);
-        await viewerPage.checkFileIsLoaded();
-
+        await contentServicesPage.contentList.dataTablePage().waitTillContentLoaded();
+        await BrowserActions.getUrl(browser.baseUrl + `/(overlay:files/${pdfFile.id}/view)`);
+        await viewerPage.checkFileIsLoaded(pdfFile.name);
         await viewerPage.clickInfoButton();
         await viewerPage.checkInfoSideBarIsDisplayed();
         await metadataViewPage.clickOnPropertiesTab();
         await metadataViewPage.editIconIsDisplayed();
 
         await expect(await viewerPage.getActiveTab()).toEqual('PROPERTIES');
-        await metadataViewPage.hasContentType(type.title);
+        const customType  = (await metadataViewPage.hasContentType(type.title)) || (await metadataViewPage.hasContentType(`${model.namespacePrefix}:${type.name}`));
+        await expect(customType).toBe(true, 'Custom type not found');
+        await expect(await metadataViewPage.getPropertyText(`properties.${model.namespacePrefix}:${property.name}`)).toContain(property.defaultValue);
 
         await viewerPage.clickCloseButton();
     });
 
     it('[C593559] Should the user be able to select a new content type and not save it when press cancel in the confirmation dialog',  async () => {
         await BrowserActions.getUrl(browser.baseUrl + `/(overlay:files/${docxFileModel.id}/view)`);
-
+        await viewerPage.checkFileIsLoaded(docxFileModel.name);
         await viewerPage.clickInfoButton();
         await viewerPage.checkInfoSideBarIsDisplayed();
         await metadataViewPage.clickOnPropertiesTab();
         await metadataViewPage.editIconIsDisplayed();
 
         await expect(await viewerPage.getActiveTab()).toEqual('PROPERTIES');
-        await metadataViewPage.hasContentType('Content');
+        let defaultType  = (await metadataViewPage.hasContentType('Content')) || (await metadataViewPage.hasContentType('cm:content'));
+        await expect(defaultType).toBe(true, 'Content type not found');
 
         await metadataViewPage.editIconClick();
 
-        await metadataViewPage.changeContentType(type.title);
+        await expect(await metadataViewPage.changeContentType(type.title)).toBe(true, 'Failed to update node type.');
         await metadataViewPage.clickSaveMetadata();
 
         await metadataViewPage.checkConfirmDialogDisplayed();
@@ -143,18 +173,17 @@ describe('content type', () => {
         await navigationBarPage.clickLogoutButton();
         await loginPage.login(acsUser.username, acsUser.password);
         await navigationBarPage.navigateToContentServices();
-
-        await viewerPage.viewFile(docxFileModel.name);
-        await viewerPage.checkFileIsLoaded();
-
+        await contentServicesPage.contentList.dataTablePage().waitTillContentLoaded();
+        await BrowserActions.getUrl(browser.baseUrl + `/(overlay:files/${docxFileModel.id}/view)`);
+        await viewerPage.checkFileIsLoaded(docxFileModel.name);
         await viewerPage.clickInfoButton();
         await viewerPage.checkInfoSideBarIsDisplayed();
         await metadataViewPage.clickOnPropertiesTab();
         await metadataViewPage.editIconIsDisplayed();
 
         await expect(await viewerPage.getActiveTab()).toEqual('PROPERTIES');
-        await metadataViewPage.hasContentType('Content');
-
+        defaultType  = (await metadataViewPage.hasContentType('Content')) || (await metadataViewPage.hasContentType('cm:content'));
+        await expect(defaultType).toBe(true, 'Content type not found');
         await viewerPage.clickCloseButton();
     });
 });