fix e2e

Author: joeizang

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

@@ -17,18 +17,34 @@ function selectCtx(browser: NightwatchBrowser, ctx: string, done: VoidFunction)
   browser
     .waitForElementVisible('*[data-id="remix-ai-assistant"]')
     .waitForElementVisible('*[data-id="composer-ai-add-context"]')
-    .click('*[data-id="composer-ai-add-context"]')
-    .waitForElementVisible('*[data-id="currentFile-context-option"]')
+    .click({
+      locateStrategy: 'xpath',
+      selector: '//*[@data-id="composer-ai-add-context"]'
+    })
+    .click({
+      locateStrategy: 'xpath',
+      selector: '//*[@data-id="currentFile-context-option"]'
+    })
+    .pause()
     .perform(async ()=> {
       switch (ctx) {
       case 'currentFile':
-        browser.click('*[data-id="currentFile-context-option"]');
+        browser.click({
+          locateStrategy: 'xpath',
+          selector: '//*[@data-id="currentFile-context-option"]'
+        });
         break;
       case 'workspace':
-        browser.click('*[data-id="workspace-context-option"]');
+        browser.click({
+          locateStrategy: 'xpath',
+          selector: '//*[@data-id="workspace-context-option"]'
+        });
         break;
       case 'openedFiles':
-        browser.click('*[data-id="allOpenedFiles-context-option"]');
+        browser.click({
+          locateStrategy: 'xpath',
+          selector: '//*[@data-id="allOpenedFiles-context-option"]'
+        });
         break;
       default:
         break;

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

@@ -24,8 +24,9 @@ module.exports = {
   // Conversation starter button with data id 'explain-editor' doesn't exist anymore
   'Should explain the contract #group1': function (browser: NightwatchBrowser) {
     browser
-      .waitForElementVisible('*[data-id="remix-ai-assistant-suggestion-Explain-what-a-modifier-is"]')
-      .click('*[data-id="remix-ai-assistant-suggestion-Explain-what-a-modifier-is"]')
+      .clickLaunchIcon('remixaiassistant')
+      .waitForElementVisible('*[data-id="remix-ai-assistant-starter-0"]')
+      .click('*[data-id="remix-ai-assistant-starter-0"]')
       .waitForElementVisible('*[data-id="remix-ai-assistant"]')
       .waitForElementVisible({
         locateStrategy: 'xpath',

libs/remix-ui/remix-ai-assistant/src/components/chat.tsx

@@ -39,10 +39,10 @@ export const ChatHistoryComponent: React.FC<ChatHistoryComponentProps> = ({
             RemixAI provides you personalized guidance as you build. It can break down concepts,
             answer questions about blockchain technology and assist you with your smart contracts.
           </p>
-          {DEFAULT_SUGGESTIONS.map(s => (
+          {DEFAULT_SUGGESTIONS.map((s, index) => (
             <button
               key={s}
-              data-id={`remix-ai-assistant-suggestion-${s.replace(/\s+/g, '-')}`}
+              data-id={`remix-ai-assistant-starter-${index}`}
               className="btn btn-secondary mb-2 w-100 text-left"
               onClick={() => sendPrompt(s)}
             >

libs/remix-ui/remix-ai-assistant/src/components/prompt.tsx

@@ -78,7 +78,7 @@ export const PromptArea: React.FC<PromptAreaProps> = ({
                 setShowContextOptions(false)
               }}
             />
-            <label className="form-check-label custom-control-label" htmlFor="ctx-current">
+            <label className="form-check-label custom-control-label" data-id="currentFile-context-option" htmlFor="ctx-current">
               Current file
             </label>
           </div>
@@ -94,7 +94,7 @@ export const PromptArea: React.FC<PromptAreaProps> = ({
                 setShowContextOptions(false)
               }}
             />
-            <label className="form-check-label custom-control-label" htmlFor="ctx-opened">
+            <label className="form-check-label custom-control-label" data-id="allOpenedFiles-context-option" htmlFor="ctx-opened">
               All opened files
             </label>
           </div>
@@ -110,7 +110,7 @@ export const PromptArea: React.FC<PromptAreaProps> = ({
                 setShowContextOptions(false)
               }}
             />
-            <label className="form-check-label custom-control-label" htmlFor="ctx-workspace">
+            <label className="form-check-label custom-control-label" data-id="workspace-context-option" htmlFor="ctx-workspace">
               Workspace
             </label>
           </div>
@@ -126,7 +126,7 @@ export const PromptArea: React.FC<PromptAreaProps> = ({
             data-id="composer-ai-add-context"
             className="btn btn-dark btn-sm text-secondary"
           >
-          Add context&nbsp;
+          Add context
           </button>
 
           <button