remove 'customize list' menu and update e2e tests

Author: ci-bot

apps/remix-ide-e2e/src/commands/pinGrid.ts

@@ -18,6 +18,7 @@ class switchEnvironment extends EventEmitter {
           if (shouldWait) {
             browser
               .waitForElementVisible(`[data-id="selected-provider-${providerName}"]`, 15000)
+              .pause(1000)
               .perform(() => done())
           } else {
             done()
@@ -126,23 +127,12 @@ class switchEnvironment extends EventEmitter {
 
           attemptSelect(this.api, provider, returnWhenInitialized, () => {
             waitForSelectedOrModal(this.api, provider, 10000, (ok) => {
-              if (ok) return done()
-
-              this.api.isPresent({
-                selector: `*[data-id="${provider}ModalDialogContainer-react"]`,
-                suppressNotFoundErrors: true,
-                timeout: 0
-              }, (hasModal) => {
-                if (!hasModal.value) {
-                  ensureDropdownClosed(this.api)
-                }
-                this.api
-                  .pinGrid(provider, true)
-                  .click('[data-id="settingsSelectEnvOptions"] button')
-                attemptSelect(this.api, provider, returnWhenInitialized, () => {
-                  waitForSelectedOrModal(this.api, provider, 10000, () => done())
-                })
-              })
+              if (ok) {
+                return done()
+              } else {
+                this.api.assert.fail(`Environment "${provider}" could not be selected or found in the dropdown.`)
+                done()
+              }
             })
           })
         })

apps/remix-ide-e2e/src/commands/switchEnvironment.ts

@@ -183,7 +183,6 @@ module.exports = {
       .frameParent()
       .useCss()
       .clickLaunchIcon('udapp')
-      .pinGrid('vm-berlin', true)
       .clickLaunchIcon('localPlugin')
       .useXpath()
       .frame(0)

apps/remix-ide-e2e/src/tests/grid.test.ts

@@ -340,7 +340,6 @@ module.exports = {
   'Should connect to the sepolia fork and run web3.eth.getCode in the terminal #group9': function (browser: NightwatchBrowser) {
     if (runMasterTests)
       browser
-        .pinGrid('vm-custom-fork', true)
         .switchEnvironment('vm-custom-fork')
         .waitForElementVisible('[data-id="vm-custom-fork-modal-footer-ok-react"]')
         .execute(() => {

apps/remix-ide-e2e/src/tests/plugin_api.ts

@@ -140,43 +140,45 @@ const tests = {
         })
       .clickLaunchIcon('filePanel')
   },
-  'Should show fork states provider in environment explorer & make txs using forked state #group1': function (browser: NightwatchBrowser) {
+  'Should show fork states provider in environment dropdown & make txs using forked state #group1': function (browser: NightwatchBrowser) {
     browser
       .clickLaunchIcon('udapp')
       .waitForElementVisible('[data-id="settingsSelectEnvOptions"]')
       .click('[data-id="settingsSelectEnvOptions"] button')
-      .waitForElementVisible(`[data-id="dropdown-item-another-chain"]`)
-      .click(`[data-id="dropdown-item-another-chain"]`)
-      .waitForElementVisible('[data-id="remixUIGSDeploy to an In-browser Forked State."]')
-      .waitForElementPresent('[data-id="remixUIGSforkedState_1"]')
-      .waitForElementPresent('[data-id="vm-fs-forkedState_1-pinned"]')
-      .waitForElementContainsText('[data-id="vm-fs-forkedState_1desc"]', 'Latest Block: 2')
-      .waitForElementNotPresent('[data-id="remixUIGSforkedState_2"]')
+      .useXpath()
+      .moveToElement("//span[contains(@class,'dropdown-item') and normalize-space()='Remix VM']", 5, 5)
+      .useCss()
+      .waitForElementVisible(`[data-id="dropdown-item-vm-fs-forkedState_1"]`)
+      .click('[data-id="settingsSelectEnvOptions"] button') 
       .switchEnvironment('vm-prague')
       .openFile('contracts/1_Storage.sol')
-      .verifyContracts(['Storage'])
+      .clickLaunchIcon('solidity')
+      .click('*[data-id="compilerContainerCompileBtn"]')
+      .pause(2000)
       .clickLaunchIcon('udapp')
+      .selectContract('Storage')
       .click('*[data-id="Deploy - transact (not payable)"]')
-      .waitForElementVisible('*[data-id="unpinnedInstance0xf8e81D47203A594245E36C48e151709F0C19fBe8"]')
+      .pause(5000)
       .click('*[data-id="fork-state-icon"]')
       .waitForElementVisible('*[data-id="udappNotifyModalDialogModalTitle-react"]')
+      .pause(2000)
       .click('input[data-id="modalDialogForkState"]')
       .setValue('input[data-id="modalDialogForkState"]', 'forkedState_2')
       .modalFooterOKClick('udappNotify')
       .waitForElementVisible('*[data-shared="tooltipPopup"]', 10000)
       .waitForElementContainsText('*[data-shared="tooltipPopup"]', `New environment 'forkedState_2' created with forked state.`)
-      // check if 'forkedState_2' is selected as current environment 
-      .waitForElementPresent('*[data-id="selected-provider-vm-fs-forkedState_2"]')
-      // check if 'forkedState_2' is present in environment explorer
-      .waitForElementPresent('[data-id="remixUIGSforkedState_2"]')
-      // check if 'forkedState_2' is pinned in environment explorer
-      .waitForElementPresent('[data-id="vm-fs-forkedState_2-pinned"]')
-      // 'forkedState_2' should have 3 blocks
-      .waitForElementContainsText('[data-id="vm-fs-forkedState_2desc"]', 'Latest Block: 3')
+      .assert.elementPresent('*[data-id="selected-provider-vm-fs-forkedState_2"]')
+      
+      .click('[data-id="settingsSelectEnvOptions"] button')
+      .useXpath()
+      .moveToElement("//span[contains(@class,'dropdown-item') and normalize-space()='Remix VM']", 5, 5)
+      .useCss()
+      .waitForElementVisible(`[data-id="dropdown-item-vm-fs-forkedState_2"]`)
+      .click('[data-id="settingsSelectEnvOptions"] button')
+      
       .click('*[data-id="Deploy - transact (not payable)"]')
       .clickInstance(0)
       .clickFunction('store - transact (not payable)', { types: 'uint256 num', values: '"555"' })
-      // block number should be 5 after 2 txs
       .testFunction('last',
         {
           status: '0x1 Transaction mined and execution succeed',
@@ -188,7 +190,9 @@ const tests = {
     browser
       .switchEnvironment('vm-prague')
       .openFile('contracts/1_Storage.sol')
-      .verifyContracts(['Storage'])
+      .clickLaunchIcon('solidity')
+      .click('*[data-id="compilerContainerCompileBtn"]')
+      .pause(2000)
       .clickLaunchIcon('udapp')
       .click('*[data-id="Deploy - transact (not payable)"]')
       .pause(10000)

apps/remix-ide-e2e/src/tests/terminal.test.ts

@@ -70,7 +70,6 @@ declare module 'nightwatch' {
     currentSelectedFileIs(name: string): NightwatchBrowser
     switchWorkspace: (workspaceName: string) => NightwatchBrowser
     switchEnvironment: (provider: string, returnWhenInitialized?: boolean) => NightwatchBrowser
-    pinGrid: (provider: string, status: boolean) => NightwatchBrowser
     connectToExternalHttpProvider: (url: string, identifier: string) => NightwatchBrowser
     waitForElementNotContainsText: (id: string, value: string, timeout: number = 10000) => NightwatchBrowser
     hideToolTips: (this: NightwatchBrowser) => NightwatchBrowser

apps/remix-ide-e2e/src/tests/vm_state.test.ts

@@ -144,9 +144,6 @@ export class Blockchain extends Plugin {
     // used to pin and select newly created forked state provider
     this.on('udapp', 'forkStateProviderAdded', (providerName) => {
       const name = `vm-fs-${providerName}`
-      this.emit('shouldAddProvidertoUdapp', name, this.getProviderObjByName(name))
-      this.pinnedProviders.push(name)
-      this.call('config', 'setAppParameter', 'settings/pinned-providers', JSON.stringify(this.pinnedProviders))
       _paq.push(['trackEvent', 'blockchain', 'providerPinned', name])
       this.emit('providersChanged')
       this.changeExecutionContext({ context: name }, null, null, null)
@@ -731,13 +728,13 @@ export class Blockchain extends Plugin {
   }
 
   addProvider(provider: Provider) {
-    if (this.pinnedProviders.includes(provider.name)) this.emit('shouldAddProvidertoUdapp', provider.name, provider)
+    this.emit('shouldAddProvidertoUdapp', provider.name, provider)
     this.executionContext.addProvider(provider)
     this.emit('providersChanged')
   }
 
   removeProvider(name) {
-    if (this.pinnedProviders.includes(name)) this.emit('shouldRemoveProviderFromUdapp', name, this.getProviderObjByName(name))
+    this.emit('shouldRemoveProviderFromUdapp', name, this.getProviderObjByName(name))
     this.executionContext.removeProvider(name)
     this.emit('providersChanged')
   }

apps/remix-ide-e2e/src/types/index.d.ts

@@ -246,16 +246,6 @@ export function EnvironmentUI(props: EnvironmentProps) {
                 ))}
               </SubmenuPortal>
             )}
-
-            <Dropdown.Divider className="border-secondary" />
-
-            <Dropdown.Item
-              key={10000}
-              onClick={() => { props.setExecutionContext({ context: 'item-another-chain' }) }}
-              data-id="dropdown-item-another-chain"
-            >
-              <span className="">Customize this list...</span>
-            </Dropdown.Item>
           </Dropdown.Menu>
         </Dropdown>
       </div>