This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 5f70ffc73 [OPENMEETINGS-2732] wicket-bootstrap
5f70ffc73 is described below
commit 5f70ffc73de0d5e402be6fd9b82967fdc992de24
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Wed Dec 21 18:21:52 2022 +0700
[OPENMEETINGS-2732] wicket-bootstrap
---
.../org/apache/openmeetings/web/TestMainMenu.java | 38 +++++++++++++++++++---
pom.xml | 2 +-
2 files changed, 35 insertions(+), 5 deletions(-)
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java
index fc2ac6719..eb9cf4ebc 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java
@@ -35,6 +35,11 @@ import org.apache.openmeetings.web.admin.users.UsersPanel;
import org.apache.openmeetings.web.common.BasePanel;
import org.apache.openmeetings.web.user.calendar.CalendarPanel;
import org.apache.openmeetings.web.user.dashboard.OmDashboardPanel;
+import org.apache.openmeetings.web.user.profile.EditProfilePanel;
+import org.apache.openmeetings.web.user.profile.InvitationsPanel;
+import org.apache.openmeetings.web.user.profile.MessagesContactsPanel;
+import org.apache.openmeetings.web.user.profile.UserSearchPanel;
+import org.apache.openmeetings.web.user.profile.WidgetsPanel;
import org.apache.openmeetings.web.user.record.RecordingsPanel;
import org.apache.openmeetings.web.user.rooms.RoomsSelectorPanel;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
@@ -43,15 +48,15 @@ import org.junit.jupiter.api.Test;
import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.Navbar;
class TestMainMenu extends AbstractWicketTesterTest {
- private void checkMenuItem(int idx1, Integer idx2, Class<? extends
BasePanel> clazz) throws OmException {
+ private void checkMenuItem(int menuIdx, Integer subMenuIdx, Class<?
extends BasePanel> clazz) throws OmException {
testArea(adminUsername, p -> {
Navbar menu = (Navbar)p.get(PATH_MENU);
assertNotNull(menu);
- String path =
"container:collapse:navLeftListEnclosure:navLeftList:" + idx1;
- if (idx2 == null) {
+ String path =
"container:collapse:navLeftListEnclosure:navLeftList:" + menuIdx;
+ if (subMenuIdx == null) {
path += ":component";
} else {
- path += ":component:dropdown-menu:buttons:" +
idx2 + ":button";
+ path += ":component:dropdown-menu:buttons:" +
subMenuIdx + ":button";
}
tester.executeBehavior((AbstractAjaxBehavior)menu.get(path).getBehaviorById(0));
@@ -89,6 +94,31 @@ class TestMainMenu extends AbstractWicketTesterTest {
checkMenuItem(2, null, RecordingsPanel.class);
}
+ @Test
+ void testSettingsMessages() throws OmException {
+ checkMenuItem(3, 0, MessagesContactsPanel.class);
+ }
+
+ @Test
+ void testSettingsProfile() throws OmException {
+ checkMenuItem(3, 1, EditProfilePanel.class);
+ }
+
+ @Test
+ void testSettingsSearch() throws OmException {
+ checkMenuItem(3, 2, UserSearchPanel.class);
+ }
+
+ @Test
+ void testSettingsInvitations() throws OmException {
+ checkMenuItem(3, 3, InvitationsPanel.class);
+ }
+
+ @Test
+ void testSettingsWidgets() throws OmException {
+ checkMenuItem(3, 4, WidgetsPanel.class);
+ }
+
@Test
void testAdminUsers() throws OmException {
checkMenuItem(4, 0, UsersPanel.class);
diff --git a/pom.xml b/pom.xml
index 1925d949f..4b7587740 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
<wicket.version>9.12.0</wicket.version>
<wicket-jquery-ui.version>9.11.0</wicket-jquery-ui.version>
<wicketstuff.version>9.12.0</wicketstuff.version>
-
<wicket-bootstrap.version>6.0.0-M9-SNAPSHOT</wicket-bootstrap.version>
+ <wicket-bootstrap.version>6.0.0</wicket-bootstrap.version>
<font-awesome.version>6.2.0</font-awesome.version>
<spring.version>5.3.24</spring.version>
<tomcat.version>9.0.70</tomcat.version>
