From 35d61a60d52c5dc1e1cac5282f2c53a4e5412879 Mon Sep 17 00:00:00 2001 From: brow3c Date: Sun, 16 May 2021 00:36:23 +0900 Subject: [PATCH] sdfdsf --- src/service/NavigateService.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/service/NavigateService.js b/src/service/NavigateService.js index c2267d7..dca9333 100644 --- a/src/service/NavigateService.js +++ b/src/service/NavigateService.js @@ -1,5 +1,5 @@ const logger = require("logops") - , { Builder, Capabilities, WebDriver, By, until } = require('selenium-webdriver') + , { Builder, Capabilities, WebDriver, By, until, WebElement } = require('selenium-webdriver') , _http = require('selenium-webdriver/http') , { Options } = require('selenium-webdriver/chrome'); @@ -19,17 +19,15 @@ class NavigateService { login(params) { return this._getDriver(params.sessionId).then(driver => { - return driver.get(params.uri).then(() => driver.wait(until.elementLocated(By.name(params.name.password)), 5000)).then(() => { - let username = driver.findElement(By.name(params.name.username)) - let password = driver.findElement(By.name(params.name.password)) - // let username = driver.findElement(By.xpath(params.xpath.username)) - // let password = driver.findElement(By.xpath(params.xpath.password)) - let submit = driver.findElement(By.xpath(params.xpath.submit)) + return driver.get(params.uri).then(() => driver.wait(until.elementLocated(By.css(params.css.password)), 5000)).then(() => { + let username = driver.findElement(By.css(params.css.username)) + let password = driver.findElement(By.css(params.css.password)) + let submit = driver.findElement(By.css(params.css.submit)) username.sendKeys(params.key.username) password.sendKeys(params.key.password) - // return submit.click() - - return driver.findElement(By.css('body')) + return submit.click() + // WebElement + // return driver.findElement(By.css('body')) }).then(body => { return body.getAttribute('innerHTML') return JSON.stringify({ currentUrl: driver.getCurrentUrl(), sessionId: driver.getSession() })