Skip to content

Commit

Permalink
Merge pull request #9 from ernestomv/Chrome-options-to-W3C
Browse files Browse the repository at this point in the history
Chrome options to w3c and upgrade to serenity-bdd 4.0.14
  • Loading branch information
wakaleo authored Oct 24, 2023
2 parents 684f912 + d9a6f60 commit fbb0ab5
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 31 deletions.
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "net.serenity-bdd.serenity-gradle-plugin" version "3.5.1"
id "net.serenity-bdd.serenity-gradle-plugin" version "4.0.14"
id 'java'
id 'eclipse'
id 'idea'
Expand All @@ -15,10 +15,10 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8

ext {
slf4jVersion = '1.7.7'
serenityCoreVersion = '3.5.1'
junitVersion = '5.8.2'
assertJVersion = '3.22.0'
slf4jVersion = '1.7.30'
serenityCoreVersion = '4.0.14'
junitVersion = '5.10.0'
assertJVersion = '3.24.2'
logbackVersion = '1.2.10'
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
18 changes: 14 additions & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,10 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
Expand Down Expand Up @@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -205,6 +209,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
15 changes: 9 additions & 6 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand Down Expand Up @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal
Expand Down
19 changes: 12 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@
<name>Sample Serenity BDD project using JUnit 5 and Serenity Screenplay</name>

<properties>
<serenity.version>3.5.1</serenity.version>
<junit5.version>5.8.2</junit5.version>
<serenity.version>4.0.14</serenity.version>
<junit5.version>5.10.0</junit5.version>
<maven.surefire.version>3.1.2</maven.surefire.version>
<maven.failsafe.version>3.1.2</maven.failsafe.version>
<maven.compiler.version>3.11.0</maven.compiler.version>
<assertj.version>3.24.2</assertj.version>
<logback.version>1.2.10</logback.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<encoding>UTF-8</encoding>
<tags></tags>
Expand Down Expand Up @@ -52,7 +57,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.10</version>
<version>${logback.version}</version>
</dependency>
<!-- JUNIT 5 DEPENDENCY-->
<dependency>
Expand All @@ -70,7 +75,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.22.0</version>
<version>${assertj.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -79,14 +84,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<version>${maven.surefire.version}</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M5</version>
<version>${maven.failsafe.version}</version>
<configuration>
<includes>
<include>**/*Test.java</include>
Expand Down Expand Up @@ -114,7 +119,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<version>${maven.compiler.version}</version>
<configuration>
<source>16</source>
<target>16</target>
Expand Down
20 changes: 12 additions & 8 deletions src/test/resources/serenity.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@
webdriver {
driver = chrome
autodownload = true

capabilities{

"goog:chromeOptions" {
args = [
"start-maximized", "test-type", "no-sandbox", "ignore-certificate-errors",
"disable-popup-blocking", "disable-default-apps", "disable-extensions-file-access-check"
"incognito", "disable-infobars", "disable-gpu", "remote-allow-origins=*"
]
}
}

}
headless.mode = true

Expand All @@ -14,11 +26,3 @@ serenity {
compress.filenames = false
// take.screenshots = FOR_FAILURES
}

#
# Chrome options can be defined using the chrome.switches property
#
chrome.switches = """--start-maximized;--test-type;--no-sandbox;--ignore-certificate-errors;
--disable-popup-blocking;--disable-default-apps;--disable-extensions-file-access-check;
--incognito;--disable-infobars,--disable-gpu;--remote-allow-origins=*"""

0 comments on commit fbb0ab5

Please sign in to comment.