Skip to content

Commit d61510b

Browse files
pujaganipujagani
authored
Merge branch 'trunk' into remove-redundant-kind-wheelinput-arg
2 parents 7d48e63 + 86ee772 commit d61510b

27 files changed

Lines changed: 706 additions & 1657 deletions

File tree

‎java/test/org/openqa/selenium/remote/DesiredCapabilitiesTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
package org.openqa.selenium.remote;
1919

20-
import static org.assertj.core.api.Assertions.assertThat;
21-
2220
import com.google.common.collect.ImmutableMap;
2321

2422
import org.junit.Test;
@@ -34,6 +32,8 @@
3432
import java.util.concurrent.ConcurrentHashMap;
3533
import java.util.logging.Level;
3634

35+
import static org.assertj.core.api.Assertions.assertThat;
36+
3737
@Category(UnitTests.class)
3838
public class DesiredCapabilitiesTest {
3939

@@ -97,7 +97,7 @@ public void shouldAutomaticallyConvertPlatformFromStringToEnum() {
9797
DesiredCapabilities caps = new DesiredCapabilities();
9898
caps.setCapability(CapabilityType.PLATFORM, "windows 7");
9999
assertThat(caps.getCapability(CapabilityType.PLATFORM)).isEqualTo(Platform.VISTA);
100-
caps.setCapability(CapabilityType.PLATFORM, "WIN8_1");
100+
caps.setCapability(CapabilityType.PLATFORM, "win8.1");
101101
assertThat(caps.getCapability(CapabilityType.PLATFORM)).isEqualTo(Platform.WIN8_1);
102102
}
103103

‎javascript/grid-ui/BUILD.bazel‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ _RUNTIME_DEPS = [
1212
"@npm//@emotion/styled",
1313
"@npm//@mui/icons-material",
1414
"@npm//@mui/material",
15-
"@npm//@mui/styles",
1615
"@npm//@novnc/novnc",
17-
"@npm//clsx",
1816
"@npm//graphql",
1917
"@npm//graphql.macro",
2018
"@npm//pretty-ms",

0 commit comments

Comments
 (0)