Fix Rename Workspace Test

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

@@ -4,7 +4,7 @@ import EventEmitter from 'events'
 class CurrentWorkspaceIs extends EventEmitter {
   command (this: NightwatchBrowser, name: string): NightwatchBrowser {
     const browser = this.api
-    const xpath = `//*[@data-id="workspacesSelect"]//*[@data-id="dropdown-content"][contains(normalize-space(), "${name}")]`;
+    const xpath = `//*[@data-id="workspacesSelect"]//*[@data-id="workspacesSelect-togglerText"][contains(normalize-space(), "${name}")]`;
 
     browser.waitForElementVisible({
       locateStrategy: 'xpath',

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

@@ -14,7 +14,7 @@ class ScrollInto extends EventEmitter {
 }
 
 function _scrollInto (browser: NightwatchBrowser, target: string, cb: VoidFunction): void {
-  browser.execute(function (target) {
+  browser.executeScript(function (target) {
     document.querySelector(target).scrollIntoView(({ block: 'center' }))
   }, [target], function () {
     cb()

apps/remix-ide-e2e/src/helpers/init.ts

@@ -28,21 +28,46 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
     .verifyLoad()
     .enableClipBoard()
     .perform((done) => {
-      browser.execute(function () { // hide tooltips
+      browser.execute(function () { // hide tooltips for Bootstrap 5
         function addStyle(styleString) {
           const style = document.createElement('style');
           style.textContent = styleString;
           document.head.append(style);
         }
 
         addStyle(`
-          .popover {
-            display:none !important;
+          .popover,
+          .tooltip,
+          .bs-popover-auto,
+          .bs-tooltip-auto,
+          .bs-popover-top,
+          .bs-popover-bottom,
+          .bs-popover-start,
+          .bs-popover-end,
+          .bs-tooltip-top,
+          .bs-tooltip-bottom,
+          .bs-tooltip-start,
+          .bs-tooltip-end {
+            display: none !important;
+            opacity: 0 !important;
+            visibility: hidden !important;
           }
           #scamDetails {
-            display:none !important;
+            display: none !important;
           }
-          `);
+        `);
+
+        // Additionally, programmatically disable all Bootstrap 5 tooltips
+        if ((window as any).bootstrap && typeof (window as any).bootstrap.Tooltip === 'function') {
+          const tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
+          tooltipTriggerList.forEach(function (tooltipTriggerEl) {
+            try {
+              const tooltipInstance = (window as any).bootstrap.Tooltip.getInstance(tooltipTriggerEl) || new (window as any).bootstrap.Tooltip(tooltipTriggerEl);
+              tooltipInstance.disable && tooltipInstance.disable();
+              tooltipInstance.hide && tooltipInstance.hide();
+            } catch (e) {}
+          });
+        }
       }, [], done())
     })
     .perform(() => {

apps/remix-ide-e2e/src/local-plugin/src/app/app.tsx

@@ -1,24 +1,28 @@
-import React, {useEffect, useState} from 'react'
-import {RemixPlugin} from './Client'
-import {Logger} from './logger'
-import {filePanelProfile} from '@remixproject/plugin-api'
-import {filSystemProfile} from '@remixproject/plugin-api'
-import {editorProfile} from '@remixproject/plugin-api'
-import {settingsProfile} from '@remixproject/plugin-api'
-import {networkProfile} from '@remixproject/plugin-api'
-import {udappProfile} from '@remixproject/plugin-api'
-import {compilerProfile} from '@remixproject/plugin-api'
-import {contentImportProfile} from '@remixproject/plugin-api'
-import {windowProfile} from '@remixproject/plugin-api'
-import {pluginManagerProfile} from '@remixproject/plugin-api'
-import {LibraryProfile, Profile} from '@remixproject/plugin-utils'
-
+import React, { useEffect, useState } from 'react'
+import { RemixPlugin } from './Client'
+import { Logger } from './logger'
+import { filePanelProfile } from '@remixproject/plugin-api'
+import { filSystemProfile } from '@remixproject/plugin-api'
+import { editorProfile } from '@remixproject/plugin-api'
+import { settingsProfile } from '@remixproject/plugin-api'
+import { networkProfile } from '@remixproject/plugin-api'
+import { udappProfile } from '@remixproject/plugin-api'
+import { compilerProfile } from '@remixproject/plugin-api'
+import { contentImportProfile } from '@remixproject/plugin-api'
+import { windowProfile } from '@remixproject/plugin-api'
+import { pluginManagerProfile } from '@remixproject/plugin-api'
+import { LibraryProfile, Profile } from '@remixproject/plugin-utils'
+import './app.css'
 
 export const dGitProfile: LibraryProfile<any> = {
   name: 'dgitApi',
   methods: ['status', 'log', 'commit', 'add', 'branches'],
 }
-import './app.css'
+
+export const topbarProfile: LibraryProfile<any> = {
+  name: 'topbar',
+  methods: ['getWorkspaces'],
+}
 
 const client = new RemixPlugin()
 
@@ -38,16 +42,17 @@ function App() {
     compilerProfile,
     udappProfile,
     contentImportProfile,
-    windowProfile
+    windowProfile,
+    topbarProfile
   ])
 
-  const handleChange = ({target}: any) => {
+  const handleChange = ({ target }: any) => {
     setPayload(target.value)
   }
 
   useEffect(() => {
     client.onload(async () => {
-      const customProfiles = ['menuicons', 'tabs', 'solidityUnitTesting', 'hardhat-provider', 'notification']
+      const customProfiles = ['menuicons', 'tabs', 'solidityUnitTesting', 'hardhat-provider', 'notification', 'topbar']
 
       client.testCommand = async (data: any) => {
         methodLog(data)
@@ -123,7 +128,7 @@ function App() {
       {profiles.map((profile: Profile) => {
         const methods = profile.methods.map((method: string) => {
           return (
-            <button data-id={`${profile.name}:${method}`} key={method} className="btn btn-primary btn-sm ms-1 mb-1" onClick={async () => await clientMethod(profile, method)}>
+            <button id={`${profile.name}-${method}-${profile.name}`} data-id={`${profile.name}-${method}`} key={method} className="btn btn-primary btn-sm ms-1 mb-1" onClick={async () => await clientMethod(profile, method)}>
               {method}
             </button>
           )
@@ -140,9 +145,9 @@ function App() {
         return (
           <div key={profile.name} className="small border-bottom">
             <label className="text-uppercase">{profile.name}</label>
-            <br></br>
+            <br/>
             {methods}
-            <br></br>
+            <br/>
             {events ? <label>EVENTS:</label> : null}
             {events}
           </div>