Selenium suites: cosmetics, wording, ws

(cherry picked from commit e65dbfd)

Author: michaelklishin

selenium/test/basic-auth/session-expired-with-no-refresh.js

@@ -6,31 +6,30 @@ const { buildDriver, goToHome, captureScreensFor, teardown, delay } = require('.
 const LoginPage = require('../pageobjects/LoginPage')
 const OverviewPage = require('../pageobjects/OverviewPage')
 
-describe('Once user is logged in and not refresh is configured', function () {
+describe('Once user is logged in and no refresh is configured', function () {
   let driver
+  let login
   let overview
   let captureScreen
-  this.timeout(65000) // hard-coded to 25secs because this test requires 35sec to run
+  this.timeout(65000)
 
   before(async function () {
     driver = buildDriver()
     await goToHome(driver)
     login = new LoginPage(driver)
     overview = new OverviewPage(driver)
-    captureScreen = captureScreensFor(driver, __filename)    
+    captureScreen = captureScreensFor(driver, __filename)
     await login.login('guest', 'guest')
-    await overview.isLoaded()    
+    await overview.isLoaded()
     await overview.selectRefreshOption("Do not refresh")
-    await overview.ensureTotalsSectionIsInvisible() // trigger a preference stored in cookie
-                                                    // which should honor login timeout     
+    // Trigger a preference stored in cookie, which should honor login timeout.
+    await overview.ensureTotalsSectionIsInvisible()
   })
 
   it('any authorized request after the session has expired should log the user out', async function () {
-    
     await delay(60000)
     await overview.clickOnConnectionsTab()
-    await login.isLoaded()   
-    
+    await login.isLoaded()
   })
 
   after(async function () {

selenium/test/basic-auth/session-expired.js

@@ -19,16 +19,14 @@ describe('Once user is logged in', function () {
     overview = new OverviewPage(driver)
     captureScreen = captureScreensFor(driver, __filename)
     await login.login('guest', 'guest')
-    await overview.isLoaded()    
-    await overview.ensureTotalsSectionIsInvisible() // trigger a preference stored in cookie
-                                                    // which should honor login timeout 
-    
+    await overview.isLoaded()
+    // Trigger a preference stored in cookie, which should honor login timeout.
+    await overview.ensureTotalsSectionIsInvisible()
   })
 
   it('it has to login after the session expires', async function () {
-    
     await delay(60000)
-    await login.isLoaded() 
+    await login.isLoaded()
     await login.login('guest', 'guest')
     await overview.isLoaded()
     await overview.clickOnConnectionsTab() // and we can still interact with the ui

selenium/test/pageobjects/BasePage.js

@@ -33,7 +33,7 @@ module.exports = class BasePage {
     this.polling = parseInt(process.env.SELENIUM_POLLING) || 500 // how frequent selenium searches for an element
     this.interactionDelay = parseInt(process.env.SELENIUM_INTERACTION_DELAY) || 0 // slow down interactions (when rabbit is behind a http proxy)
   }
- 
+
   async ensureSectionIsVisible(section) {
     let classes = await this.driver.findElement(section).getAttribute("class")
     if (classes.search('section-visible') < 0) {
@@ -42,12 +42,12 @@ module.exports = class BasePage {
       return Promise.resolve(true)
     }
   }
+
   async ensureSectionIsInvisible(section) {
     let classes = await this.driver.findElement(section).getAttribute("class")
     if (classes.search('section-invisible') < 0) {
       return this.click(By.css(section.value + ' h2'))
     } else {
-      
       return Promise.resolve(true)
     }
   }