Refactor and clean code

microsoft · abchatra · Jul 31, 2019 · May 23, 2019 · May 27, 2019 · May 30, 2019
commit 8e8700d439b729db85a12c007efa4ba7ae802b80
diff --git a/tests/ui-test/src/Main1.js b/tests/ui-test/src/Main1.js
diff --git a/tests/ui-test/src/NewProject.js b/tests/ui-test/src/NewProject.js
@@ -1,42  1,6 @@
-const { By } = require('selenium-webdriver');
 import {DomObject} from './lib/domObject';
 import {By} from 'selenium-webdriver';
 
-class DomObject {
-
-    async actionForAll(actionName, findBys) {
-        for (let findBy of findBys) {
-            if (findBy) {
-                console.debug(`Try to click the element by criteria: ${findBy}`);
-
-                if (typeof findBy === 'string') {
-                    findBy = await By.css(findBy);
-                }
-
-                let element = await driver.wait(until.elementLocated(findBy));
-                await driver.sleep(1000);
-                await element[actionName]();
-            }
-        }
-        return true;
-    }
-
-    async sendKeys(findBy, keys) {
-
-        if (typeof findBy === 'string') {
-            findBy = await By.css(findBy);
-        }
-
-        let element = await driver.findElement(findBy);
-        await element["actionName"](keys);
-        await driver.sleep(8000);
-        return true;
-    }
-
-
-    async click(...findBys) {
-        let i = await this.actionForAll('click', findBys);
-        return i;
-    }
-}
 class NewProjectPage extends DomObject {
 
     async getCodeSource() {
@@ -61,7  25,6 @@ class NewProjectPage extends DomObject {
             return await this.testGetCodeSource();
         });
     }
-
 }
 
 export let newProjectPage = new NewProjectPage();
diff --git a/tests/ui-test/src/lib/domObject.js b/tests/ui-test/src/lib/domObject.js
@@ -0,0  1,43 @@
 import {By} from 'selenium-webdriver';
 
 export class DomObject {
 
     async actionForAll(actionName, findBys) {
         for (let criteria of findBys) {
             if (criteria) {
                 console.debug(`Try to click the element by criteria: ${criteria}`);
 
                 let findBy = this.findBy(criteria);
 
                 //wait until the element can be located
                 await driver.wait(until.elementLocated(findBy));
 
                 let element = await driver.wait(until.elementLocated(findBy));
                 await driver.sleep(1000);
                 await element[actionName]();
             }
         }
         return true;
     }
 
     findBy(criteria){
         if (typeof criteria === 'string') {
             return await By.css(criteria);
         }
         return criteria
     }
 
     async sendKeys(criteria, keys) {
 
         let element = await driver.findElement(this.findBy(criteria));
         await element["actionName"](keys);
 
         return true;
     }
 
 
     async click(...findBys) {
         let i = await this.actionForAll('click', findBys);
         return i;
     }
 }
diff --git a/tests/ui-test/src/lib/website.js b/tests/ui-test/src/lib/website.js
@@ -1,4  1,4 @@
-import webdriver from 'selenium-webdriver';
 import {Builder, until} from 'selenium-webdriver';
 import {chrome} from 'selenium-webdriver/chrome';
 
 
@@ -13,7  13,7 @@ class Website {
     async open(path = "") {
         var fullPath = this.getUrl(path);
         console.log(`Open url ${fullPath}`);
-        
 
         await driver.get(fullPath);
 
         console.info(`Opened URL ${fullPath}`);
@@ -35,10  35,10 @@ class Website {
 }
 
 
-global.driver = new webdriver.Builder()
 global.driver = new Builder()
     .forBrowser('chrome')
     .build();
-global.until = webdriver.until;
 global.until = until;
 
 
 export let website = new Website();