[grid] Adding back a couple of WebDriver tests for the Grid UI

SeleniumHQ · Feb 17, 2021 · e9b3e7a · e9b3e7a
1 parent 68b17ed
commit e9b3e7a
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 133 deletions.
diff --git a/java/server/src/org/openqa/selenium/grid/web/GridUiRoute.java b/java/server/src/org/openqa/selenium/grid/web/GridUiRoute.java
@@ -48,7 +48,7 @@ public GridUiRoute() {
       routes = Route.combine(
         get("/").to(() -> req -> uiRedirect),
         get("/grid/console").to(() -> req -> uiRedirect),
-        Route.prefix("/ui/").to(Route.matching(req -> true).to(() -> uiHandler)));
+        Route.prefix("/ui").to(Route.matching(req -> true).to(() -> uiHandler)));
     } else {
       LOG.warning("It was not possible to load the Grid UI.");
       Json json = new Json();

diff --git a/java/server/test/org/openqa/selenium/grid/gridui/HubConsolePageTest.java b/java/server/test/org/openqa/selenium/grid/gridui/HubConsolePageTest.java
diff --git a/...selenium/grid/gridui/ConsolePageTest.java → ...selenium/grid/gridui/OverallGridTest.java b/...selenium/grid/gridui/ConsolePageTest.java → ...selenium/grid/gridui/OverallGridTest.java
@@ -21,34 +21,45 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
 import org.openqa.selenium.grid.commands.Standalone;
 import org.openqa.selenium.grid.config.Config;
 import org.openqa.selenium.grid.config.MapConfig;
 import org.openqa.selenium.grid.config.MemoizedConfig;
 import org.openqa.selenium.grid.server.Server;
 import org.openqa.selenium.grid.web.Values;
 import org.openqa.selenium.net.PortProber;
+import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.support.ui.FluentWait;
 import org.openqa.selenium.support.ui.Wait;
 import org.openqa.selenium.support.ui.WebDriverWait;
+import org.openqa.selenium.testing.drivers.Browser;
 import org.openqa.selenium.testing.drivers.WebDriverBuilder;
 
 import java.time.Duration;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
+import static junit.framework.TestCase.assertEquals;
+import static org.openqa.selenium.grid.gridui.Urls.whereIs;
 import static org.openqa.selenium.json.Json.MAP_TYPE;
 import static org.openqa.selenium.remote.http.HttpMethod.GET;
+import static org.openqa.selenium.support.ui.ExpectedConditions.textToBe;
+import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfAllElementsLocatedBy;
+import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfElementLocated;
 import static org.openqa.selenium.testing.Safely.safelyCall;
 
-public class ConsolePageTest {
+public class OverallGridTest {
 
   private Server<?> server;
   private WebDriver driver;
+  private WebDriver remoteWebDriver;
   private Wait<WebDriver> wait;
 
   @Before
@@ -57,32 +68,42 @@ public void setup() {
 
     driver = new WebDriverBuilder().get();
 
-    wait = new WebDriverWait(driver, Duration.ofSeconds(5));
+    wait = new WebDriverWait(driver, Duration.ofSeconds(10));
   }
 
   @After
   public void tearDown() {
     safelyCall(() -> driver.quit());
+    safelyCall(() -> remoteWebDriver.quit());
     safelyCall(() -> server.stop());
   }
 
   @Test
-  public void shouldReportAllNodesFreeWhenGridIsStartedWithoutLoad() {
-//    driver.get(whereIs(server, "/ui/index.html#/console"));
-//
-//    WebElement ring = wait.until(visibilityOfElementLocated(By.id("ring-system")));
-//
-//    assertEquals("100% free", ring.getText());
+  public void shouldReportConcurrencyZeroPercentWhenGridIsStartedWithoutLoad() {
+    driver.get(whereIs(server, "/ui/index.html#/sessions"));
+
+    WebElement concurrency = wait
+      .until(visibilityOfElementLocated(By.cssSelector("div[data-testid='concurrency-usage']")));
+
+    assertEquals("0%", concurrency.getText());
   }
 
   @Test
-  public void shouldDoSomethingExciting() {
-//    driver.get(whereIs(server, "/ui/index.html#/console"));
-//
-//    WebElement element = wait.until(visibilityOfElementLocated(By.xpath("//a[contains(@href,'node')]")));
-//    element.click();
-//
-//    wait.until(visibilityOf(driver.findElement(By.id("node-info"))));
+  public void shouldShowOneNodeRegistered() {
+    driver.get(whereIs(server, "/ui/index.html#"));
+
+    List<WebElement> nodeInfoIcons = wait
+      .until(visibilityOfAllElementsLocatedBy(By.cssSelector("button[data-testid*='node-info-']")));
+
+    assertEquals(1, nodeInfoIcons.size());
+  }
+
+  @Test
+  public void shouldIncrementSessionCountWhenSessionStarts() {
+    remoteWebDriver = new RemoteWebDriver(server.getUrl(), Browser.detect().getCapabilities());
+    driver.get(whereIs(server, "/ui/index.html#/sessions"));
+
+    wait.until(textToBe(By.cssSelector("div[data-testid='session-count']"), "1"));
   }
 
   private Server<?> createStandalone() {
@@ -104,12 +125,12 @@ private void waitUntilReady(Server<?> server) {
     HttpClient client = HttpClient.Factory.createDefault().createClient(server.getUrl());
 
     new FluentWait<>(client)
-        .withTimeout(Duration.ofSeconds(5))
-        .until(c -> {
-          HttpResponse response = c.execute(new HttpRequest(GET, "/status"));
-          Map<String, Object> status = Values.get(response, MAP_TYPE);
-          return status != null && Boolean.TRUE.equals(status.get("ready"));
-        });
+      .withTimeout(Duration.ofSeconds(5))
+      .until(c -> {
+        HttpResponse response = c.execute(new HttpRequest(GET, "/status"));
+        Map<String, Object> status = Values.get(response, MAP_TYPE);
+        return status != null && Boolean.TRUE.equals(status.get("ready"));
+      });
   }
 
 }
diff --git a/javascript/grid-ui/src/components/NavBar/NavBar.tsx b/javascript/grid-ui/src/components/NavBar/NavBar.tsx
@@ -149,14 +149,21 @@ export default function NavBar(props) {
             justifyContent="center"
             mt={2}
             mb={2}
+            data-testid={"concurrency-usage"}
           >
             <CircularProgressWithLabel value={currentLoad}/>
           </Box>
           <Typography
             align="center"
             variant="h4"
           >
-            {sessionCount} / {maxSession}
+            <Box display='inline' data-testid={"session-count"}>
+              {sessionCount}
+            </Box>
+            {' / '}
+            <Box display='inline' data-testid={"max-session"}>
+              {maxSession}
+            </Box>
           </Typography>
         </Box>
       )}

diff --git a/javascript/grid-ui/src/components/Node/Node.tsx b/javascript/grid-ui/src/components/Node/Node.tsx
@@ -140,7 +140,10 @@ export default function Node(props) {
                 className={classes.osLogo}
                 alt="OS Logo"
               />
-              <IconButton className={classes.buttonMargin} onClick={handleDialogOpen}>
+              <IconButton
+                className={classes.buttonMargin}
+                onClick={handleDialogOpen}
+                data-testid={`node-info-${nodeInfo.id}`}>
                 <InfoIcon/>
               </IconButton>
               <Dialog onClose={handleDialogClose} aria-labelledby="node-info-dialog" open={open}>

diff --git a/javascript/grid-ui/src/components/TopBar/TopBar.tsx b/javascript/grid-ui/src/components/TopBar/TopBar.tsx
@@ -115,7 +115,7 @@ export default function TopBar() {
           <IconButton
             edge="start"
             color="inherit"
-            aria-label="close drawer"
+            aria-label="help"
             href={"#help"}
             className={clsx(classes.menuButton, !connectionError && classes.menuButtonHidden)}
           >