Fix minor issue and add delay after clicking on logout

and before checking home page details
rabbitmq · Sep 3, 2024 · e62a470 · e62a470
1 parent 5452fa7
commit e62a470
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/deps/rabbitmq_management/selenium/bin/components/rabbitmq b/deps/rabbitmq_management/selenium/bin/components/rabbitmq
@@ -30,9 +30,13 @@ stop_rabbitmq() {
           kill_container_if_exist "$component"
       fi
   else
-      gmake --directory=${RABBITMQ_SERVER_ROOT} stop-node
+      stop_local_rabbitmq
   fi
 }
+stop_local_rabbitmq() {
+    RABBITMQ_SERVER_ROOT=$(realpath $TEST_DIR/../../../../)
+    gmake --directory=${RABBITMQ_SERVER_ROOT} stop-node
+}
 save_logs_rabbitmq() {
     if [[ "$PROFILES" == *"docker"* ]]; then
         if [[ "$PROFILES" == *"cluster"* ]]; then
@@ -55,16 +59,17 @@ start_local_rabbitmq() {
 
   print "> EFFECTIVE RABBITMQ_CONFIG_FILE: /tmp$MOUNT_RABBITMQ_CONF"
   ${BIN_DIR}/gen-advanced-config ${RABBITMQ_CONFIG_DIR} $ENV_FILE /tmp$MOUNT_ADVANCED_CONFIG
+  cp ${RABBITMQ_CONFIG_DIR}/enabled_plugins /tmp/etc/rabbitmq/
   RESULT=$?
   if [ $RESULT -eq 0 ]; then
     print "> EFFECTIVE RABBITMQ_CONFIG_FILE: /tmp$MOUNT_ADVANCED_CONFIG"
   	gmake --directory=${RABBITMQ_SERVER_ROOT} run-broker \
-  		RABBITMQ_ENABLED_PLUGINS_FILE=${RABBITMQ_CONFIG_DIR}/enabled_plugins \
+  		RABBITMQ_ENABLED_PLUGINS_FILE=/tmp/etc/rabbitmq/enabled_plugins \
   		RABBITMQ_CONFIG_FILE=/tmp$MOUNT_RABBITMQ_CONF \
       RABBITMQ_ADVANCED_CONFIG_FILE=/tmp$MOUNT_ADVANCED_CONFIG
   else
     gmake --directory=${RABBITMQ_SERVER_ROOT} run-broker \
-  		RABBITMQ_ENABLED_PLUGINS_FILE=${RABBITMQ_CONFIG_DIR}/enabled_plugins \
+  		RABBITMQ_ENABLED_PLUGINS_FILE=/tmp/etc/rabbitmq/enabled_plugins \
   		RABBITMQ_CONFIG_FILE=/tmp$MOUNT_RABBITMQ_CONF
   fi
   print "> RABBITMQ_TEST_DIR: ${RABBITMQ_CONFIG_DIR}"

diff --git a/deps/rabbitmq_management/selenium/bin/suite_template b/deps/rabbitmq_management/selenium/bin/suite_template
@@ -56,6 +56,9 @@ parse_arguments() {
     elif [[ "$1" == "stop-others" ]]
       then
       echo "stop-others"
+    elif [[ "$1" == "stop-rabbitmq" ]]
+      then
+      echo "stop-rabbitmq"
     elif [[ "$1" == "test" ]]
       then
       echo "test $2"
@@ -402,6 +405,9 @@ run_local_with() {
   elif [[ "$COMMAND" == "stop-others" ]]
   then
     teardown_local_others
+  elif [[ "$COMMAND" == "stop-rabbitmq" ]]
+  then
+    stop_local_rabbitmq
   elif [[ "$COMMAND" =~ test[[:space:]]*([^[:space:]]*) ]]
   then
     test_local ${BASH_REMATCH[1]}

diff --git a/deps/rabbitmq_management/selenium/test/oauth/with-sp-initiated/unauthorized.js b/deps/rabbitmq_management/selenium/test/oauth/with-sp-initiated/unauthorized.js
@@ -47,7 +47,7 @@ describe('An user without management tag', function () {
       })
 
       it('should get redirected to home page again without error message', async function(){
-        await homePage.isLoaded()
+        await driver.sleep(250)        
         const visible = await homePage.isWarningVisible()
         assert.ok(!visible)
       })

diff --git a/deps/rabbitmq_management/selenium/test/utils.js b/deps/rabbitmq_management/selenium/test/utils.js
@@ -58,6 +58,12 @@ module.exports = {
     }
     var chromeCapabilities = Capabilities.chrome();
     chromeCapabilities.setAcceptInsecureCerts(true);
+    chromeCapabilities.set('goog:chromeOptions', {
+      args: [
+          "--lang=en",
+          "--disable-search-engine-choice-screen"
+      ]
+    });
     driver = builder
       .forBrowser('chrome')
       .withCapabilities(chromeCapabilities)