fixup

Author: jpinkney-aws

src/amazonqFeatureDev/controllers/chat/controller.ts

@@ -25,7 +25,7 @@ import { submitFeedback } from '../../../feedback/vue/submitFeedback'
 import { placeholder } from '../../../shared/vscode/commands2'
 import { EditorContentController } from '../../../amazonq/commons/controllers/contentController'
 import { openUrl } from '../../../shared/utilities/vsCodeUtils'
-import { examples } from '../../text'
+import { examples } from '../../userFacingText'
 
 export interface ChatControllerEventEmitters {
     readonly processHumanChatMessage: EventEmitter<any>

src/amazonqFeatureDev/text.ts renamed to src/amazonqFeatureDev/userFacingText.ts

@@ -10,7 +10,7 @@ import { FollowUpTypes } from '../../amazonqFeatureDev/types'
 import sinon from 'sinon'
 import { FeatureDevClient } from '../../amazonqFeatureDev/client/featureDev'
 import { verifyTextOrder } from './framework/text'
-import { examples } from '../../amazonqFeatureDev/text'
+import { examples } from '../../amazonqFeatureDev/userFacingText'
 import * as authUtil from '../../codewhisperer/util/authUtil'
 
 describe('Amazon Q Feature Dev', function () {

src/testE2E/amazonq/featureDev.test.ts

@@ -3,29 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { JSDOM } from 'jsdom'
-/**
- * JSDOM is used to help hoist MynahUI to running in a node environment vs in the browser (which is what it's made for)
- */
-const dom = new JSDOM(undefined, {
-    pretendToBeVisual: true,
-    includeNodeLocations: true,
-})
-global.window = dom.window as unknown as Window & typeof globalThis
-global.document = dom.window.document
-global.self = dom.window as unknown as Window & typeof globalThis
-global.Element = dom.window.Element
-global.HTMLElement = dom.window.HTMLElement
-
-// jsdom doesn't have support for innerText: https://github.com/jsdom/jsdom/issues/1245 which mynah ui uses
-Object.defineProperty(global.Element.prototype, 'innerText', {
-    get() {
-        return this.textContent
-    },
-})
+import { injectJSDOM } from './jsdomInjector'
 
-// jsdom doesn't have support for structuredClone. See https://github.com/jsdom/jsdom/issues/3363
-global.structuredClone = val => JSON.parse(JSON.stringify(val))
+// This needs to be ran before all other imports so that mynah ui gets loaded inside of jsdom
+injectJSDOM()
 
 import * as vscode from 'vscode'
 import { createMynahUI } from '../../../amazonq/webview/ui/main'

src/testE2E/amazonq/framework/framework.ts

@@ -0,0 +1,31 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { JSDOM } from 'jsdom'
+
+export function injectJSDOM() {
+    /**
+     * JSDOM is used to help hoist MynahUI to running in a node environment vs in the browser (which is what it's made for)
+     */
+    const dom = new JSDOM(undefined, {
+        pretendToBeVisual: true,
+        includeNodeLocations: true,
+    })
+    global.window = dom.window as unknown as Window & typeof globalThis
+    global.document = dom.window.document
+    global.self = dom.window as unknown as Window & typeof globalThis
+    global.Element = dom.window.Element
+    global.HTMLElement = dom.window.HTMLElement
+
+    // jsdom doesn't have support for innerText: https://github.com/jsdom/jsdom/issues/1245 which mynah ui uses
+    Object.defineProperty(global.Element.prototype, 'innerText', {
+        get() {
+            return this.textContent
+        },
+    })
+
+    // jsdom doesn't have support for structuredClone. See https://github.com/jsdom/jsdom/issues/3363
+    global.structuredClone = val => JSON.parse(JSON.stringify(val))
+}

src/testE2E/amazonq/framework/jsdomInjector.ts

@@ -66,11 +66,11 @@ export class Messenger {
     }
 
     getCommands() {
-        return this.getStore().quickActionCommands ?? []
+        return [...(this.getStore().quickActionCommands ?? [])]
     }
 
     getChatItems() {
-        return this.getStore().chatItems ?? []
+        return [...(this.getStore().chatItems ?? [])]
     }
 
     async waitForChatFinishesLoading() {