eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-19 20:25:31 +00:00
Code Activity

Bug 4339: Correct handling of alert

Browse Source
This commit is contained in:
Steffen Schaefer
2018-07-31 11:15:48 +02:00
parent 0cb345df75
commit c5a3338ac2
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tractrac/TracTracEventManagementPanelPO.java
+2 -4
View File
@@ -253,7 +253,7 @@ public class TracTracEventManagementPanelPO extends PageArea {
if (!racesToProcess.isEmpty()) {
throw new IllegalStateException("Not all given races where selected");
}
startTrackingForSelectedRaces(expectedBoatClassErrorOrNull, false);
startTrackingForSelectedRaces(expectedBoatClassErrorOrNull, awaitDefaultRegattaAlert);
}
public void startTrackingForAllRaces() {
@@ -266,9 +266,7 @@ public class TracTracEventManagementPanelPO extends PageArea {
if (awaitDefaultRegattaAlert) {
waitForAlertAndAccept();
}
if (expectedBoatClassErrorOrNull == null) {
} else if (expectedBoatClassErrorOrNull == null) {
waitForAjaxRequests();
} else {
waitForSelectedRacesContainDifferentBoatClassesError(expectedBoatClassErrorOrNull);
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestStartAndStopTrackingForTracTracEvents.java
-10
View File
@@ -1,13 +1,10 @@
package com.sap.sailing.selenium.test.adminconsole;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat;
import org.junit.Before;
import org.junit.Test;
import org.openqa.selenium.Alert;
import org.openqa.selenium.WebDriver.TargetLocator;
import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage;
import com.sap.sailing.selenium.pages.adminconsole.regatta.RegattaListCompositePO.RegattaDescriptor;
@@ -88,13 +85,6 @@ public class TestStartAndStopTrackingForTracTracEvents extends AbstractSeleniumT
tracTracEvents.setReggataForTracking(DEFAULT_REGATTA);
tracTracEvents.setTrackSettings(false, false, false);
tracTracEvents.startTrackingForRacesAndAcceptDefaultRegattaWarning(this.trackableRace);
TargetLocator locator = getWebDriver().switchTo();
Alert alert = locator.alert();
String text = alert.getText();
alert.dismiss();
String message = "There is at least one regatta for the selected boat classes.";
assertThat(text, containsString(message));
}
@Test