Index: localrepo/org.seleniumhq.selenium/selenium-server-standalone/3.7.1/selenium-server-standalone-3.7.1.jar =================================================================== diff -u Binary files differ Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java =================================================================== diff -u -r20878 -r20954 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java (.../Utils.java) (revision 20878) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java (.../Utils.java) (revision 20954) @@ -26,8 +26,10 @@ import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.chrome.ChromeOptions; import org.openqa.selenium.ie.InternetExplorerDriver; +import org.openqa.selenium.ie.InternetExplorerOptions; import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.os.WindowsUtils; +import org.openqa.selenium.remote.CapabilityType; import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.remote.RemoteWebDriver; import org.openqa.selenium.support.ui.ExpectedCondition; @@ -176,7 +178,6 @@ /** 启动前,先杀掉进程,再打开浏览器 */ public static void webDriverInit() { - WindowsUtils.killByName("conhost.exe"); WindowsUtils.killByName("IEDriverServer.exe *32"); WindowsUtils.killByName("IEDriverServer.exe"); WindowsUtils.killByName("iexplore.exe"); @@ -193,7 +194,7 @@ // Terry Kwan, 2017-05-17 // ieCapabilities.setCapability(InternetExplorerDriver.NATIVE_EVENTS, // false); - + ieCapabilities.setCapability(CapabilityType.BROWSER_NAME, "internet explorer"); // 禁用持续悬停特性，避免web页面的控件闪烁 ieCapabilities.setCapability( InternetExplorerDriver.ENABLE_PERSISTENT_HOVERING, false); @@ -202,7 +203,6 @@ .setCapability( InternetExplorerDriver.INTRODUCE_FLAKINESS_BY_IGNORING_SECURITY_DOMAINS, true); - String applicationName = Utils.settings.get( "seleniumBrowserApplicationName").toString(); ieCapabilities.setCapability("applicationName", applicationName); @@ -220,7 +220,8 @@ driver = new RemoteWebDriver(new URL(seleniumHubURL), ieCapabilities); } else { - driver = new InternetExplorerDriver(ieCapabilities); + InternetExplorerOptions s = new InternetExplorerOptions(ieCapabilities); + driver = new InternetExplorerDriver(s); String cap = ((InternetExplorerDriver) driver) .getCapabilities().toString(); System.out.println("my cap = " + cap); @@ -1047,7 +1048,7 @@ // 先等待portalPage.js的Ext4.onReady执行完 // windowOnLoaded是自定义的JS变量 waitPageLoaded("return windowOnLoaded == false ? true : false;", - 10000, 350); + 15000, 350); Wait wait = WaitFactory.createDefaultWait(); // 等待对话框弹出 // wait.until(ExpectedConditions Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r20878 -r20954 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20878) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20954) @@ -743,7 +743,6 @@ System.out.println(windowID); JSWaiter.waitUntilJQueryReady(); Utils.driver.quit(); - WindowsUtils.killByName("conhost.exe"); WindowsUtils.killByName("IEDriverServer.exe *32"); WindowsUtils.killByName("IEDriverServer.exe"); WindowsUtils.killByName("iexplore.exe"); Index: build.gradle =================================================================== diff -u -r20740 -r20954 --- build.gradle (.../build.gradle) (revision 20740) +++ build.gradle (.../build.gradle) (revision 20954) @@ -225,7 +225,7 @@ } - version = '4.1.296' + version = '4.1.314' group = 'com.forgon' /* @@ -328,7 +328,7 @@ compile group: 'org.bouncycastle', name: 'bcprov-jdk16', version:'1.38' - compile group: 'com.google.code.gson', name: 'gson', version:'2.2.4' + compile group: 'com.google.code.gson', name: 'gson', version:'2.8.2' compile group: 'commons-lang', name: 'commons-lang', version:'2.5' @@ -966,11 +966,11 @@ compile (project(":ssts-datasync-default-impl")) - compile group: 'org.seleniumhq.selenium', name: 'selenium-server', version: '3.5.3' + compile group: 'org.seleniumhq.selenium', name: 'selenium-server', version: '3.7.1' // https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-java - compile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.5.3' + compile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.7.1' - compile group: 'org.seleniumhq.selenium', name: 'selenium-server-standalone', version: '3.5.3' + compile group: 'org.seleniumhq.selenium', name: 'selenium-server-standalone', version: '3.7.1' // https://mvnrepository.com/artifact/net.sf.ezmorph/ezmorph compile group: 'net.sf.ezmorph', name: 'ezmorph', version: '1.0.6' Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recall.java =================================================================== diff -u -r20878 -r20954 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recall.java (.../Recall.java) (revision 20878) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recall.java (.../Recall.java) (revision 20954) @@ -119,17 +119,19 @@ @Test public void Recall_Close() { try { - Utils.switchToDefaultContent(); - Utils.retryingFindAndClick(By - .cssSelector("div[class='x-panel-body']")); + Utils.refresh(); + Utils.retryingFindAndClick(By.id("recallRecord")); + Utils.retryingFindAndSwitchToFrame(By.id("iframe_recallRecord")); + Utils.retryingFind(By.xpath("//p[contains(text(), '已发布')]")); if (Utils.isFind(Utils.retryingFind(By .cssSelector("table[class='x-grid3-row-table']")))) { List allRows = Utils.driver.findElements(By .cssSelector("table[class='x-grid3-row-table']")); System.out.println("rows size = " + allRows.size()); if (allRows.size() > 0) { - Utils.retryingFindAndClick(By.cssSelector("div[class='x-grid3-hd-checker']")); Utils.retryingFindAndClick(By + .cssSelector("div[class='x-grid3-hd-checker']")); + Utils.retryingFindAndClick(By .cssSelector("button[class='x-btn-text btn_remove']")); String currentwindowhandle = Utils.driver.getWindowHandle(); Utils.driver.switchTo().window(currentwindowhandle);