Commit 1f3dc90c authored by Joshua Yu's avatar Joshua Yu

Merge branch 'main' into 'master'

update driver See merge request !3
parents 98e9f73b 265db36d
#!/usr/bin/env node
const path = require("path");
const spawn = require("child_process").spawn;
const binPath = require(path.join(__dirname, "..", "lib", "chromedriver")).path;
const args = process.argv.slice(2);
const cp = spawn(binPath, args);
cp.stdout.pipe(process.stdout);
cp.stderr.pipe(process.stderr);
cp.on("exit", process.exit);
process.on("SIGTERM", function() {
cp.kill("SIGTERM");
process.exit(1);
});
\ No newline at end of file
let log4js = require('log4js'); let log4js = require('log4js');
const chrome = require("selenium-webdriver/chrome"); const chrome = require("selenium-webdriver/chrome");
const {By} = require("selenium-webdriver"); const {By} = require("selenium-webdriver");
const chromedriver = require("./Driver/chromeDiver_1"); const chromedriver = require("./Driver/chromeDiver_linux");
let log = log4js.getLogger('jppSeleniumWebdriver'); let log = log4js.getLogger('jppSeleniumWebdriver');
...@@ -13,7 +13,8 @@ exports.getDriver = function (webdriver, browser) { ...@@ -13,7 +13,8 @@ exports.getDriver = function (webdriver, browser) {
switch (browser) { switch (browser) {
case 'chrome': case 'chrome':
let chrome = require('selenium-webdriver/chrome'); let chrome = require('selenium-webdriver/chrome');
let chromedriver = require('./Driver/chromedriver'); // let chromedriver = require('./Driver/chromedriver');
let chromedriver = require('./Driver/chromeDiver_linux');
// let chromedriver = require('chromedriver'); // let chromedriver = require('chromedriver');
// if(chrome.getDefaultService().isRunning()){ // if(chrome.getDefaultService().isRunning()){
// chrome.getDefaultService().kill(); // chrome.getDefaultService().kill();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment