Upgrade foundation to 26.7.0; revise to leverage updates (#30)

sbabcoc · Jan 1, 2023 · 1a2b13a · 1a2b13a
1 parent 1de0f34
commit 1a2b13a
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 25 deletions.
diff --git a/...-node/src/test/resources/META-INF/services/com.nordstrom.automation.selenium.DriverPlugin b/...-node/src/test/resources/META-INF/services/com.nordstrom.automation.selenium.DriverPlugin
diff --git a/local-espresso-node/src/test/resources/settings.properties b/local-espresso-node/src/test/resources/settings.properties
@@ -1,2 +1,3 @@
-selenium.browser.caps={"platformName":"Android","appium:automationName":"Espresso","appium:forceEspressoRebuild":true,"appium:showGradleLog":true,"appium:app":"https://github.com/appium/appium/raw/master/packages/appium/sample-code/apps/ApiDemos-debug.apk"}
 appium.with.pm2=true
+selenium.browser.caps={"platformName":"Android","appium:automationName":"Espresso","appium:forceEspressoRebuild":true,"appium:showGradleLog":true,"appium:app":"https://github.com/appium/appium/raw/master/packages/appium/sample-code/apps/ApiDemos-debug.apk"}
+selenium.grid.plugins=com.nordstrom.automation.selenium.plugins.EspressoPlugin
diff --git a/local-grid-hub/pom.xml b/local-grid-hub/pom.xml
@@ -89,12 +89,15 @@
               <key>appium.with.pm2</key>
               <value>${appiumWithPM2}</value>
             </systemProperty>
+            <systemProperty>
+              <key>selenium.grid.plugins</key>
+              <value>${chromePlugin}${edgePlugin}${espressoPlugin}${firefoxPlugin}${htmlunitPlugin}${mac2Plugin}${operaPlugin}${phantomjsPlugin}${safariPlugin}${uiautomator2Plugin}${windowsPlugin}${xcuitestPlugin}</value>
+            </systemProperty>
           </systemProperties>
           <additionalClasspathElements>
             <additionalClasspathElement>local-grid-hub-${project.version}.jar</additionalClasspathElement>
           </additionalClasspathElements>
           <mainClass>com.nordstrom.utility.Main</mainClass>
-          <commandlineArgs>${chromePlugin} ${edgePlugin} ${espressoPlugin} ${firefoxPlugin} ${htmlunitPlugin} ${mac2Plugin} ${operaPlugin} ${phantomjsPlugin} ${safariPlugin} ${uiautomator2Plugin} ${windowsPlugin} ${xcuitestPlugin}</commandlineArgs>
           <includePluginDependencies>true</includePluginDependencies>
           <cleanupDaemonThreads>false</cleanupDaemonThreads>
         </configuration>
@@ -116,7 +119,7 @@
     <profile>
       <id>chrome</id>
       <properties>
-        <chromePlugin>-plugins com.nordstrom.automation.selenium.plugins.ChromePlugin</chromePlugin>
+        <chromePlugin>com.nordstrom.automation.selenium.plugins.ChromePlugin${path.separator}</chromePlugin>
       </properties>
       <build>
         <plugins>
@@ -137,7 +140,7 @@
     <profile>
       <id>edge</id>
       <properties>
-        <edgePlugin>-plugins com.nordstrom.automation.selenium.plugins.EdgePlugin</edgePlugin>
+        <edgePlugin>com.nordstrom.automation.selenium.plugins.EdgePlugin${path.separator}</edgePlugin>
       </properties>
       <build>
         <plugins>
@@ -158,7 +161,7 @@
     <profile>
       <id>espresso</id>
       <properties>
-        <espressoPlugin>-plugins com.nordstrom.automation.selenium.plugins.EspressoPlugin</espressoPlugin>
+        <espressoPlugin>com.nordstrom.automation.selenium.plugins.EspressoPlugin${path.separator}</espressoPlugin>
         <appiumWithPM2>true</appiumWithPM2>
       </properties>
       <build>
@@ -180,7 +183,7 @@
     <profile>
       <id>firefox</id>
       <properties>
-        <firefoxPlugin>-plugins com.nordstrom.automation.selenium.plugins.FirefoxPlugin</firefoxPlugin>
+        <firefoxPlugin>com.nordstrom.automation.selenium.plugins.FirefoxPlugin${path.separator}</firefoxPlugin>
       </properties>
       <build>
         <plugins>
@@ -201,7 +204,7 @@
     <profile>
       <id>htmlunit</id>
       <properties>
-        <htmlunitPlugin>-plugins com.nordstrom.automation.selenium.plugins.HtmlUnitPlugin</htmlunitPlugin>
+        <htmlunitPlugin>com.nordstrom.automation.selenium.plugins.HtmlUnitPlugin${path.separator}</htmlunitPlugin>
       </properties>
       <build>
         <plugins>
@@ -222,7 +225,7 @@
     <profile>
       <id>mac2</id>
       <properties>
-        <mac2Plugin>-plugins com.nordstrom.automation.selenium.plugins.Mac2Plugin</mac2Plugin>
+        <mac2Plugin>com.nordstrom.automation.selenium.plugins.Mac2Plugin${path.separator}</mac2Plugin>
         <appiumWithPM2>true</appiumWithPM2>
       </properties>
       <build>
@@ -244,7 +247,7 @@
     <profile>
       <id>opera</id>
       <properties>
-        <operaPlugin>-plugins com.nordstrom.automation.selenium.plugins.OperaPlugin</operaPlugin>
+        <operaPlugin>com.nordstrom.automation.selenium.plugins.OperaPlugin${path.separator}</operaPlugin>
       </properties>
       <build>
         <plugins>
@@ -265,7 +268,7 @@
     <profile>
       <id>phantomjs</id>
       <properties>
-        <phantomjsPlugin>-plugins com.nordstrom.automation.selenium.plugins.PhantomJsPlugin</phantomjsPlugin>
+        <phantomjsPlugin>com.nordstrom.automation.selenium.plugins.PhantomJsPlugin${path.separator}</phantomjsPlugin>
       </properties>
       <build>
         <plugins>
@@ -286,7 +289,7 @@
     <profile>
       <id>safari</id>
       <properties>
-        <safariPlugin>-plugins com.nordstrom.automation.selenium.plugins.SafariPlugin</safariPlugin>
+        <safariPlugin>com.nordstrom.automation.selenium.plugins.SafariPlugin${path.separator}</safariPlugin>
       </properties>
       <build>
         <plugins>
@@ -307,7 +310,7 @@
     <profile>
       <id>uiautomator2</id>
       <properties>
-        <uiautomator2Plugin>-plugins com.nordstrom.automation.selenium.plugins.UiAutomator2Plugin</uiautomator2Plugin>
+        <uiautomator2Plugin>com.nordstrom.automation.selenium.plugins.UiAutomator2Plugin${path.separator}</uiautomator2Plugin>
         <appiumWithPM2>true</appiumWithPM2>
       </properties>
       <build>
@@ -329,7 +332,7 @@
     <profile>
       <id>windows</id>
       <properties>
-        <windowsPlugin>-plugins com.nordstrom.automation.selenium.plugins.WindowsPlugin</windowsPlugin>
+        <windowsPlugin>com.nordstrom.automation.selenium.plugins.WindowsPlugin${path.separator}</windowsPlugin>
         <appiumWithPM2>true</appiumWithPM2>
       </properties>
       <build>
@@ -351,7 +354,7 @@
     <profile>
       <id>xcuitest</id>
       <properties>
-        <xcuitestPlugin>-plugins com.nordstrom.automation.selenium.plugins.XCUITestPlugin</xcuitestPlugin>
+        <xcuitestPlugin>com.nordstrom.automation.selenium.plugins.XCUITestPlugin${path.separator}</xcuitestPlugin>
         <appiumWithPM2>true</appiumWithPM2>
       </properties>
       <build>

diff --git a/local-mac2-node/src/test/java/com/nordstrom/automation/Mac2GridTest.java b/local-mac2-node/src/test/java/com/nordstrom/automation/Mac2GridTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -12,6 +13,8 @@
 import com.nordstrom.automation.selenium.examples.MacPage;
 import com.nordstrom.automation.selenium.junit.JUnitBase;
 import com.nordstrom.automation.selenium.plugins.Mac2Plugin;
+import com.nordstrom.common.file.OSInfo;
+import com.nordstrom.common.file.OSInfo.OSType;
 import com.nordstrom.utility.GridLauncher;
 
 @InitialPage(MacPage.class)
@@ -22,6 +25,7 @@ public class Mac2GridTest extends JUnitBase {
 
     @Before
     public void beforeTest() {
+        Assume.assumeTrue(OSInfo.getDefault().getType() == OSType.MACINTOSH);
         launchSeleniumGrid();
         ExamplePage.setHubAsTarget();
     }

diff --git a/...-node/src/test/resources/META-INF/services/com.nordstrom.automation.selenium.DriverPlugin b/...-node/src/test/resources/META-INF/services/com.nordstrom.automation.selenium.DriverPlugin
diff --git a/local-mac2-node/src/test/resources/settings.properties b/local-mac2-node/src/test/resources/settings.properties
@@ -1,2 +1,3 @@
-selenium.browser.caps={"platformName":"Mac","appium:automationName":"Mac2","appium:bundleId":"com.apple.TextEdit"}
 appium.with.pm2=true
+selenium.browser.caps={"platformName":"Mac","appium:automationName":"Mac2","appium:bundleId":"com.apple.TextEdit"}
+selenium.grid.plugins=com.nordstrom.automation.selenium.plugins.Mac2Plugin
diff --git a/local-safari-node/src/test/java/com/nordstrom/automation/SafariGridTest.java b/local-safari-node/src/test/java/com/nordstrom/automation/SafariGridTest.java
@@ -1,13 +1,22 @@
 package com.nordstrom.automation;
 
+import org.junit.Assume;
 import com.nordstrom.automation.selenium.DriverPlugin;
 import com.nordstrom.automation.selenium.plugins.SafariPlugin;
+import com.nordstrom.common.file.OSInfo;
+import com.nordstrom.common.file.OSInfo.OSType;
 import com.nordstrom.utility.AbstractGridTest;
 
 public class SafariGridTest extends AbstractGridTest {
 
     private final DriverPlugin plugin = new SafariPlugin();
 
+    @Override
+    public void beforeTest() {
+        Assume.assumeTrue(OSInfo.getDefault().getType() == OSType.MACINTOSH);
+        super.beforeTest();
+    }
+
     @Override
     public DriverPlugin getPlugin() {
         return plugin;

diff --git a/...-node/src/test/resources/META-INF/services/com.nordstrom.automation.selenium.DriverPlugin b/...-node/src/test/resources/META-INF/services/com.nordstrom.automation.selenium.DriverPlugin
diff --git a/local-uiautomator2-node/src/test/resources/settings.properties b/local-uiautomator2-node/src/test/resources/settings.properties
@@ -1,2 +1,3 @@
-selenium.browser.caps={"platformName":"Android","appium:automationName":"UiAutomator2","appium:app":"https://github.com/appium/appium/raw/master/packages/appium/sample-code/apps/ApiDemos-debug.apk"}
 appium.with.pm2=true
+selenium.browser.caps={"platformName":"Android","appium:automationName":"UiAutomator2","appium:app":"https://github.com/appium/appium/raw/master/packages/appium/sample-code/apps/ApiDemos-debug.apk"}
+selenium.grid.plugins=com.nordstrom.automation.selenium.plugins.UiAutomator2Plugin
diff --git a/local-windows-node/src/test/java/com/nordstrom/automation/WindowsGridTest.java b/local-windows-node/src/test/java/com/nordstrom/automation/WindowsGridTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.Keys;
@@ -13,6 +14,8 @@
 import com.nordstrom.automation.selenium.examples.WindowsPage;
 import com.nordstrom.automation.selenium.junit.JUnitBase;
 import com.nordstrom.automation.selenium.plugins.WindowsPlugin;
+import com.nordstrom.common.file.OSInfo;
+import com.nordstrom.common.file.OSInfo.OSType;
 import com.nordstrom.utility.GridLauncher;
 
 @InitialPage(WindowsPage.class)
@@ -23,6 +26,7 @@ public class WindowsGridTest extends JUnitBase {
 
     @Before
     public void beforeTest() {
+        Assume.assumeTrue(OSInfo.getDefault().getType() == OSType.WINDOWS);
         launchSeleniumGrid();
         ExamplePage.setHubAsTarget();
     }

diff --git a/...-node/src/test/resources/META-INF/services/com.nordstrom.automation.selenium.DriverPlugin b/...-node/src/test/resources/META-INF/services/com.nordstrom.automation.selenium.DriverPlugin
diff --git a/local-windows-node/src/test/resources/settings.properties b/local-windows-node/src/test/resources/settings.properties
@@ -1,2 +1,3 @@
-selenium.browser.caps={"platformName":"Windows","appium:automationName":"Windows","appium:app":"C:/Windows/system32/notepad.exe"}
 appium.with.pm2=true
+selenium.browser.caps={"platformName":"Windows","appium:automationName":"Windows","appium:app":"C:/Windows/system32/notepad.exe"}
+selenium.grid.plugins=com.nordstrom.automation.selenium.plugins.WindowsPlugin
diff --git a/local-xcuitest-node/src/test/java/com/nordstrom/automation/XCUITestGridTest.java b/local-xcuitest-node/src/test/java/com/nordstrom/automation/XCUITestGridTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -12,6 +13,8 @@
 import com.nordstrom.automation.selenium.examples.IOSPage;
 import com.nordstrom.automation.selenium.junit.JUnitBase;
 import com.nordstrom.automation.selenium.plugins.XCUITestPlugin;
+import com.nordstrom.common.file.OSInfo;
+import com.nordstrom.common.file.OSInfo.OSType;
 import com.nordstrom.utility.GridLauncher;
 
 @InitialPage(IOSPage.class)
@@ -22,6 +25,7 @@ public class XCUITestGridTest extends JUnitBase {
 
     @Before
     public void beforeTest() {
+        Assume.assumeTrue(OSInfo.getDefault().getType() == OSType.MACINTOSH);
         launchSeleniumGrid();
         ExamplePage.setHubAsTarget();
     }

diff --git a/...-node/src/test/resources/META-INF/services/com.nordstrom.automation.selenium.DriverPlugin b/...-node/src/test/resources/META-INF/services/com.nordstrom.automation.selenium.DriverPlugin
diff --git a/local-xcuitest-node/src/test/resources/settings.properties b/local-xcuitest-node/src/test/resources/settings.properties
@@ -1,2 +1,3 @@
-selenium.browser.caps={"platformName":"iOS","appium:automationName":"XCUITest","appium:app":"http://appium.github.io/appium/assets/TestApp9.4.app.zip","appium:deviceName":"iPhone 8","appium:clearSystemFiles": true}
 appium.with.pm2=true
+selenium.browser.caps={"platformName":"iOS","appium:automationName":"XCUITest","appium:app":"https://github.com/appium/appium/raw/master/packages/appium/sample-code/apps/TestApp.app.zip","appium:deviceName":"iPhone 8","appium:clearSystemFiles": true}
+selenium.grid.plugins=com.nordstrom.automation.selenium.plugins.XCUITestPlugin
diff --git a/pom.xml b/pom.xml
@@ -29,10 +29,10 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.release>8</maven.compiler.release>
-    <selenium-foundation.version>26.6.0-s3</selenium-foundation.version>
+    <selenium-foundation.version>26.7.0-s3</selenium-foundation.version>
     <selenium.version>3.141.59</selenium.version>
     <appium-client.version>7.6.0</appium-client.version>
-    <htmlunit.version>2.64.0</htmlunit.version>
+    <htmlunit.version>2.67.0</htmlunit.version>
     <phantomjsdriver.version>1.4.4</phantomjsdriver.version>
     <junit-foundation.version>17.0.2</junit-foundation.version>
     <guava.version>31.1-jre</guava.version>