Merge pull request #29 from SoftwareAG/feature/automation_location-pr…

…operties

E2E fixes added.

cypress-E2E-tests/cypress/integration/asset_properties_widget.cy.ts

@@ -8,7 +8,7 @@ const title = 'Asset Properties Updated';
 const titleTextElement = 'c8y-form-group > label';
 const titleFieldId = '#widgetTitle';
 const searchElement = "input[placeholder='Search for groups or assets…']";
-const assetsTextElement = "p[title='Assets']";
+const assetsTextElement = "p[title='Groups']";
 const textElement = "c8y-asset-selector p[class*='text-12']";
 const selectPropElement = "h3[id='modal-title']";
 const backArrowElement = "i[c8yicon='angle-left']";
@@ -24,6 +24,7 @@ const assetNameElement = 'c8y-asset-properties-item > p';
 const removePopupElement = 'h3 span';
 const propFeildElement = "input[type='text']";
 const saveElement = 'button[data-cy="asset-properties-save-button"]';
+const assetTitleName = '[title="check 1"] ';
 const groupObject = {
   label: 'Group',
   name: 'group',
@@ -168,23 +169,22 @@ describe('Asset Properties Widget: Configuration/View screen tests', function ()
     cy.get(keyElement).eq(2).should('not.exist');
   });
 
-  // Type in the title without selecting any asset, verify that clicking on save button should result in an alert message.
+  // Type in the title without selecting any asset, verify that clicking on save button should be disabled until asset is selected.
   it('TC_Asset_Properties_Widget_config_006', () => {
-    const configElement = 'c8y-asset-properties-config';
-    const alertMessage = ' Select an asset from the list. ';
     cy.get(titleFieldId).clear();
     cy.get(titleFieldId).type(title);
-    cy.get(asset_properties_widget_elements.saveButton).click();
-    cy.get(configElement).should('contain.text', alertMessage);
+    cy.get(asset_properties_widget_elements.saveButton).should('be.disabled');
     cy.selectAsset(assetName);
-    cy.get(configElement).should('not.contain.text', alertMessage);
+    cy.get(asset_properties_widget_elements.saveButton).should('be.enabled');
   });
 
   // Type in the title by selecting any asset, click on save and verify if the changes are getting reflected
   it('TC_Asset_Properties_Widget_config_007', () => {
     cy.get(titleFieldId).clear();
     cy.get(titleFieldId).type(title);
     cy.selectAsset(assetName);
+    // added wait to resolve flakyness after selecting asset its takes few ms to enabled save button
+    cy.wait(1000);
     cy.get(asset_properties_widget_elements.saveButton).click();
     cy.get(cardTitleElement).should('contain.text', title);
     cy.deleteCard();
@@ -283,7 +283,7 @@ describe('Asset Properties Widget: Configuration/View screen tests', function ()
     const selectionTextElement = 'c8y-asset-selector > div > p';
     cy.get(selectionTextElement).should('have.text', ' Asset selection ');
     cy.get(searchElement).should('be.visible');
-    cy.get(assetsTextElement).should('have.text', ' Assets ');
+    cy.get(assetsTextElement).should('have.text', ' Groups ');
   });
 
   // User should be able to select the asset.
@@ -299,7 +299,7 @@ describe('Asset Properties Widget: Configuration/View screen tests', function ()
     const subassetName = 'check 2';
     cy.get(asset_properties_widget_elements.loadMoreButton).click();
     cy.get(`p[title='${assetName1}']`).click();
-    cy.get(textElement).should('contains.text', 'Assets > ' + assetName1);
+    cy.get(textElement).should('contains.text', ' Groups > ' + assetName1);
     cy.get(`p[title='${subassetName}']`).should('be.visible');
   });
 
@@ -309,10 +309,10 @@ describe('Asset Properties Widget: Configuration/View screen tests', function ()
     const subassetName = 'check 2';
     cy.get(asset_properties_widget_elements.loadMoreButton).click();
     cy.get(`p[title='${assetName1}']`).click();
-    cy.get(textElement).should('contains.text', 'Assets > ' + assetName1);
+    cy.get(textElement).should('contains.text', 'Groups > ' + assetName1);
     cy.get(`p[title='${subassetName}']`).should('be.visible');
     cy.get(backArrowElement).click();
-    cy.get(assetsTextElement).should('contain.text', 'Assets');
+    cy.get(assetsTextElement).should('contain.text', 'Groups');
   });
 
   // User can select only one asset at a time.
@@ -322,7 +322,7 @@ describe('Asset Properties Widget: Configuration/View screen tests', function ()
     cy.get(asset_properties_widget_elements.loadMoreButton).click();
     cy.selectAsset(assetName);
     cy.selectAsset(assetName1);
-    cy.get(`div[title='Assets > ${assetName}']`)
+    cy.get(`div[title='Groups > ${assetName}']`)
       .children('div[class*="checkbox"]')
       .children('label')
       .children('input[type="radio"]')
@@ -334,11 +334,11 @@ describe('Asset Properties Widget: Configuration/View screen tests', function ()
     const assetName = 'check 1';
     cy.get(searchElement).type(assetName);
     cy.get(searchResultsElement).should('have.text', 'Search results');
-    cy.get('c8y-li > div').eq(1).should('contains.text', assetName).click();
+    cy.get(assetTitleName).should('contains.text', assetName).click();
     cy.get(asset_properties_widget_elements.radioButton).should('be.checked');
     cy.get(`p[title='${assetName}']`).should('contains.text', assetName);
     cy.get("button[title='Search']").click();
-    cy.get(assetsTextElement).should('contain.text', 'Assets');
+    cy.get(assetsTextElement).should('contain.text', 'Groups');
   });
 
   // On selecting the asset,user should be able to view all asset properties associated with that asset.Verify if checkboxes for properties are selected by default
@@ -347,7 +347,7 @@ describe('Asset Properties Widget: Configuration/View screen tests', function ()
     const assetName = 'check 1';
     const subassetName = 'check 1 > check 2 > check 4';
     cy.get(searchElement).type(assetName);
-    cy.get('c8y-li > div').eq(1).should('contains.text', assetName).click();
+    cy.get(assetTitleName).should('contains.text', assetName).click();
     cy.get('i[c8yicon="angle-right"]').click();
     cy.selectSubasset(subassetName);
     cy.get(asset_properties_widget_elements.addPropertyButton).click();
@@ -381,17 +381,17 @@ describe('Asset Properties Widget: Configuration/View screen tests', function ()
     cy.get(searchElement).type(assetName);
     cy.get(searchResultsElement).should('have.text', 'Search results');
     cy.get(strongTextElement).should('have.text', 'No match found.');
-    cy.get(smallTextElement).should('have.text', 'Try to rephrase your search word.');
+    cy.get(smallTextElement).should('have.text', ' Try to rephrase your search word. ');
   });
 
   // Verify that on click of an asset in Asset selection section it should navigate to the next screen displaying empty state message
   it('TC_Asset_Properties_Widget_config_030', () => {
     const assetName = 'check 3';
     const filterElement = "button[title='Apply filter']";
-    cy.get(assetsTextElement).should('contain.text', 'Assets');
+    cy.get(assetsTextElement).should('contain.text', 'Groups');
     cy.get(asset_properties_widget_elements.loadMoreButton).click();
     cy.get(`p[title='${assetName}']`).click();
-    cy.get(textElement).should('contains.text', 'Assets > ' + assetName);
+    cy.get(textElement).should('contains.text', 'Groups > ' + assetName);
     cy.get(backArrowElement).should('be.visible');
     cy.get('input[placeholder="Filter this column…"]').click();
     cy.get(filterElement).should('be.visible');

cypress-E2E-tests/cypress/integration/integration.cy.ts

@@ -162,7 +162,7 @@ describe('Asset Properties Widget: Integration tests', function () {
   it('TC_Asset_Properties_Widget_Integration_003', () => {
     const assetName = 'Test Asset3';
     cy.selectAssetPropertyAndSave(assetName, propKey);
-    cy.get(propValueElement).should('contain.text', 'Not Defined');
+    cy.get(propValueElement).should('contain.text', ' Undefined ');
 
     // delete asset in digital twin manager
     cy.visitAndWaitUntilPageLoad(dtmURL);
@@ -178,7 +178,7 @@ describe('Asset Properties Widget: Integration tests', function () {
     const assetName = 'Test Asset2';
     const confirmButton = "button[title='Confirm']";
     cy.selectAssetPropertyAndSave(assetName, propKey);
-    cy.get(propValueElement).should('contain.text', 'Not Defined');
+    cy.get(propValueElement).should('contain.text', ' Undefined ');
     cy.deleteCard();
 
     // remove property in digital twin manager

cypress-E2E-tests/cypress/support/asset_properties_widget.commands.ts

@@ -79,7 +79,7 @@ declare global {
 }
 
 Cypress.Commands.add('selectAsset', assetName => {
-  cy.get(`div[title='Assets > ${assetName}']`)
+  cy.get(`div[title='Groups > ${assetName}']`)
     .children('div[class*="checkbox"]')
     .children('label')
     .children('input[type="radio"]')
@@ -168,7 +168,10 @@ Cypress.Commands.add('deleteWidgetInstances', title => {
 });
 
 Cypress.Commands.add('selectAssetAndSave', assetName => {
+
   cy.selectAsset(assetName);
+  // added wait to resolve flakyness after selecting asset its takes few ms to enabled save button
+  cy.wait(1000);
   cy.get(asset_properties_widget_elements.saveButton).click();
 });
 

cypress-E2E-tests/cypress/support/page_objects/asset_properties_widget_elements.ts

@@ -14,7 +14,7 @@ export default {
   editWidgetButton: "button[title='Edit widget']",
   removeWidgetButton: "button[title='Remove widget']",
   removeButton: "button[title='Remove']",
-  loadMoreButton: "button[title='Assets > Load more']",
+  loadMoreButton: "button[title='Groups > Load more']",
   changeButton: "button[title='Change']",
   widgetDashboardAddWidgetButton: "[data-cy='widget-dashboard--Add-widget']",
   saveAssetTypeButton: '.card-footer.separator.sticky-bottom>.btn.btn-primary',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cumulocity-asset-properties-widget-plugin",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Asset properties",
   "author": "Amarjyoti Raj - Software AG, IOT-Apps R&D",
   "license": "Apache 2.0",