Merge branch 'FX_FIXES' of github.com-jetbrains:JetBrains/compose-jb into FX_FIXES

3 years ago · 19ae5f9ca1
1 changed files with 6 additions and 2 deletions
--- a/web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/EventTests.kt
+++ b/web/integration-core/src/jvmTest/kotlin/org/jetbrains/compose/web/tests/integration/EventTests.kt
@ -17,8 +17,12 @@ import org.openqa.selenium.WebDriver
 class EventTests : BaseIntegrationTests() {

    companion object {
-        private val COMMAND_CROSS_PLATFORM =
-            if (System.getProperty("os.name").contains("Windows")) Keys.CONTROL else Keys.META
+        private val COMMAND_CROSS_PLATFORM = System.getProperty("os.name").lowercase().let { osName ->
+            when {
+                osName.contains("mac os") -> Keys.COMMAND
+                else -> Keys.CONTROL
+            }
+        }
    }

    @ResolveDrivers