Browse Source
* [e2e] Add new test of security environment ref: #7281 * Fix frontend bug * Fix order of UT * Fix delete and edit bottom class * Try to fix * Try to fix3.0.0/version-upgrade
Jiajie Zhong
3 years ago
committed by
GitHub
8 changed files with 278 additions and 8 deletions
@ -0,0 +1,126 @@
|
||||
/* |
||||
* Licensed to Apache Software Foundation (ASF) under one or more contributor |
||||
* license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright |
||||
* ownership. Apache Software Foundation (ASF) licenses this file to you under |
||||
* the Apache License, Version 2.0 (the "License"); you may |
||||
* not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, |
||||
* software distributed under the License is distributed on an |
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY |
||||
* KIND, either express or implied. See the License for the |
||||
* specific language governing permissions and limitations |
||||
* under the License. |
||||
*/ |
||||
|
||||
package org.apache.dolphinscheduler.e2e.cases; |
||||
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat; |
||||
import static org.awaitility.Awaitility.await; |
||||
|
||||
import org.apache.dolphinscheduler.e2e.core.DolphinScheduler; |
||||
import org.apache.dolphinscheduler.e2e.pages.LoginPage; |
||||
import org.apache.dolphinscheduler.e2e.pages.common.NavBarPage; |
||||
import org.apache.dolphinscheduler.e2e.pages.security.EnvironmentPage; |
||||
import org.apache.dolphinscheduler.e2e.pages.security.SecurityPage; |
||||
import org.apache.dolphinscheduler.e2e.pages.security.WorkerGroupPage; |
||||
|
||||
import org.junit.jupiter.api.AfterAll; |
||||
import org.junit.jupiter.api.BeforeAll; |
||||
import org.junit.jupiter.api.Order; |
||||
import org.junit.jupiter.api.Test; |
||||
import org.openqa.selenium.By; |
||||
import org.openqa.selenium.WebElement; |
||||
import org.openqa.selenium.remote.RemoteWebDriver; |
||||
|
||||
@DolphinScheduler(composeFiles = "docker/basic/docker-compose.yaml") |
||||
class EnvironmentE2ETest { |
||||
|
||||
private static final String environmentName = "test_environment_name"; |
||||
private static final String environmentConfig = "test_environment_config"; |
||||
private static final String environmentDesc = "test_environment_desc"; |
||||
private static final String environmentWorkerGroup = "[\"default\"]"; |
||||
|
||||
private static final String editEnvironmentName = "edit_environment_name"; |
||||
private static final String editEnvironmentConfig = "edit_environment_config"; |
||||
private static final String editEnvironmentDesc = "edit_environment_desc"; |
||||
private static final String editEnvironmentWorkerGroup = "[\"default\"]"; |
||||
|
||||
private static RemoteWebDriver browser; |
||||
|
||||
@BeforeAll |
||||
public static void setup() { |
||||
new LoginPage(browser) |
||||
.login("admin", "dolphinscheduler123") |
||||
.goToNav(SecurityPage.class) |
||||
.goToTab(EnvironmentPage.class) |
||||
; |
||||
} |
||||
|
||||
@Test |
||||
@Order(10) |
||||
void testCreateEnvironment() { |
||||
final EnvironmentPage page = new EnvironmentPage(browser); |
||||
page.create(environmentName, environmentConfig, environmentDesc, environmentWorkerGroup); |
||||
|
||||
await().untilAsserted(() -> { |
||||
browser.navigate().refresh(); |
||||
assertThat(page.environmentList()) |
||||
.as("Environment list should contain newly-created environment") |
||||
.extracting(WebElement::getText) |
||||
.anyMatch(it -> it.contains(environmentName)); |
||||
}); |
||||
} |
||||
|
||||
@Test |
||||
@Order(20) |
||||
void testCreateDuplicateEnvironment() { |
||||
final EnvironmentPage page = new EnvironmentPage(browser); |
||||
page.create(environmentName, environmentConfig, environmentDesc, environmentWorkerGroup); |
||||
|
||||
await().untilAsserted(() -> |
||||
assertThat(browser.findElement(By.tagName("body")).getText()) |
||||
.contains("already exists") |
||||
); |
||||
|
||||
page.createEnvironmentForm().buttonCancel().click(); |
||||
} |
||||
|
||||
@Test |
||||
@Order(30) |
||||
void testEditEnvironment() { |
||||
final EnvironmentPage page = new EnvironmentPage(browser); |
||||
page.update(environmentName, editEnvironmentName, editEnvironmentConfig, editEnvironmentDesc, editEnvironmentWorkerGroup); |
||||
|
||||
await().untilAsserted(() -> { |
||||
browser.navigate().refresh(); |
||||
assertThat(page.environmentList()) |
||||
.as("Environment list should contain newly-modified environment") |
||||
.extracting(WebElement::getText) |
||||
.anyMatch(it -> it.contains(editEnvironmentName)); |
||||
}); |
||||
} |
||||
|
||||
@Test |
||||
@Order(40) |
||||
void testDeleteEnvironment() { |
||||
final EnvironmentPage page = new EnvironmentPage(browser); |
||||
|
||||
page.delete(editEnvironmentName); |
||||
|
||||
await().untilAsserted(() -> { |
||||
browser.navigate().refresh(); |
||||
|
||||
assertThat( |
||||
page.environmentList() |
||||
).noneMatch( |
||||
it -> it.getText().contains(environmentName) || it.getText().contains(editEnvironmentName) |
||||
); |
||||
}); |
||||
} |
||||
} |
||||
@ -0,0 +1,131 @@
|
||||
/* |
||||
* Licensed to Apache Software Foundation (ASF) under one or more contributor |
||||
* license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright |
||||
* ownership. Apache Software Foundation (ASF) licenses this file to you under |
||||
* the Apache License, Version 2.0 (the "License"); you may |
||||
* not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, |
||||
* software distributed under the License is distributed on an |
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY |
||||
* KIND, either express or implied. See the License for the |
||||
* specific language governing permissions and limitations |
||||
* under the License. |
||||
*/ |
||||
|
||||
package org.apache.dolphinscheduler.e2e.pages.security; |
||||
|
||||
import org.apache.dolphinscheduler.e2e.pages.common.NavBarPage; |
||||
|
||||
import java.util.List; |
||||
|
||||
import org.openqa.selenium.By; |
||||
import org.openqa.selenium.WebElement; |
||||
import org.openqa.selenium.remote.RemoteWebDriver; |
||||
import org.openqa.selenium.support.FindBy; |
||||
import org.openqa.selenium.support.FindBys; |
||||
import org.openqa.selenium.support.PageFactory; |
||||
|
||||
import lombok.Getter; |
||||
|
||||
@Getter |
||||
public final class EnvironmentPage extends NavBarPage implements SecurityPage.Tab { |
||||
@FindBy(id = "btnCreateEnvironment") |
||||
private WebElement buttonCreateEnvironment; |
||||
|
||||
@FindBy(className = "items") |
||||
private List<WebElement> environmentList; |
||||
|
||||
@FindBys({ |
||||
@FindBy(className = "el-popconfirm"), |
||||
@FindBy(className = "el-button--primary"), |
||||
}) |
||||
private List<WebElement> buttonConfirm; |
||||
|
||||
private final EnvironmentForm createEnvironmentForm; |
||||
private final EnvironmentForm editEnvironmentForm; |
||||
|
||||
public EnvironmentPage(RemoteWebDriver driver) { |
||||
super(driver); |
||||
createEnvironmentForm = new EnvironmentForm(); |
||||
editEnvironmentForm = new EnvironmentForm(); |
||||
} |
||||
|
||||
public EnvironmentPage create(String name, String config, String desc, String workerGroup) { |
||||
buttonCreateEnvironment().click(); |
||||
createEnvironmentForm().inputEnvironmentName().sendKeys(name); |
||||
createEnvironmentForm().inputEnvironmentConfig().sendKeys(config); |
||||
createEnvironmentForm().inputEnvironmentDesc().sendKeys(desc); |
||||
createEnvironmentForm().inputWorkerGroup().sendKeys(workerGroup); |
||||
createEnvironmentForm().buttonSubmit().click(); |
||||
return this; |
||||
} |
||||
|
||||
public EnvironmentPage update(String oldName, String name, String config, String desc, String workerGroup) { |
||||
environmentList() |
||||
.stream() |
||||
.filter(it -> it.findElement(By.className("environmentName")).getAttribute("innerHTML").contains(oldName)) |
||||
.flatMap(it -> it.findElements(By.className("edit")).stream()) |
||||
.filter(WebElement::isDisplayed) |
||||
.findFirst() |
||||
.orElseThrow(() -> new RuntimeException("No edit button in environment list")) |
||||
.click(); |
||||
|
||||
editEnvironmentForm().inputEnvironmentName().sendKeys(name); |
||||
editEnvironmentForm().inputEnvironmentConfig().sendKeys(config); |
||||
editEnvironmentForm().inputEnvironmentDesc().sendKeys(desc); |
||||
editEnvironmentForm().inputWorkerGroup().sendKeys(workerGroup); |
||||
editEnvironmentForm().buttonSubmit().click(); |
||||
|
||||
return this; |
||||
} |
||||
|
||||
public EnvironmentPage delete(String name) { |
||||
environmentList() |
||||
.stream() |
||||
.filter(it -> it.getText().contains(name)) |
||||
.flatMap(it -> it.findElements(By.className("delete")).stream()) |
||||
.filter(WebElement::isDisplayed) |
||||
.findFirst() |
||||
.orElseThrow(() -> new RuntimeException("No delete button in environment list")) |
||||
.click(); |
||||
|
||||
buttonConfirm() |
||||
.stream() |
||||
.filter(WebElement::isDisplayed) |
||||
.findFirst() |
||||
.orElseThrow(() -> new RuntimeException("No confirm button when deleting")) |
||||
.click(); |
||||
|
||||
return this; |
||||
} |
||||
|
||||
@Getter |
||||
public class EnvironmentForm { |
||||
EnvironmentForm() { |
||||
PageFactory.initElements(driver, this); |
||||
} |
||||
|
||||
@FindBy(id = "inputEnvironmentName") |
||||
private WebElement inputEnvironmentName; |
||||
|
||||
@FindBy(id = "inputEnvironmentConfig") |
||||
private WebElement inputEnvironmentConfig; |
||||
|
||||
@FindBy(id = "inputEnvironmentDesc") |
||||
private WebElement inputEnvironmentDesc; |
||||
|
||||
@FindBy(id = "inputEnvironmentWorkerGroup") |
||||
private WebElement inputWorkerGroup; |
||||
|
||||
@FindBy(id = "btnSubmit") |
||||
private WebElement buttonSubmit; |
||||
|
||||
@FindBy(id = "btnCancel") |
||||
private WebElement buttonCancel; |
||||
} |
||||
} |
||||
Loading…
Reference in new issue