Merge origin/master

cerberustesting · Aug 4, 2023 · ea3e8ee · ea3e8ee
2 parents bc326b2 + e41631a
commit ea3e8ee
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/source/src/main/java/org/cerberus/core/engine/entity/Identifier.java b/source/src/main/java/org/cerberus/core/engine/entity/Identifier.java
@@ -64,6 +64,7 @@ public interface Identifiers {
     public static final String IDENTIFIER_DATACERBERUS = "data-cerberus";
     public static final String IDENTIFIER_TITLE = "title";
     public static final String IDENTIFIER_REGEXTITLE = "regexTitle";
+    public static final String IDENTIFIER_REGEXURL = "regexUrl";
     public static final String IDENTIFIER_URL = "url";
     public static final String IDENTIFIER_ERRATUM = "erratum";
     public static final String IDENTIFIER_QUERYSELECTOR = "querySelector";

diff --git a/source/src/main/java/org/cerberus/core/engine/execution/impl/RobotServerService.java b/source/src/main/java/org/cerberus/core/engine/execution/impl/RobotServerService.java
@@ -804,6 +804,11 @@ private MutableCapabilities setCapabilityBrowser(MutableCapabilities capabilitie
                         profile.setPreference("general.useragent.override", usedUserAgent);
                     }
 
+                    // Activate DRM
+                        optionsFF.addPreference("media.eme.enabled",true);
+                        optionsFF.addPreference("media.gmp-manager.updateEnabled", true);
+
+
                     // Verbose level and Headless
                     if (tCExecution.getVerbose() <= 0) {
                         optionsFF.setHeadless(true);
@@ -819,6 +824,7 @@ private MutableCapabilities setCapabilityBrowser(MutableCapabilities capabilitie
                     }
                     optionsFF.setProfile(profile);
 
+
                     // Accept Insecure Certificates.
                     optionsFF.setAcceptInsecureCerts(tCExecution.getRobotObj() == null || tCExecution.getRobotObj().isAcceptInsecureCerts());
 

diff --git a/source/src/main/java/org/cerberus/core/service/webdriver/impl/WebDriverService.java b/source/src/main/java/org/cerberus/core/service/webdriver/impl/WebDriverService.java
@@ -1026,23 +1026,31 @@ private boolean checkIfExpectedWindow(Session session, String identifier, String
         String title;
 
         switch (identifier) {
-            case Identifier.IDENTIFIER_URL: {
-
+            case Identifier.IDENTIFIER_URL:
                 wait.until(ExpectedConditions.not(ExpectedConditions.urlToBe("about:blank")));
-                return session.getDriver().getCurrentUrl().equals(value);
-            }
+                result = session.getDriver().getCurrentUrl().equals(value);
+                break;
+            case Identifier.IDENTIFIER_REGEXURL:
+                wait.until(ExpectedConditions.not(ExpectedConditions.urlToBe("about:blank")));
+                String currentUrl = session.getDriver().getCurrentUrl();
+                Pattern patternUrl = Pattern.compile(value);
+                Matcher matcherUrl = patternUrl.matcher(currentUrl);
+                result = matcherUrl.find();
+                break;
             case Identifier.IDENTIFIER_REGEXTITLE:
                 wait.until(ExpectedConditions.not(ExpectedConditions.titleIs("")));
                 title = session.getDriver().getTitle();
                 Pattern pattern = Pattern.compile(value);
                 Matcher matcher = pattern.matcher(title);
                 result = matcher.find();
+                break;
             default:
                 wait.until(ExpectedConditions.not(ExpectedConditions.titleIs("")));
                 title = session.getDriver().getTitle();
                 if (title.equals(value)) {
                     result = true;
                 }
+                break;
         }
         return result;
     }

diff --git a/source/src/main/java/org/cerberus/core/util/StringUtil.java b/source/src/main/java/org/cerberus/core/util/StringUtil.java
@@ -313,7 +313,7 @@ public static String encodeAsJavaScriptURIComponent(String stringToEncode) {
      */
     public static String cleanHostURL(String host) {
         String newHost = host;
-        if (!(host.startsWith(HTTP_PREFIX) || host.startsWith(HTTPS_PREFIX) || host.startsWith(FTP_PREFIX) || host.startsWith(FTPS_PREFIX))) {
+        if (!(host.startsWith(HTTP_PREFIX) || host.startsWith(HTTPS_PREFIX) || host.startsWith(FTP_PREFIX) || host.startsWith(FTPS_PREFIX) || host.startsWith(FILE_PREFIX))) {
             // No prefix so we put http:// by default.
             newHost = HTTP_PREFIX + host;
         }
@@ -330,7 +330,7 @@ public static String cleanHostURL(String host) {
      * @return formatted host
      */
     public static String removeProtocolFromHostURL(String host) {
-        String newHost = host.replace(HTTP_PREFIX, "").replace(HTTPS_PREFIX, "").replace(FTP_PREFIX, "").replace(FTPS_PREFIX, "");
+        String newHost = host.replace(HTTP_PREFIX, "").replace(HTTPS_PREFIX, "").replace(FTP_PREFIX, "").replace(FTPS_PREFIX, "").replace(FILE_PREFIX, "");
         LOG.debug("Removed protocol host from {} to {}", host, newHost);
         return newHost;
 

diff --git a/source/src/main/webapp/js/testcase/action.js b/source/src/main/webapp/js/testcase/action.js