Merge pull request #112 from MarketSquare/feat/s4_dependency_updates

Updated dependencies

Author: Hi-Fi

.github/workflows/maven.yml

@@ -1,6 +1,13 @@
 name: Java CI
 
-on: [push, pull_request]
+on: 
+  pull_request:
+  push:
+    tags:
+    branches:
+      - develop
+      - selenium4
+
 
 jobs:
   build_and_test:
@@ -9,68 +16,96 @@ jobs:
       matrix:
         os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
         java-version: [ 8 ]
-        browser: ['jbrowser', 'googlechromeheadless', 'firefoxheadless'] # 'htmlunitwithjs' not working with Selenium4
+        browser: ['jbrowser', 'googlechromeheadless', 'firefoxheadless', 'edgeheadless'] # 'htmlunitwithjs' not working with Selenium4
         include:
           - os: ubuntu-latest
             set_display: export DISPLAY=:99; Xvfb :99 -screen 0 1024x768x24 -ac -noreset & sleep 3
-            install_dependencies: sudo apt-get -y -q install xvfb zip curl
+            install_dependencies: |
+              curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg
+              sudo install -o root -g root -m 644 microsoft.gpg /etc/apt/trusted.gpg.d/
+              sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/edge stable main" > /etc/apt/sources.list.d/microsoft-edge-dev.list'
+              sudo rm microsoft.gpg
+              sudo apt update
+              sudo apt-get -y -q install xvfb zip curl microsoft-edge-beta
           - os: windows-latest
             install_dependencies: choco install firefox googlechrome curl zip -y --no-progress
           - os: macos-latest
             install_dependencies: |
-              brew cask install firefox
-              brew cask install google-chrome
+              brew install --cask firefox
+              brew install --cask google-chrome
+              brew install --cask microsoft-edge
               brew install zip
               brew install curl
-
+        exclude:
+          - os: macos-latest
+            browser: firefoxheadless # Webdriver download if not working with Firefox at GHA
+            java-version: 8
+  
     runs-on: ${{ matrix.os }}
     name: Test on ${{ matrix.os }} with Java ${{ matrix.java-version }} using browser ${{ matrix.browser }}
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v1.2.0
+        uses: actions/setup-java@v2.3.0
         with:
+          distribution: zulu
           java-version: ${{ matrix.java-version }}
           java-package: jdk+fx # needed for jbrowser
       - name: Set up other dependencies
         run: |
           ${{ matrix.install_dependencies }}
           ${{ matrix.set_display }}
       - name: Build with Maven
-        run: mvn -B verify --file pom.xml -P 'build,${{ matrix.browser }}'
+        run: mvn -B -ntp -q verify --file pom.xml -P 'build,${{ matrix.browser }}'
       - name: Delete output.xml (on Win)
         run: |
           Get-ChildItem target/robotframework-reports -Include *output.xml -Recurse | Remove-Item
-          echo "::set-env name=REPORT_FILE::$(Get-ChildItem target/robotframework-reports -Include *report.html -Recurse -Name)"
+          echo "REPORT_FILE=$(Get-ChildItem target/robotframework-reports -Include *report.html -Recurse -Name)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         if: always() && runner.os == 'Windows'
 
       - name: Delete output.xml (on Unix-like)
         run: |
           find target/robotframework-reports -type f -name '*output.xml' -exec rm {} +
-          echo "::set-env name=REPORT_FILE::$(find target/robotframework-reports -type f -name '*report.html' | sed 's#.*/##')"
+          echo "REPORT_FILE=$(find target/robotframework-reports -type f -name '*report.html' | sed 's#.*/##')" >> $GITHUB_ENV
         if: always() && runner.os != 'Windows'
 
       - name: Archive acceptances test results
-        uses: actions/upload-artifact@v1.0.0
+        uses: actions/upload-artifact@v2.2.4
         with:
           name: at-results-${{ matrix.browser }}-${{ matrix.os }}-${{ matrix.java-version }}
           path: target/robotframework-reports
         if: always() && job.status == 'failure'
 
-      - name: Upload results
+      - name: Upload results on failure
+        id: upload_results
         run: |
           echo '<html><head><meta http-equiv = "refresh" content =" 0 ; url = /${{ env.REPORT_FILE }}"></head></html>' > target/robotframework-reports/index.html
           zip -r -j site.zip target/robotframework-reports > no_output 2>&1
           curl -s -H "Content-Type: application/zip" -H "Authorization: Bearer ${{ secrets.NETLIFY_TOKEN }}" --data-binary "@site.zip" https://api.netlify.com/api/v1/sites > response.json
-          echo "::set-env name=REPORT_URL::$(cat response.json|python -c "import sys, json; print('https://' + json.load(sys.stdin)['subdomain'] + '.netlify.com')")"
-          echo "::set-env name=JOB_STATUS::$(python -c "print('${{ job.status }}'.lower())")"
+          echo "::set-output name=REPORT_URL::$(cat response.json|python -c "import sys, json; print('https://' + json.load(sys.stdin)['subdomain'] + '.netlify.com')")"
+          echo "::set-output name=JOB_STATUS::$(python -c "print('${{ job.status }}'.lower())")"
         if: always() && job.status == 'failure'
 
-      - uses: octokit/request-action@57ec46afcc4c58c813af3afe67e57ced1ea9f165
+      - uses: octokit/request-action@7e93b91076fad3920c29d44eb2a6311d929db3dd
         name: Update status with Github Status API
-        id: update_status
+        id: update_status_pr
         with:
-          route: POST /repos/:repository/statuses/:sha
+          route: POST /repos/{repository}/statuses/{sha}
+          repository: ${{ github.repository }}
+          sha: ${{ github.event.pull_request.head.sha }}
+          state: "${{steps.upload_results.outputs.JOB_STATUS}}"
+          target_url: "${{steps.upload_results.outputs.REPORT_URL}}"
+          description: "Link to test report."
+          context: at-results-${{ matrix.browser }}-${{ matrix.os }}-${{ matrix.java-version }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        if: always() && job.status == 'failure' && github.event.pull_request
+
+      - uses: octokit/request-action@7e93b91076fad3920c29d44eb2a6311d929db3dd
+        name: Update status with Github Status API
+        id: update_status_push
+        with:
+          route: POST /repos/{repository}/statuses/{sha}
           repository: ${{ github.repository }}
           sha: ${{ github.sha }}
           state: "${{env.JOB_STATUS}}"
@@ -79,21 +114,22 @@ jobs:
           context: at-results-${{ matrix.browser }}-${{ matrix.os }}-${{ matrix.java-version }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        if: always() && job.status == 'failure'
+        if: always() && job.status == 'failure' && github.event.push
 
   release:
     needs: [build_and_test]
-    if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/selenium4' || startsWith(github.ref, 'refs/tags/')
+    if: github.event.push
     runs-on: ubuntu-latest
     name: Release package
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK
-        uses: actions/setup-java@v1.2.0
+        uses: actions/setup-java@v2.3.0
         with:
+          distribution: zulu
           java-version: 8
       - name: Release Maven package
-        uses: samuelmeuli/action-maven-publish@1221d1fa792cab948a772c5e7c1f3abe84aec3bf
+        uses: samuelmeuli/action-maven-publish@201a45a3f311b2ee888f252ba9f4194257545709
         with:
           gpg_private_key: ${{ secrets.gpg_private_key }}
           gpg_passphrase: ${{ secrets.gpg_passphrase }}

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.github.marketsquare</groupId>
 	<artifactId>robotframework-seleniumlibrary</artifactId>
-	<version>4.0.0-alpha-4.2-SNAPSHOT</version>
+	<version>4.0.0-rc-1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Robot Framework :: SeleniumLibrary</name>
@@ -73,11 +73,11 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<downloadSources>true</downloadSources>
 		<downloadJavadocs>true</downloadJavadocs>
-		<aspectj.version>1.9.5</aspectj.version>
+		<aspectj.version>1.9.8.M1</aspectj.version>
 		<java.version>1.8</java.version>
-		<robotframework.maven.plugin.version>1.6.0</robotframework.maven.plugin.version>
-		<robotframework.version>3.1.2</robotframework.version>
-		<selenium.version>4.0.0-alpha-4</selenium.version>
+		<robotframework.maven.plugin.version>2.1.0</robotframework.maven.plugin.version>
+		<robotframework.version>4.1</robotframework.version>
+		<selenium.version>4.0.0-rc-1</selenium.version>
 		<keywords.class>SeleniumLibrary</keywords.class>
 		<browser>jbrowser</browser>
 		<downloadWebDriver>False</downloadWebDriver>
@@ -124,7 +124,7 @@
 		<dependency>
 			<groupId>io.appium</groupId>
 			<artifactId>java-client</artifactId>
-			<version>7.3.0</version>
+			<version>7.5.1</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.seleniumhq.selenium</groupId>
@@ -160,7 +160,7 @@
 		<dependency>
 		    <groupId>org.seleniumhq.selenium</groupId>
 		    <artifactId>htmlunit-driver</artifactId>
-		    <version>2.36.0</version>
+		    <version>2.52.0</version>
 		    <exclusions>
                 <exclusion>
                     <groupId>org.seleniumhq.selenium</groupId>
@@ -185,7 +185,7 @@
 		<dependency>
 			<groupId>io.github.bonigarcia</groupId>
 			<artifactId>webdrivermanager</artifactId>
-			<version>3.8.1</version>
+			<version>5.0.2</version>
 		</dependency>
 	</dependencies>
 
@@ -290,9 +290,12 @@
 								<log>target/robotframework-reports/${browser}_log.html</log>
 								<output>target/robotframework-reports/${browser}_output.xml</output>
 								<xunitFile>target/robotframework-reports/${browser}_xUnit.xml</xunitFile>
-								<nonCriticalTags>
-									<nonCriticalTag>${browser}</nonCriticalTag>
-								</nonCriticalTags>
+								<skips>
+									<skip>${browser}</skip>
+								</skips>
+								<skiponfailures>
+									<skiponfailure>${browser}</skiponfailure>
+								</skiponfailures>
 							</configuration>
 						</execution>
 						<execution>
@@ -371,7 +374,7 @@
 						<!-- extract documentation for libdoc -->
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.1.1</version>
+						<version>3.2.0</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>
@@ -426,6 +429,13 @@
 				<downloadWebDriver>True</downloadWebDriver>
 			</properties>
 		</profile>
+		<profile>
+			<id>edgeheadless</id>
+			<properties>
+				<browser>edgeheadless</browser>
+				<downloadWebDriver>True</downloadWebDriver>
+			</properties>
+		</profile>
 		<profile>
 			<id>deploy</id>
 			<build>
@@ -460,7 +470,7 @@
 						<!-- Build the fat jar with all dependencies -->
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-assembly-plugin</artifactId>
-						<version>3.2.0</version>
+						<version>3.3.0</version>
 						<configuration>
 							<archive>
 								<manifest>
@@ -485,7 +495,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>build-helper-maven-plugin</artifactId>
-						<version>3.0.0</version>
+						<version>3.2.0</version>
 						<executions>
 							<execution>
 								<id>attach-artifacts</id>

src/main/java/com/github/markusbernhardt/seleniumlibrary/keywords/BrowserManagement.java

@@ -1,8 +1,8 @@
 package com.github.markusbernhardt.seleniumlibrary.keywords;
 
 import io.appium.java_client.ios.IOSDriver;
-import io.github.bonigarcia.wdm.DriverManagerType;
 import io.github.bonigarcia.wdm.WebDriverManager;
+import io.github.bonigarcia.wdm.config.DriverManagerType;
 import io.selendroid.client.SelendroidDriver;
 
 import java.io.File;
@@ -157,6 +157,7 @@ public void closeBrowser() {
             "| Google Chrome (headless)    | googlechromeheadless, chromeheadless, gcheadless |\r\n" + 
             "| Internet Explorer | internetexplorer, ie     |\r\n" + 
             "| Edge      | edge      |\r\n" + 
+            "| Edge (headless)     | edgeheadless      |\r\n" + 
             "| Safari    | safari    |\r\n" + 
             "| Android   | android   |\r\n" + 
             "| Iphone    | iphone    |\r\n" + 
@@ -632,6 +633,7 @@ protected WebDriver createLocalWebDriver(String browserName, Capabilities desire
             case "internetexplorer":
                 return new InternetExplorerDriver((InternetExplorerOptions)desiredCapabilities);
             case "edge":
+            case "edgeheadless":
                 return new EdgeDriver((EdgeOptions)desiredCapabilities);
             case "gc":
             case "chrome":
@@ -688,6 +690,7 @@ private void initWebDriver(String browserName) {
                 WebDriverManager.getInstance(DriverManagerType.IEXPLORER).setup();
                 break;
             case "edge":
+            case "edgeheadless":
                 WebDriverManager.getInstance(DriverManagerType.EDGE).setup();
                 break;
             case "gc":
@@ -731,6 +734,10 @@ protected Capabilities createCapabilities(String browserName, String desiredCapa
         case "edge":
             desiredCapabilities = new EdgeOptions();
             break;
+        case "edgeheadless":
+            desiredCapabilities = new EdgeOptions();
+            ((EdgeOptions)desiredCapabilities).setHeadless(true);
+            break;           
         case "gc":
         case "chrome":
         case "googlechrome":

src/test/robotframework/objects/Google.Site.txt

@@ -24,6 +24,7 @@ Go To
     ${Current.Location}=    Get Location
     Run Keyword If    '${Current.Location}'!='${Google.Site.Url}'    SeleniumLibrary.Go To    ${Google.Site.Url}
     Title Should Be    ${Google.Site.PageTitle}
+    Handle Cookie Consent    xpath:(//div[@role="none"])[last()]
 
 Close
     Close Browser

src/test/robotframework/settings/Settings.robot

@@ -13,4 +13,13 @@ ${Selenium.Timeout}        30.0
 
 *** Keywords ***
 Test
-    Op
+    Op
+
+Handle Cookie Consent
+    [Arguments]    ${consent click xpath}
+    Comment    Consent search causes stack overflow to jbrowser, so tagging tescases using this keyword
+    Set Tags    jbrowser
+    ${count}    Get Matching Xpath Count    ${consent click xpath}
+    IF    ${count} > 0
+    Click Element    ${consent click xpath}
+    END

src/test/robotframework/testsuites/UnitTests/AW3Schools.robot

@@ -8,12 +8,15 @@ ${URL Application}    http://www.w3schools.com
 
 *** Test Cases *** 
 Select
+    [Tags]    jbrowser
     Open Browser    https://developer.mozilla.org/en/docs/Web/HTML/Element/select#Examples    ${browser}    mainbrowser
-    Wait Until Page Contains Element    xpath://select
-    Select From List    xpath://select    Third Value
-    ${label}    Get Selected List Label    xpath://select
+    Wait Until Page Contains Element    frame_Basic_select
+    Select Frame    frame_Basic_select
+    Wait Until Page Contains Element    xpath://select[@name="choice"]
+    Select From List    xpath://select[@name="choice"]   Third Value
+    ${label}    Get Selected List Label    xpath://select[@name="choice"]
     Should Be Equal    ${label}    Third Value
-    List Selection Should Be    xpath://select    Third Value
+    List Selection Should Be    xpath://select[@name="choice"]    Third Value
 
 Multiple Browsers
     Open Browser    ${URL Application}    ${browser}    mainbrowser1

src/test/robotframework/testsuites/UnitTests/ExtJS.robot

@@ -2,6 +2,7 @@
 Suite Setup       Open Page
 Suite Teardown    Close Browser
 Resource          ../../settings/Settings.robot
+Default Tags      jbrowser
 
 *** Variables ***
 ${URL Application}     http://examples.sencha.com/extjs/6.5.0/examples/classic/ticket-app/index.html