diff --git a/bin/lib.zip b/bin/lib.zip index 884973a..8daf6d8 100644 Binary files a/bin/lib.zip and b/bin/lib.zip differ diff --git a/lambda-selenium-java/build.gradle b/lambda-selenium-java/build.gradle index 3356ee9..c9b1b1c 100644 --- a/lambda-selenium-java/build.gradle +++ b/lambda-selenium-java/build.gradle @@ -33,15 +33,23 @@ dependencies { task unzipLibs(type: Copy) { def libs = file('../bin/lib.zip') - def resources = file("${projectDir}/src/main/resources/lib") + def resources = file("${projectDir}/src/main/resources/") from zipTree(libs) into resources } +task zipLibs(type: Zip) { + from processResources + archiveName 'lib.zip' + destinationDir(file('../bin/')) +} + shadowJar { from sourceSets.test.output configurations = [ project.configurations.testRuntime ] +} - dependsOn unzipLibs +task deploy(type: Exec) { + commandLine 'sh', './build-deploy.sh' } diff --git a/lambda-selenium-java/src/main/java/com/blackboard/testing/driver/LambdaWebDriverFactory.java b/lambda-selenium-java/src/main/java/com/blackboard/testing/driver/LambdaWebDriverFactory.java index 9e2f4f4..a525276 100644 --- a/lambda-selenium-java/src/main/java/com/blackboard/testing/driver/LambdaWebDriverFactory.java +++ b/lambda-selenium-java/src/main/java/com/blackboard/testing/driver/LambdaWebDriverFactory.java @@ -5,18 +5,11 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.chrome.ChromeOptions; -import org.openqa.selenium.remote.DesiredCapabilities; public class LambdaWebDriverFactory extends WebDriverFactory { - private DesiredCapabilities desiredCapabilities; - public LambdaWebDriverFactory() { System.setProperty("webdriver.chrome.driver", getLibLocation("chromedriver")); - DesiredCapabilities capabilities = DesiredCapabilities.chrome(); - capabilities.setCapability(ChromeOptions.CAPABILITY, getLambdaChromeOptions()); - capabilities.setBrowserName(this.getClass().getCanonicalName()); - desiredCapabilities = capabilities; } private ChromeOptions getLambdaChromeOptions() { @@ -40,6 +33,6 @@ private String getLibLocation(String lib) { @Override public WebDriver createWebDriver(Proxy proxy) { - return new ChromeDriver(desiredCapabilities); + return new ChromeDriver(getLambdaChromeOptions()); } }