aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorStas Vilchik <stas.vilchik@sonarsource.com>2018-02-21 14:24:05 +0100
committerStas Vilchik <stas.vilchik@sonarsource.com>2018-02-27 13:14:54 +0100
commit36969ad381fb8ff7f93daf9c40d801b69e3a1bac (patch)
tree48e752209e71a5c407421325797e5e828516b282 /tests
parent87ecef1b3768eaa980083c466a5adf25e5748d44 (diff)
downloadsonarqube-36969ad381fb8ff7f93daf9c40d801b69e3a1bac.tar.gz
sonarqube-36969ad381fb8ff7f93daf9c40d801b69e3a1bac.zip
rewrite remaining backbone modals in react
Diffstat (limited to 'tests')
-rw-r--r--tests/src/test/java/org/sonarqube/tests/project/ProjectKeyUpdatePageTest.java2
-rw-r--r--tests/src/test/java/org/sonarqube/tests/project/ProjectLinksTest.java10
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/src/test/java/org/sonarqube/tests/project/ProjectKeyUpdatePageTest.java b/tests/src/test/java/org/sonarqube/tests/project/ProjectKeyUpdatePageTest.java
index 40d7abf27ed..28abde7863b 100644
--- a/tests/src/test/java/org/sonarqube/tests/project/ProjectKeyUpdatePageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/project/ProjectKeyUpdatePageTest.java
@@ -100,7 +100,7 @@ public class ProjectKeyUpdatePageTest {
ProjectKeyPage page = openPage("sample");
page.openFineGrainedUpdate().tryFineGrainedUpdate("sample:module_a:module_a1", "another");
- $("#update-key-confirmation-form").shouldNotBe(visible);
+ $(".modal").shouldNotBe(visible);
tester.openBrowser().openProjectKey("another");
assertThat(url()).endsWith("/project/key?id=another");
diff --git a/tests/src/test/java/org/sonarqube/tests/project/ProjectLinksTest.java b/tests/src/test/java/org/sonarqube/tests/project/ProjectLinksTest.java
index 1cbb95dd0e0..ffaef594322 100644
--- a/tests/src/test/java/org/sonarqube/tests/project/ProjectLinksTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/project/ProjectLinksTest.java
@@ -37,6 +37,7 @@ import org.sonarqube.ws.client.projectlinks.CreateRequest;
import org.sonarqube.ws.client.projectlinks.DeleteRequest;
import static com.codeborne.selenide.Condition.text;
+import static com.codeborne.selenide.Condition.visible;
import static com.codeborne.selenide.Selenide.$;
import static util.ItUtils.projectDir;
@@ -88,7 +89,7 @@ public class ProjectLinksTest {
customLink.getName().should(text("Custom"));
customLink.getType().shouldNot(Condition.exist);
customLink.getUrl().should(text("http://example.org/custom"));
- customLink.getDeleteButton().shouldBe(Condition.visible);
+ customLink.getDeleteButton().shouldBe(visible);
}
@Test
@@ -109,7 +110,7 @@ public class ProjectLinksTest {
testLink.getName().should(text("Test"));
testLink.getType().shouldNot(Condition.exist);
testLink.getUrl().should(text("http://example.com/test"));
- testLink.getDeleteButton().shouldBe(Condition.visible);
+ testLink.getDeleteButton().shouldBe(visible);
}
@Test
@@ -122,9 +123,8 @@ public class ProjectLinksTest {
ProjectLinkItem customLink = links.get(1);
customLink.getDeleteButton().click();
- $("#delete-link-confirm")
- .shouldBe(Condition.visible)
- .click();
+ $(".modal").shouldBe(visible);
+ $(".modal button[type=\"submit\"]").click();
page.getLinks().shouldHaveSize(1);
}