Impove logic that checks for non-visible

MarcialRosales · MarcialRosales · commit 8a661c949f9f · 2024-12-04T15:11:32.000+01:00
diff --git a/selenium/bin/components/forward-proxy b/selenium/bin/components/forward-proxy
@@ -42,6 +42,6 @@ start_forward-proxy() {
     --mount "type=bind,source=${MOUNT_HTTPD_CONFIG_DIR},target=/usr/local/apache2/conf" \
     ${HTTPD_DOCKER_IMAGE}
 
-  wait_for_url $OAUTH_PROVIDER_URL ${FORWARD_PROXY_URL}
+  #wait_for_url $OAUTH_PROVIDER_URL ${FORWARD_PROXY_URL}
   end "forward-proxy is ready"
 }
diff --git a/selenium/bin/suite_template b/selenium/bin/suite_template
@@ -524,7 +524,6 @@ elif [[ "$COMMAND" == "stop-rabbitmq" ]]
     stop_local_rabbitmq
   elif [[ "$COMMAND" == "start-others" ]]
   then
-    trap "teardown_components" EXIT
     start_local_others
   elif [[ "$COMMAND" == "ensure-others" ]]
   then
diff --git a/selenium/test/basic-auth/ac-management.js b/selenium/test/basic-auth/ac-management.js
@@ -27,35 +27,35 @@ describe('management user with vhosts permissions', function () {
   it('can access overview tab', async function () {
     await overview.clickOnOverviewTab()
     await overview.waitForOverviewTab()
-    assert.ok(!await overview.isPopupWarningDisplayed())
+    assert.ok(await overview.isPopupWarningNotDisplayed())
   })
   it('can access connections tab', async function () {
     await overview.clickOnConnectionsTab()
     await overview.waitForConnectionsTab()
-    assert.ok(!await overview.isPopupWarningDisplayed())
+    assert.ok(await overview.isPopupWarningNotDisplayed())
   })
   it('can access channels tab', async function () {
     await overview.clickOnChannelsTab()
     await overview.waitForChannelsTab()
-    assert.ok(!await overview.isPopupWarningDisplayed())
+    assert.ok(await overview.isPopupWarningNotDisplayed())
   })
   it('can access exchanges tab', async function () {
     await overview.clickOnExchangesTab()
     await overview.waitForExchangesTab()
-    assert.ok(!await overview.isPopupWarningDisplayed())
+    assert.ok(await overview.isPopupWarningNotDisplayed())
   })
   it('can access queues and streams tab', async function () {
     await overview.clickOnQueuesTab()
     await overview.waitForQueuesTab()
-    assert.ok(!await overview.isPopupWarningDisplayed())
+    assert.ok(await overview.isPopupWarningNotDisplayed())
   })
   it('can access limited options in admin tab', async function () {
     console.log("before clickOnAdminTab")
     await overview.clickOnAdminTab()
     console.log("before waitForAdminTab")
     await overview.waitForAdminTab()
     console.log("after waitForAdminTab")
-    assert.ok(!await overview.isPopupWarningDisplayed())
+    assert.ok(await overview.isPopupWarningNotDisplayed())
   })
 
   it('cannot add/update user limits', async function () {
diff --git a/selenium/test/basic-auth/unauthorized.js b/selenium/test/basic-auth/unauthorized.js
@@ -19,7 +19,6 @@ describe('An user without management tag', function () {
     overview = new OverviewPage(driver)
     captureScreen = captureScreensFor(driver, __filename)
 
-    //assert.ok(!await login.isPopupWarningDisplayed())
     await login.login('rabbit_no_management', 'guest')    
   })
 
@@ -45,8 +44,8 @@ describe('An user without management tag', function () {
 
       it('should close popup warning', async function(){
       await delay(1000)
-        const visible = await login.isPopupWarningDisplayed()
-        assert.ok(!visible)
+        const visible = 
+        assert.ok(await login.isPopupWarningNotDisplayed())
       })
 
   })
diff --git a/selenium/test/multi-oauth/with-basic-auth/landing.js b/selenium/test/multi-oauth/with-basic-auth/landing.js
@@ -45,8 +45,7 @@ describe('Given two oauth resources and basic auth enabled, an unauthenticated u
   })
 
   it('should not have a warning message', async function () {
-    const visible = await homePage.isWarningVisible()
-    assert.ok(!visible)
+    assert.ok(await homePage.isWarningNotVisible())
   })
 
 
diff --git a/selenium/test/multi-oauth/without-basic-auth/happy-login.js b/selenium/test/multi-oauth/without-basic-auth/happy-login.js
@@ -32,7 +32,7 @@ describe('Given there are three oauth resources but two enabled', function () {
     if (!await overview.isLoaded()) {
       throw new Error('Failed to login')
     }
-    assert.ok(!await overview.isPopupWarningDisplayed())
+    assert.ok(await overview.isPopupWarningNotDisplayed())
     await overview.logout()
   })
   it('prod_user registered in prodkeycloak can log in using RabbitMQ Development OAuth 2.0 resource', async function () {
@@ -46,7 +46,7 @@ describe('Given there are three oauth resources but two enabled', function () {
     if (!await overview.isLoaded()) {
       throw new Error('Failed to login')
     }
-    assert.ok(!await overview.isPopupWarningDisplayed())
+    assert.ok(await overview.isPopupWarningNotDisplayed())
     await overview.logout()
   })
 
diff --git a/selenium/test/multi-oauth/without-basic-auth/landing.js b/selenium/test/multi-oauth/without-basic-auth/landing.js
@@ -39,11 +39,11 @@ describe('Given three oauth resources but only two enabled, an unauthenticated u
   })
 
   it('should not be presented with a login button to log in using Basic Auth', async function () {
-    assert.ok(!await homePage.isBasicAuthSectionVisible())
+    assert.ok(await homePage.isBasicAuthSectionNotVisible())
   })
 
   it('should not have a warning message', async function () {
-    assert.ok(!await homePage.isWarningVisible())
+    assert.ok(await homePage.isWarningNotVisible())
   })
 
 
diff --git a/selenium/test/oauth/forward-proxy/httpd.conf b/selenium/test/oauth/forward-proxy/httpd.conf
@@ -503,18 +503,25 @@ SSLRandomSeed connect builtin
 </IfModule>
 
 <VirtualHost *:9092>
-  ServerName "forward-proxy"
-  ProxyRequests On
-  ProxyVia On
   SSLEngine on
   SSLCertificateKeyFile ${FORWARD_PROXY_CERTS}/server_forward-proxy_key.pem
   SSLCertificateFile ${FORWARD_PROXY_CERTS}/server_forward-proxy_certificate.pem
-
+  SSLProxyMachineCertificateFile ${FORWARD_PROXY_CERTS}/server_forward-proxy_certificate.pem
+  SSLProtocol all -SSLv2 -SSLv3 -TLSv1 -TLSv1.1
   SSLProxyEngine On
-  SSLProxyVerify none
-  SSLProxyVerifyDepth 10
- 
+
+#  SSLProxyVerify none
+#  SSLProxyCheckPeerCN off
+#  SSLProxyCheckPeerName off
+#  SSLProxyCheckPeerExpire off
+
+  ProxyRequests On
+  ProxyVia On
+  SSLProxyProtocol +TLSv1.2
+  LogLevel debug
+
   <Proxy "*">
     Allow from all
+    SSLProxyProtocol +TLSv1.2
   </Proxy>
 </VirtualHost>
diff --git a/selenium/test/oauth/with-basic-auth/landing.js b/selenium/test/oauth/with-basic-auth/landing.js
@@ -30,8 +30,7 @@ describe('A user which accesses any protected URL without a session where basic
   })
 
   it('should not have a warning message', async function () {
-    const visible = await homePage.isWarningVisible()
-    assert.ok(!visible)
+    assert.ok(await homePage.isWarningVisible())
   })
 
 
diff --git a/selenium/test/oauth/with-basic-auth/unauthorized.js b/selenium/test/oauth/with-basic-auth/unauthorized.js
@@ -35,8 +35,8 @@ describe('An user without management tag', function () {
   it('should get "Not authorized" warning message', async function(){
     assert.equal('Not authorized', await homePage.getWarning())
     assert.equal('Click here to logout', await homePage.getLogoutButton())
-    assert.ok(!await homePage.isBasicAuthSectionVisible())
-    assert.ok(!await homePage.isOAuth2SectionVisible())
+    assert.ok(await homePage.isBasicAuthSectionNotVisible())
+    assert.ok(await homePage.isOAuth2SectionNotVisible())
   })
 
   describe("After clicking on logout button", function() {
@@ -46,8 +46,7 @@ describe('An user without management tag', function () {
       })
 
       it('should get redirected to home page again without error message', async function(){
-        const visible = await homePage.isWarningVisible()
-        assert.ok(!visible)
+        assert.ok(await homePage.isWarningNotVisible())
       })
 
   })
diff --git a/selenium/test/oauth/with-idp-initiated/landing.js b/selenium/test/oauth/with-idp-initiated/landing.js
@@ -27,8 +27,7 @@ describe('A user which accesses any protected URL without a session', function (
 
   it('should not have a warning message', async function () {
     await homePage.isLoaded()
-    const visible = await homePage.isWarningVisible()
-    assert.ok(!visible)
+    assert.ok(await homePage.isWarningNotVisible())
   })
 
   it('login button should redirect to the configured oauth_provider_url', async function () {
diff --git a/selenium/test/oauth/with-multi-resources/landing.js b/selenium/test/oauth/with-multi-resources/landing.js
@@ -35,8 +35,7 @@ describe('A user which accesses any protected URL without a session', function (
 
   it('should not have a warning message', async function () {
     await homePage.isLoaded()
-    const visible = await homePage.isWarningVisible()
-    assert.ok(!visible)
+    assert.ok(await homePage.isWarningNotVisible())
   })
 
   after(async function () {
diff --git a/selenium/test/oauth/with-sp-initiated/landing.js b/selenium/test/oauth/with-sp-initiated/landing.js
@@ -24,8 +24,7 @@ describe('A user which accesses any protected URL without a session', function (
 
   it('should not have a warning message', async function () {
     await homePage.isLoaded()
-    const visible = await homePage.isWarningVisible()
-    assert.ok(!visible)
+    assert.ok(await homePage.isWarningNotVisible())
   })
 
   after(async function () {
diff --git a/selenium/test/oauth/with-sp-initiated/redirection-after-login.js b/selenium/test/oauth/with-sp-initiated/redirection-after-login.js
@@ -33,7 +33,7 @@ describe('A user which accesses a protected URL without a session', function ()
       throw new Error('Failed to login')
     }
 
-    assert.equal("All exchanges (8)", await exchanges.getPagingSectionHeaderText())
+    assert.equal("All exchanges (15)", await exchanges.getPagingSectionHeaderText())
   })
 
 
diff --git a/selenium/test/oauth/with-sp-initiated/unauthorized.js b/selenium/test/oauth/with-sp-initiated/unauthorized.js
@@ -36,8 +36,8 @@ describe('An user without management tag', function () {
   it('should get "Not authorized" warning message and logout button but no login button', async function(){
     assert.equal('Not authorized', await homePage.getWarning())
     assert.equal('Click here to logout', await homePage.getLogoutButton())
-    assert.ok(!await homePage.isBasicAuthSectionVisible())
-    assert.ok(!await homePage.isOAuth2SectionVisible())
+    assert.ok(await homePage.isBasicAuthSectionNotVisible())
+    assert.ok(await homePage.isOAuth2SectionNotVisible())
   })
 
   describe("After clicking on logout button", function() {
@@ -47,9 +47,8 @@ describe('An user without management tag', function () {
       })
 
       it('should get redirected to home page again without error message', async function(){
-        await driver.sleep(250)        
-        const visible = await homePage.isWarningVisible()
-        assert.ok(!visible)
+        await driver.sleep(250)                
+        assert.ok(await homePage.isWarningNotVisible())
       })
 
   })
diff --git a/selenium/test/pageobjects/BasePage.js b/selenium/test/pageobjects/BasePage.js
@@ -146,18 +146,12 @@ module.exports = class BasePage {
       return element.isDisplayed()
     } catch(e) {
       return Promise.resolve(false)
-    }
-    /*
-    let element = await driver.findElement(FORM_POPUP)
-    return this.driver.wait(until.elementIsVisible(element), this.timeout / 2,
-      'Timed out after [timeout=' + this.timeout + ';polling=' + this.polling + '] awaiting till visible ' + element,
-      this.polling / 2).then(function onWarningVisible(e) {
-          return Promise.resolve(true)
-      }, function onError(e) {
-          return Promise.resolve(false)
-      })
-      */
+    }    
   }
+  async isPopupWarningNotDisplayed() {
+    return this.waitForNotDisplayed(FORM_POPUP)        
+  }
+  
   async getPopupWarning() {
     let element = await driver.findElement(FORM_POPUP)
     return this.driver.wait(until.elementIsVisible(element), this.timeout,
@@ -208,17 +202,17 @@ module.exports = class BasePage {
 
   async waitForDisplayed (locator) {
     if (this.interactionDelay && this.interactionDelay > 0) await this.driver.sleep(this.interactionDelay)
-    let times = 5
+    let times = 1
     do {
       try {
         return this.waitForVisible(await this.waitForLocated(locator))
       }catch(error) {
         if (!error.name.includes("NoSuchSessionError")) {
           console.error("Failed to waitForDisplayed " + locator + " due to " + error)
         }
-        if (times > 0) {
+        if (times > 0 && error.name.includes("StaleElementReference")) {
           times--
-          this.driver.sleep(500)
+          this.driver.sleep(50)
         } else {
           throw error
         }
@@ -227,6 +221,20 @@ module.exports = class BasePage {
     
   }
 
+  async waitForNotDisplayed (locator) {
+    let times = 5
+    do {
+      try {
+        await driver.findElement(locator)
+        times--
+        this.driver.sleep(50)
+      }catch(error) {
+        return Promise.resolve(true)  
+      }
+    } while(times > 0)
+    return Promise.resolve(false)  
+  }
+
   async getText (locator) {
     const element = await this.waitForDisplayed(locator)
     return element.getText()
diff --git a/selenium/test/pageobjects/SSOHomePage.js b/selenium/test/pageobjects/SSOHomePage.js
@@ -71,12 +71,18 @@ module.exports = class SSOHomePage extends BasePage {
   async isOAuth2SectionVisible() {
     return this.isDisplayed(SECTION_LOGIN_WITH_OAUTH)
   }
+  async isOAuth2SectionNotVisible() {
+    return this.waitForNotDisplayed(SECTION_LOGIN_WITH_OAUTH)
+  }
   async getOAuth2Section() {
     return this.waitForDisplayed(SECTION_LOGIN_WITH_OAUTH)
   }
   async isBasicAuthSectionVisible() {
     return this.isDisplayed(SECTION_LOGIN_WITH_BASIC_AUTH)
   }
+  async isBasicAuthSectionNotVisible() {
+    return this.waitForNotDisplayed(SECTION_LOGIN_WITH_BASIC_AUTH)
+  }
   async getBasicAuthSection() {
     return this.waitForDisplayed(SECTION_LOGIN_WITH_BASIC_AUTH)
   }
@@ -104,6 +110,9 @@ module.exports = class SSOHomePage extends BasePage {
       return Promise.resolve(false)
     }
   }
+  async isWarningNotVisible () {
+    return this.waitForNotDisplayed(WARNING)
+  }
   async getWarnings() {
     try
     {

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,6 @@ start_forward-proxy() {`
`42`	`42`	`--mount "type=bind,source=${MOUNT_HTTPD_CONFIG_DIR},target=/usr/local/apache2/conf" \`
`43`	`43`	`${HTTPD_DOCKER_IMAGE}`
`44`	`44`
`45`		`- wait_for_url $OAUTH_PROVIDER_URL ${FORWARD_PROXY_URL}`
	`45`	`+ #wait_for_url $OAUTH_PROVIDER_URL ${FORWARD_PROXY_URL}`
`46`	`46`	`end "forward-proxy is ready"`
`47`	`47`	`}`