diff --git a/gradle.properties b/gradle.properties index 0c04f754066..cf85f90b66f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ toolkitVersion=3.57-SNAPSHOT publishToken= publishChannel= -ideProfileName=2024.2 +ideProfileName=2024.3 remoteRobotPort=8080 diff --git a/ui-tests-starter/build.gradle.kts b/ui-tests-starter/build.gradle.kts index 55fc9e3fed2..6bc269a1e78 100644 --- a/ui-tests-starter/build.gradle.kts +++ b/ui-tests-starter/build.gradle.kts @@ -58,6 +58,7 @@ tasks.test { useJUnitPlatform() systemProperty("ui.test.plugins", testPlugins.get().asPath) + systemProperty("org.gradle.project.ideProfileName", ideProfile.name) } // hack to disable ui tests in ./gradlew check diff --git a/ui-tests-starter/tst/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt similarity index 86% rename from ui-tests-starter/tst/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt rename to ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt index 669a781deb6..b3b3f146e8c 100644 --- a/ui-tests-starter/tst/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt +++ b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt @@ -1,4 +1,4 @@ -// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 package software.aws.toolkits.jetbrains.uitests @@ -6,6 +6,7 @@ import com.intellij.driver.sdk.openFile import com.intellij.driver.sdk.ui.ui import com.intellij.driver.sdk.waitForProjectOpen import com.intellij.ide.starter.ci.CIServer +import com.intellij.ide.starter.config.ConfigurationStorage import com.intellij.ide.starter.di.di import com.intellij.ide.starter.driver.engine.runIdeWithDriver import com.intellij.ide.starter.ide.IdeProductProvider @@ -28,6 +29,13 @@ class OfflineAmazonQInlineCompletionTest { di = DI { extend(di) bindSingleton(overrides = true) { TestCIServer } + val defaults = ConfigurationStorage.instance().defaults.toMutableMap().apply { + put("LOG_ENVIRONMENT_VARIABLES", (!System.getenv("CI").toBoolean()).toString()) + } + + bindSingleton(overrides = true) { + ConfigurationStorage(this, defaults) + } } } @@ -38,7 +46,7 @@ class OfflineAmazonQInlineCompletionTest { LocalProjectInfo( Paths.get("tstData", "Hello") ) - ).useRelease("2024.2") + ).useRelease(System.getProperty("org.gradle.project.ideProfileName")) Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache", "ee1d2538cb8d358377d7661466c866af747a8a3f.json") .createParentDirectories() .writeText(