Merge pull request #764 from ketulsha/main

UI automation test update as per carbon library update
hyperledger-labs · Jun 28, 2024 · 33c82fc · 33c82fc
2 parents 5b9ba31 + 92aeb8b
commit 33c82fc
Show file tree

Hide file tree

Showing 17 changed files with 254 additions and 159 deletions.
diff --git a/packages/apollo/test/cypress/e2e/features/02-BuildNetwork.feature b/packages/apollo/test/cypress/e2e/features/02-BuildNetwork.feature
@@ -74,7 +74,7 @@ Feature: Build a network feature
         And I clicked the button with title 'Select an MSP'
         And I clicked the div with text 'Org1 MSP'
         And I clicked the button with title 'Select a Fabric version'
-        And I clicked the div with text '2.5'
+        And I clicked the div with text '2.2'
         And I clicked the button with id 'next'
         And I clicked the button with title 'Please select an identity from your wallet'
         And I clicked the div with text 'Org1 MSP Admin'
@@ -159,7 +159,7 @@ Feature: Build a network feature
         And I clicked the button with title 'Select an MSP'
         And I clicked the dropdown item 'Ordering Service MSP' with class '.cds--list-box__menu-item__option'
         And I clicked the button with title 'Select a Fabric version'
-        And I clicked the dropdown item '2.5' with class '.cds--list-box__menu-item__option'
+        And I clicked the dropdown item '2.2' with class '.cds--list-box__menu-item__option'
         And I clicked the button with id 'next'
         Then wait "2" seconds
         And I clicked the button with title 'Please select an identity from your wallet'

diff --git a/packages/apollo/test/cypress/e2e/features/03-JoinANetwork.feature b/packages/apollo/test/cypress/e2e/features/03-JoinANetwork.feature
@@ -99,18 +99,21 @@ Feature: Join a network feature
         And I clicked the button with title 'Create MSP definition'
         And I provided 'Org2 MSP' for the 'Enter name for the MSP' input
         And I provided 'org2msp' for the 'Enter the MSP ID' input
-        And I clicked the span with text 'Next'
-        And I clicked the button with title 'Select a root Certificate Authority'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#generateMSPModal > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+		And I clicked the button with title 'Select a root Certificate Authority'
         And I clicked the div with text 'Org2 CA'
         And wait "3" seconds
-        And I clicked the span with text 'Next'
+        #And I clicked the span with text 'Next'
+		And I clicked element with class '#generateMSPModal > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
         And I clicked the button with title 'org2admin'
         And I clicked the div with text 'org2admin'
         And I provided 'org2adminpw' for the 'Enter a secret' input
         And I provided 'Org2 MSP Admin' for the 'Enter name for the identity to be stored in your Wallet' input
         And I clicked the button with text 'Generate'
         And I clicked the button with text 'Export'
-        And I clicked the span with text 'Next'
+        #And I clicked the span with text 'Next'
+		And I clicked element with class '#generateMSPModal > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
         And I click Create MSP definition button
         Then I should see a success toast with class '.cds--toast-notification__title' which says "MSP Org2 MSP has been created successfully."
 

diff --git a/packages/apollo/test/cypress/e2e/features/04-CreateAndJoin2x_Org1AndOrg2.feature b/packages/apollo/test/cypress/e2e/features/04-CreateAndJoin2x_Org1AndOrg2.feature
@@ -84,12 +84,14 @@ Feature: Create and Join a 2.x channel
         And I am on the 'channels' page
         And I clicked the button with title 'Create channel'
         And I clicked the checkbox with text 'Advanced channel configuration'
-        And I clicked the span with text 'Next'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
         And I provided 'channel2' for the 'Enter a name for your channel' input
         And I clicked the button with title 'Select from available ordering services'
-        And I clicked the div with id 'downshift-0-item-0'
+        And I clicked the div with text 'Ordering Service'
 		Then wait "3" seconds
-        And I clicked the span with text 'Next'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
         And I clicked the button with title 'Select MSP'
         And I clicked the div with text 'Org1 MSP (org1msp)'
         And I clicked the button with text 'Add'
@@ -98,28 +100,38 @@ Feature: Create and Join a 2.x channel
         And I clicked the div with text 'Org2 MSP (org2msp)'
         And I clicked the button with text 'Add'
         And I clicked the 'admin' role for 'org2msp'
-        And I clicked the span with text 'Next'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
         And I clicked the button with title 'Select policy'
         And I clicked the div with text '1 out of 2'
-        And I clicked the span with text 'Next'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
         And I clicked the button with title 'Select the MSP'
         And I clicked the div with text 'Org1 MSP (org1msp)'
         And I clicked the button with title 'Select an identity'
         And I clicked the div with text 'Org1 MSP Admin'
-        And I clicked the span with text 'Next'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
         And I clicked the div with id 'selectedApplicationCapability'
         And I clicked the div with text '2.0.0'
         And I clicked the div with id 'selectedOrdererCapability'
-		And I clicked element with class '#selectedOrdererCapability > div > div:nth-child(2)'
-        And I clicked the span with text 'Next'
-        And I clicked the span with text 'Next'
-        And I clicked the span with text 'Next'
-        And I clicked the span with text 'Next'
-        And I clicked the span with text 'Next'
+		And I clicked element with class '#selectedOrdererCapability > ul > li:nth-child(2) > div'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
         And I clicked the button with title 'Select the MSP'
         And I clicked the div with text 'Ordering Service MSP (osmsp)'
-		And I clicked the span with text 'Next'
-		And I clicked the span with text 'Next'
+		# And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+		# And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
         Then I clicked Create channel button
 		Then wait "10" seconds
 		Then I should see a success toast with class '.cds--toast-notification__title' which says "You have successfully initiated a request to create channel2. This request requires the signature of an ordering service MSP. After the request has been signed and submitted, you will see a pending channel tile. Clicking on this tile will allow you to join a peer to the channel."
@@ -146,8 +158,10 @@ Feature: Create and Join a 2.x channel
         And I am on the 'channels' page
         And I clicked the div with id 'ibp-tile-channel2'
         Then wait "5" seconds
-        And I clicked the span with text 'Peer Org1'
-        And I clicked the span with text 'Peer Org2'
+        # And I clicked the span with text 'Peer Org1'
+		And I click label with property 'for' and value 'joinChannelModal-peer-peerorg1'
+        # And I clicked the span with text 'Peer Org2'
+		And I click label with property 'for' and value 'joinChannelModal-peer-peerorg2'
         When I clicked the button with id 'submit'
         Then I should see a success toast with class '.cds--toast-notification__title' which says "You have successfully joined channel2."
 		Then the element div with text 'channel2' should be visible on page
diff --git a/packages/apollo/test/cypress/e2e/features/05-Install20SmartContract.feature b/packages/apollo/test/cypress/e2e/features/05-Install20SmartContract.feature
@@ -144,23 +144,35 @@ Feature: 2.0 Lifecycle Flow
 		And I clicked the button with title 'Select an identity'
 		And I clicked the div with text 'Org2 MSP Admin'
 		Then wait "1" seconds
-        And I clicked the span with text 'Next'
-        And I clicked the span with text 'Next'
-        And I clicked the span with text 'Next'
-        And I clicked the span with text 'Next'
-        And I clicked the span with text 'Next'
-        And I clicked the span with text 'Next'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+        # And I clicked the span with text 'Next'
+        And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+		# And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+        # And I clicked the span with text 'Next'
+        And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+		# And I clicked the span with text 'Next'
+        And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+		# And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
 		And I provided '13' for input field with id 'channelModal-block-params-absolute_max_bytes_mb-input-for-slider'
 		And I provided '510' for input field with id 'channelModal-block-params-max_message_count-input-for-slider'
-        And I clicked the span with text 'Next'
-        And I clicked the span with text 'Next'
-        And I clicked the span with text 'Next'
-		And I clicked the span with text 'Next'
-        And I clicked the button with title 'Select the MSP'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+		# And I clicked the span with text 'Next'
+        And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+		And I clicked the button with title 'Select the MSP'
         And I clicked the div with text 'Ordering Service MSP (osmsp)'
-        And I clicked the span with text 'Next'
-		And I clicked the span with text 'Next'
-        And I clicked the span with text 'Update channel'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+		# And I clicked the span with text 'Next'
+        And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+		And I clicked the span with text 'Update channel'
         Then I should see a success toast with class '.cds--toast-notification__title' which says 'You have successfully initiated a request to update channel channel2.'
 		# View channel configuration updates
 		When I clicked the button with id 'ibp-header-signature-collection-icon'

diff --git a/packages/apollo/test/cypress/e2e/features/06-CreateAndJoin1x_Org1.feature b/packages/apollo/test/cypress/e2e/features/06-CreateAndJoin1x_Org1.feature
@@ -83,29 +83,37 @@ Feature: Create and Join a 1.x channel
 
     Scenario: When creating a channel
         And I clicked the button with title 'Create channel'
-        And I clicked the span with text 'Next'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
         And I provided 'channel1' for the 'Enter a name for your channel' input
         And I clicked the button with title 'Select from available ordering services'
-        And I clicked the div with id 'downshift-0-item-0'
-        And I clicked the span with text 'Next'
+		# And I clicked the div with text 'Ordering Service'
+		And I clicked element with class '#selectedOrderer > ul > li:nth-child(1)'
+        # And I clicked the span with text 'Next'
+		Then wait "1" seconds
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
         And I clicked the button with title 'Select MSP'
         And I clicked the div with text 'Org1 MSP (org1msp)'
         And I clicked the button with text 'Add'
         And I clicked the 'admin' role for 'org1msp'
-        And I clicked the span with text 'Next'
-        And I clicked the span with text 'Next'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
         And I clicked the button with title 'Select the MSP'
         And I clicked the div with text 'Org1 MSP (org1msp)'
         And I clicked the button with title 'Select an identity'
         And I clicked the div with text 'Org1 MSP Admin'
-        And I clicked the span with text 'Next'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
         Then I clicked Create channel button
         Then I should see a success toast with class '.cds--toast-notification__title' which says "You have successfully initiated a request to create channel1. Join a peer to this channel by clicking the pending channel tile below."
         And the channel with name 'channel1' should have been created
 
     Scenario: When joining a channel
         And I clicked the div with text 'channel1'
         Then wait "5" seconds
-        And I clicked the span with text 'Peer Org1'
+        # And I clicked the span with text 'Peer Org1'
+		And I click label with property 'for' and value 'joinChannelModal-peer-peerorg1'
         When I clicked the button with id 'submit'
         Then I should see a success toast with class '.cds--toast-notification__title' which says "You have successfully joined channel1."
diff --git a/packages/apollo/test/cypress/e2e/features/07-UpdateAndJoinChannel_Org2.feature b/packages/apollo/test/cypress/e2e/features/07-UpdateAndJoinChannel_Org2.feature
@@ -32,6 +32,7 @@ Feature: Update channel to add Org2
         And the CA admin is set as 'Ordering Service CA Admin'
         Then the 'admin' user with id 'OSadmin' should be enrolled
         And the 'orderer' user with id 'OS1' should be enrolled
+		Then wait "5" seconds
         And I enroll TLS identity for OS1 with secret 'OS1pw' and name 'TLSOS1'
         And I am on the 'nodes' page
         And I clicked the 'Org2 CA' certificate authority
@@ -88,19 +89,27 @@ Feature: Update channel to add Org2
         And I clicked the div with text 'Org1 MSP (org1msp)'
         And I clicked the button with title 'Select an identity'
         And I clicked the div with text 'Org1 MSP Admin'
-        And I clicked the span with text 'Next'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
         And I clicked the button with title 'Select MSP'
         And I clicked the div with text 'Org2 MSP (org2msp)'
         And I clicked the button with id 'btn-add-org'
         And I clicked the 'admin' role for 'org2msp'
-        And I clicked the span with text 'Next'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
         And I clicked the button with title 'Select policy'
         And I clicked the div with text '1 out of 2'
-        And I clicked the span with text 'Next'
-        And I clicked the span with text 'Next'
-        And I clicked the span with text 'Next'
-        And I clicked the span with text 'Next'
-        And I clicked the span with text 'Next'
-        And I clicked the span with text 'Next'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
+        # And I clicked the span with text 'Next'
+		And I clicked element with class '#ibp--template-full-page-side-panel > div.ibp-button-container.ibp-vertical-panel-button-container > button:nth-child(2) > span'
         And I clicked the span with text 'Update channel'
         Then I should see a success toast with class '.cds--toast-notification__title' which says "You have successfully initiated a request to update channel channel1."