Code clean up

Author: MarcialRosales

selenium/test/oauth/with-basic-auth-idp-down/landing.js

@@ -20,15 +20,13 @@ describe('When basic authentication is enabled but UAA is down', function () {
   it('should display warning message that UAA is down', async function () {
     await homePage.isLoaded()
     const message = await homePage.getWarning()
-    assert.equal(true, message.startsWith('OAuth resource [rabbitmq] not available'))
-    assert.equal(true, message.endsWith(' not reachable'))
+    assert.ok(message.startsWith('OAuth resource [rabbitmq] not available'))
+    assert.ok(message.endsWith(' not reachable'))
   })
 
   it('should not be presented oauth2 section', async function () {
     await homePage.isLoaded()
-    if (await homePage.isOAuth2SectionVisible()) {
-      throw new Error('OAuth2 section should not be present')
-    }
+    assert.ok(await homePage.isOAuth2SectionNotVisible())
   })
 
   after(async function () {

selenium/test/oauth/with-basic-auth/unauthorized.js

@@ -28,8 +28,7 @@ describe('An user without management tag', function () {
   })
 
   it('cannot log in into the management ui', async function () {    
-    const visible = await homePage.isWarningVisible()
-    assert.ok(visible)
+    assert.ok(await homePage.isWarningVisible())
   })
 
   it('should get "Not authorized" warning message', async function(){

selenium/test/oauth/with-idp-down/landing.js

@@ -20,13 +20,13 @@ describe('When UAA is down', function () {
   it('should display warning message that UAA is down', async function () {
     await homePage.isLoaded()
     const message = await homePage.getWarning()
-    assert.equal(true, message.startsWith('OAuth resource [rabbitmq] not available'))
-    assert.equal(true, message.endsWith(' not reachable'))
+    assert.ok(message.startsWith('OAuth resource [rabbitmq] not available'))
+    assert.ok(message.endsWith(' not reachable'))
   })
 
   it('should not be presented with a login button to log in', async function () {
     await homePage.isLoaded()
-    assert.equal(false, await homePage.isLoginButtonVisible())    
+    assert.ok(await homePage.isLoginButtonNotVisible())    
   })
 
   after(async function () {

selenium/test/oauth/with-idp-initiated-via-proxy/happy-login.js

@@ -8,9 +8,7 @@ const OverviewPage = require('../../pageobjects/OverviewPage')
 describe('A user with a JWT token', function () {
   let overview
   let captureScreen
-  let token
-  let fakePortal
-
+  
   before(async function () {
     driver = buildDriver()
     overview = new OverviewPage(driver)

selenium/test/oauth/with-idp-initiated/landing.js

@@ -21,8 +21,7 @@ describe('A user which accesses any protected URL without a session', function (
 
   it('should be presented with a login button to log in', async function () {
     await homePage.isLoaded()
-    const value = await homePage.getLoginButton()
-    assert.equal(value, 'Click here to log in')
+    assert.equal(await homePage.getLoginButton(), 'Click here to log in')
   })
 
   it('should not have a warning message', async function () {

selenium/test/oauth/with-idp-initiated/token-expires.js

@@ -36,8 +36,7 @@ describe('Once user logs in with its own token', function () {
 
     it('user should be presented with a login button to log in', async function () {
       await homePage.isLoaded()
-      const value = await homePage.getLoginButton()
-      assert.equal(value, 'Click here to log in')
+      assert.equal(await homePage.getLoginButton(), 'Click here to log in')
     })
 
     after(async function () {

selenium/test/oauth/with-idp-initiated/unauthorized.js

@@ -24,12 +24,10 @@ describe('A user who accesses the /login URL with a token without scopes for the
   })
 
   it('should get a warning message', async function () {
-    const message = await homePage.getWarning()
-    assert.equal('Not_Authorized', message)
+    assert.equal(await homePage.getWarning(), 'Not_Authorized')
   })
   it('should be presented with a login button to log in', async function () {
-    const value = await homePage.getLoginButton()
-    assert.equal(value, 'Click here to log in')
+    assert.equal(await homePage.getLoginButton(), 'Click here to log in')
   })
 
   after(async function () {

selenium/test/oauth/with-multi-resources/landing.js

@@ -29,8 +29,7 @@ describe('A user which accesses any protected URL without a session', function (
     assert.equal("rabbit_x", resources[2].value)
     assert.equal("RabbitMQ X_Idp", resources[2].text)
 
-    const value = await homePage.getLoginButton()
-    assert.equal(value, 'Click here to log in')
+    assert.equal(await homePage.getLoginButton(), 'Click here to log in')
   })
 
   it('should not have a warning message', async function () {

selenium/test/oauth/with-sp-initiated/landing.js

@@ -18,8 +18,7 @@ describe('A user which accesses any protected URL without a session', function (
 
   it('should be presented with a login button to log in', async function () {
     await homePage.isLoaded()    
-    const value = await homePage.getLoginButton()
-    assert.equal(value, 'Click here to log in')
+    assert.equal(await homePage.getLoginButton(), 'Click here to log in')
   })
 
   it('should not have a warning message', async function () {

selenium/test/oauth/with-sp-initiated/redirection-after-login.js

@@ -26,13 +26,10 @@ describe('A user which accesses a protected URL without a session', function ()
 
   it('redirect to previous accessed page after login ', async function () {
     await homePage.clickToLogin()
-
     await idpLogin.login('rabbit_admin', 'rabbit_admin')
-
     if (!await exchanges.isLoaded()) {
       throw new Error('Failed to login')
     }
-
     assert.equal("All exchanges (15)", await exchanges.getPagingSectionHeaderText())
   })