Merge main into feature/prerelease-flare

Author: aws-toolkit-automation

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt

@@ -229,7 +229,7 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
             }
 
             is BrowserMessage.PublishWebviewTelemetry -> {
-//                publishTelemetry(message)
+                publishTelemetry(message)
             }
 
             is BrowserMessage.OpenUrl -> {

plugins/core/jetbrains-community/tst-242-252/software/aws/toolkits/jetbrains/core/LoginBrowserTest.kt

@@ -9,7 +9,6 @@ import com.intellij.ui.jcef.JBCefBrowserBase
 import com.intellij.ui.jcef.JBCefJSQuery
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.RegisterExtension
 import org.mockito.kotlin.argumentCaptor
@@ -35,7 +34,6 @@ class TestLoginBrowser(project: Project) : LoginBrowser(project) {
     override fun loadWebView(query: JBCefJSQuery) {}
 }
 
-@Disabled
 class LoginBrowserTest {
     private lateinit var sut: TestLoginBrowser
     private val project: Project

plugins/core/jetbrains-community/tst-253+/software/aws/toolkits/jetbrains/core/LoginBrowserTest.kt

@@ -8,7 +8,6 @@ import com.intellij.testFramework.HeavyPlatformTestCase
 import com.intellij.ui.jcef.JBCefBrowserBase
 import com.intellij.ui.jcef.JBCefJSQuery
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Disabled
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.times
@@ -31,7 +30,6 @@ class TestLoginBrowser(project: Project) : LoginBrowser(project) {
     override fun loadWebView(query: JBCefJSQuery) {}
 }
 
-@Disabled
 class LoginBrowserTest : HeavyPlatformTestCase() {
     private lateinit var sut: TestLoginBrowser
     private val mockTelemetryService = MockTelemetryServiceExtension()