lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #85 from bsinno/Stabilise_tests

Browse Source 
Should help with selenium test on hawkBit based UIs. Thx.
This commit is contained in:
Kai Zimmermann
2016-03-14 12:57:45 +01:00
parent ca9d42d711 e525da0375
commit 4f06b60880
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/footer/AbstractDeleteActionsLayout.java
View File

@@ -189,6 +189,7 @@ public abstract class AbstractDeleteActionsLayout extends VerticalLayout impleme
SPUIComponetIdProvider.SAVE_ACTIONS_POPUP, SPUIDefinitions.CONFIRMATION_WINDOW); SPUIComponetIdProvider.SAVE_ACTIONS_POPUP, SPUIDefinitions.CONFIRMATION_WINDOW);
unsavedActionsWindow.addCloseListener(event -> unsavedActionsWindowClosed()); unsavedActionsWindow.addCloseListener(event -> unsavedActionsWindowClosed());
unsavedActionsWindow.setContent(getUnsavedActionsWindowContent()); unsavedActionsWindow.setContent(getUnsavedActionsWindowContent());
unsavedActionsWindow.setId(SPUIComponetIdProvider.CONFIRMATION_POPUP_ID);
UI.getCurrent().addWindow(unsavedActionsWindow); UI.getCurrent().addWindow(unsavedActionsWindow);
} }
} }

1
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
View File

@@ -191,6 +191,7 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
statusIcon.setContentMode(ContentMode.HTML); statusIcon.setContentMode(ContentMode.HTML);
statusIcon.setSizeFull(); statusIcon.setSizeFull();
setInitialStatusIconStyle(statusIcon); setInitialStatusIconStyle(statusIcon);
statusIcon.setId(SPUIComponetIdProvider.VALIDATION_STATUS_ICON_ID);
return statusIcon; return statusIcon;
} }

10
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java
View File

@@ -868,6 +868,16 @@ public final class SPUIComponetIdProvider {
*/ */
public static final String ROLLOUT_GROUP_TARGET_LABEL = "rollout.group.target.label"; public static final String ROLLOUT_GROUP_TARGET_LABEL = "rollout.group.target.label";
/**
* Action confirmation popup id.
*/
public static final String CONFIRMATION_POPUP_ID = "action.confirmation.popup.id";
/**
* Validation status icon .
*/
public static final String VALIDATION_STATUS_ICON_ID = "validation.status.icon";
/** /**
* /* Private Constructor. * /* Private Constructor.
*/ */