dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Seraphym-Tuhai 2023-03-15 13:23:10 +02:00
parent bf7fc25957
commit d9369feef0
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java
View File

@ -49,6 +49,7 @@ import java.net.URL;
import java.time.Duration; import java.time.Duration;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.assertj.core.api.Assertions.fail;
import static org.thingsboard.server.msa.TestProperties.getBaseUiUrl; import static org.thingsboard.server.msa.TestProperties.getBaseUiUrl;
import static org.thingsboard.server.msa.ui.utils.Const.TENANT_EMAIL; import static org.thingsboard.server.msa.ui.utils.Const.TENANT_EMAIL;
import static org.thingsboard.server.msa.ui.utils.Const.TENANT_PASSWORD; import static org.thingsboard.server.msa.ui.utils.Const.TENANT_PASSWORD;
@ -122,7 +123,7 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest {
try { try {
wait.until(ExpectedConditions.urlContains(urlPath)); wait.until(ExpectedConditions.urlContains(urlPath));
} catch (WebDriverException e) { } catch (WebDriverException e) {
log.error("This URL path is missing"); return fail("URL not contains " + urlPath);
} }
return driver.getCurrentUrl().contains(urlPath); return driver.getCurrentUrl().contains(urlPath);
} }

2
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainImportTest.java
View File

@ -113,7 +113,6 @@ public class CreateRuleChainImportTest extends AbstractDriverBaseTest {
ruleChainsPage.importBrowseFileBtn().click(); ruleChainsPage.importBrowseFileBtn().click();
WebElement doneBtn = openRuleChainPage.doneBtn(); WebElement doneBtn = openRuleChainPage.doneBtn();
doneBtn.click(); doneBtn.click();
//openRuleChainPage.waitUntilBtnDisable(doneBtn);
ruleChainName = IMPORT_RULE_CHAIN_NAME; ruleChainName = IMPORT_RULE_CHAIN_NAME;
sideBarMenuView.ruleChainsBtn().click(); sideBarMenuView.ruleChainsBtn().click();
@ -136,7 +135,6 @@ public class CreateRuleChainImportTest extends AbstractDriverBaseTest {
ruleChainsPage.importBrowseFileBtn().click(); ruleChainsPage.importBrowseFileBtn().click();
WebElement doneBtn = openRuleChainPage.doneBtn(); WebElement doneBtn = openRuleChainPage.doneBtn();
doneBtn.click(); doneBtn.click();
//openRuleChainPage.waitUntilBtnDisable(doneBtn);
sideBarMenuView.ruleChainsBtn().click(); sideBarMenuView.ruleChainsBtn().click();
boolean entityNotNull = ruleChainsPage.entity(ruleChainName) != null; boolean entityNotNull = ruleChainsPage.entity(ruleChainName) != null;