Skip to content

Commit 97970cc

Browse files
committed
test: run integration tests with Python instead of Jython
1 parent c2ae57f commit 97970cc

5 files changed

Lines changed: 28 additions & 67 deletions

File tree

.github/workflows/integration-tests-h2.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,21 @@ jobs:
5858
distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions
5959
java-version: ${{ matrix.java-version }} # https://github.com/actions/setup-java#supported-version-syntax
6060

61+
- name: Install Chrome
62+
uses: browser-actions/setup-chrome@v2.1.1 # https://github.com/browser-actions/setup-chrome
63+
with:
64+
chrome-version: '145.0.7632.117' # Must match version in mise.toml
65+
install-dependencies: false # Default: false
66+
install-chromedriver: false # Default: false
67+
68+
- name: Install Robot Framework
69+
run: pip install -r requirements.txt
70+
71+
- name: Show tools versions
72+
run: |
73+
robot --version
74+
chrome --version
75+
6176
- name: Restore existing cache
6277
uses: actions/cache@v5.0.2 # https://github.com/actions/cache
6378
with:

.mvn/jvm.config

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
-Dorg.slf4j.simpleLogger.log.com.gargoylesoftware.htmlunit.DefaultCssErrorHandler=error
2-
-Dorg.slf4j.simpleLogger.log.com.gargoylesoftware.htmlunit.html.DefaultElementFactory=warn
3-
-Dorg.slf4j.simpleLogger.log.com.gargoylesoftware.htmlunit.IncorrectnessListenerImpl=error
41
-Dorg.slf4j.simpleLogger.showLogName=false

mise.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
java = "adoptopenjdk-8.0.442"
33
maven = "3.9.12"
44

5+
# for integration tests
6+
python = "3.6.15"
7+
# must match version in .github/workflows/integration-tests-h2.yml
8+
chromedriver = "145.0.7632.117"
9+
510
#
611
# Project tasks
712
#

pom.xml

Lines changed: 4 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -369,45 +369,6 @@
369369
<scope>test</scope>
370370
</dependency>
371371

372-
<!-- Required for src/test/robotframework/account/registration/logic.robot -->
373-
<dependency>
374-
<groupId>com.github.hi-fi</groupId>
375-
<artifactId>robotframework-httprequestlibrary</artifactId>
376-
<version>0.0.15</version>
377-
<scope>test</scope>
378-
<exclusions>
379-
<exclusion>
380-
<groupId>commons-logging</groupId>
381-
<artifactId>commons-logging</artifactId>
382-
</exclusion>
383-
</exclusions>
384-
</dependency>
385-
386-
<dependency>
387-
<groupId>com.github.hi-fi</groupId>
388-
<artifactId>robotframework-seleniumlibrary</artifactId>
389-
<version>3.141.59.26535</version>
390-
<scope>test</scope>
391-
<exclusions>
392-
<exclusion>
393-
<groupId>io.appium</groupId>
394-
<artifactId>java-client</artifactId>
395-
</exclusion>
396-
<exclusion>
397-
<groupId>io.github.bonigarcia</groupId>
398-
<artifactId>webdrivermanager</artifactId>
399-
</exclusion>
400-
<exclusion>
401-
<groupId>io.selendroid</groupId>
402-
<artifactId>selendroid-client</artifactId>
403-
</exclusion>
404-
<exclusion>
405-
<groupId>com.machinepublishers</groupId>
406-
<artifactId>jbrowserdriver</artifactId>
407-
</exclusion>
408-
</exclusions>
409-
</dependency>
410-
411372
<dependency>
412373
<groupId>com.teketik</groupId>
413374
<artifactId>spring-test-context-cache-limiter</artifactId>
@@ -451,27 +412,6 @@
451412
<scope>test</scope>
452413
</dependency>
453414

454-
<dependency>
455-
<groupId>org.seleniumhq.selenium</groupId>
456-
<artifactId>htmlunit-driver</artifactId>
457-
<version>${selenium-htmlunit.version}</version>
458-
<scope>test</scope>
459-
</dependency>
460-
461-
<dependency>
462-
<groupId>org.seleniumhq.selenium</groupId>
463-
<artifactId>selenium-api</artifactId>
464-
<version>${selenium.version}</version>
465-
<scope>test</scope>
466-
</dependency>
467-
468-
<dependency>
469-
<groupId>org.seleniumhq.selenium</groupId>
470-
<artifactId>selenium-support</artifactId>
471-
<version>${selenium.version}</version>
472-
<scope>test</scope>
473-
</dependency>
474-
475415
<dependency>
476416
<groupId>org.spockframework</groupId>
477417
<artifactId>spock-core</artifactId>
@@ -562,7 +502,6 @@
562502
<h2.version>2.2.224</h2.version>
563503
<hibernate-validator.version>6.2.5.Final</hibernate-validator.version>
564504
<hikaricp.version>4.0.3</hikaricp.version>
565-
<htmlunit.version>2.70.0</htmlunit.version>
566505
<jakarta-mail.version>1.6.7</jakarta-mail.version>
567506
<jakarta-validation.version>2.0.2</jakarta-validation.version>
568507
<junit-jupiter.version>5.3.2</junit-jupiter.version>
@@ -577,8 +516,6 @@
577516
<maven-war-plugin.version>3.5.1</maven-war-plugin.version>
578517
<mysql.version>5.1.49</mysql.version>
579518
<postgresql.version>9.4.1212.jre7</postgresql.version>
580-
<selenium-htmlunit.version>2.70.0</selenium-htmlunit.version>
581-
<selenium.version>3.141.59</selenium.version>
582519
<servlet-api.version>4.0.1</servlet-api.version>
583520
<slf4j.version>1.7.36</slf4j.version>
584521
<!-- LATER: remove overriding once version from Spring Boot will match the used one -->
@@ -898,7 +835,7 @@
898835
<logLevel>DEBUG</logLevel>
899836
-->
900837
<variables>
901-
<variable>BROWSER:htmlunitwithjs</variable>
838+
<variable>BROWSER:headlesschrome</variable>
902839
<variable>MAIN_RESOURCE_DIR:${basedir}/src/main/resources/test</variable>
903840
<variable>TEST_RESOURCE_DIR:${basedir}/src/test/resources</variable>
904841
<variable>MOCK_SERVER:http://127.0.0.1:8888</variable>
@@ -913,6 +850,9 @@
913850
-->
914851
<nonCriticalTag>htmx</nonCriticalTag>
915852
</nonCriticalTags>
853+
<externalRunner>
854+
<runWithPython>true</runWithPython>
855+
</externalRunner>
916856
</configuration>
917857
<dependencies>
918858
<dependency>

requirements.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Integration tests dependencies
2+
robotframework==3.2.2
3+
robotframework-seleniumlibrary==5.1.3
4+
robotframework-requests==0.8.2

0 commit comments

Comments
 (0)