Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java =================================================================== diff -u -r26700 -r26702 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 26700) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 26702) @@ -432,12 +432,13 @@ addBtn.click(); } //保存材料数量 - Utils.retryingFindAndClick(By.xpath("//a[contains(text(),'保存')]")); + WebElement savebtn = Utils.retryingFind(By.xpath("//a[contains(text(),'保存')]")); + ((JavascriptExecutor) Utils.driver).executeScript("arguments[0].click()", savebtn); //点击确认提示框 -// Wait wait = WaitFactory.createDefaultWait(); -// wait.until(ExpectedConditions.alertIsPresent()); - Utils.driver.switchTo().alert().accept(); + Wait wait = WaitFactory.createDefaultWait(); + wait.until(ExpectedConditions.alertIsPresent()); + Utils.driver.switchTo().alert().dismiss(); String recyclingFormWindowhandle = Utils.driver.getWindowHandle(); Utils.driver.switchTo().window(recyclingFormWindowhandle); @@ -578,11 +579,12 @@ String style1 = await.getAttribute("style"); //已回收记录 WebElement record = Utils.retryingFind(By.xpath("//*[@id='recyclingRecordTable']//tr[1]/td[6]")); + WebElement _record = Utils.retryingFind(By.xpath("//*[@id='recyclingRecordTable']//tr[1]")); String applyTime2 = record.getText(); - String style2 = record.getAttribute("style"); + String style2 = _record.getAttribute("bgcolor"); //通过申请时间断言这两条记录为同一申请单 assertTrue("待回收列表第一条申请单不是部分回收申请单!","background-color: yellow;".equals(style1)); - assertTrue("回收记录列表第一条申请单不是部分回收申请单!","background-color: yellow;".equals(style2)); + assertTrue("回收记录列表第一条申请单不是部分回收申请单!","yellow".equals(style2)); assertTrue("申请时间不一致,不是同一张申请单!",applyTime1.equals(applyTime2)); } catch (Exception e) {