From d867eea1a590549713c8309fa9c28ae1b19c00f0 Mon Sep 17 00:00:00 2001 From: Huan LI Date: Wed, 30 Aug 2017 17:01:08 +0800 Subject: [PATCH] restore selenium typing --- package.json | 2 +- src/puppet-web/browser-driver.spec.ts | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index fb2d11f0..3453ecab 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "@types/mime": "1.3.1", "@types/raven": "2.1.2", "@types/request": "2.0.3", - "@types/selenium-webdriver": "3.0.5", + "@types/selenium-webdriver": "3.0.4", "@types/sinon": "2.3.3", "@types/sinon-test": "^1.0.2", "@types/ws": "3.0.2", diff --git a/src/puppet-web/browser-driver.spec.ts b/src/puppet-web/browser-driver.spec.ts index 0478408c..dc08fba9 100755 --- a/src/puppet-web/browser-driver.spec.ts +++ b/src/puppet-web/browser-driver.spec.ts @@ -20,34 +20,29 @@ import { test } from 'ava' import config from '../config' -import BrowserDriver from './browser-driver' +import { + BrowserDriver, +} from './browser-driver' test('BrowserDriver smoke testing', async t => { - let driver - try { const browserDriver = new BrowserDriver(config.head) t.truthy(browserDriver, 'BrowserDriver instnace') await browserDriver.init() - driver = browserDriver.getWebDriver() // for help function `execute` + const driver = browserDriver.getWebDriver() // for help function `execute` t.truthy(driver, 'should get webdriver instance') await driver.get('https://wx.qq.com/') t.pass('should open wx.qq.com') - const retAdd = await driverExecute('return 1+1') + const retAdd = await driver.executeScript('return 1 + 1') t.is(retAdd, 2, 'should return 2 for execute 1+1 in browser') await browserDriver.quit() - return } catch (e) { t.fail(e && e.message || e) } - ////////////////////////////////// - function driverExecute(arg1: any, arg2?: any) { - return driver.executeScript.apply(driver, arguments) - } }) -- GitLab