Changes in version 1.7.5

------------------------ * kotlin 2.0.20 * selenium java 4.25.0 * selenium docker 4.25.0-20241024
hibissscus · Oct 31, 2024 · 7bbfb49 · 7bbfb49
1 parent 9277975
commit 7bbfb49
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 23 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,10 @@
+Changes in version 1.7.5
+------------------------
+* kotlin 2.0.20
+* selenium java 4.25.0
+* selenium docker 4.25.0-20241024
+
+
 Changes in version 1.7.4
 ------------------------
 * reportng 1.5.6

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,15 +1,15 @@
 plugins {
     java
-    kotlin("jvm") version "1.9.23"
+    kotlin("jvm") version "2.0.20"
     id("maven-publish")
     id("java-library")
     id("org.jetbrains.dokka") version "1.9.20"
-    id("com.avast.gradle.docker-compose") version ("0.17.6")
+    id("com.avast.gradle.docker-compose") version ("0.17.8")
 }
 
 
 group = "it.testee"
-version = "1.7.4"
+version = "1.7.5"
 
 
 repositories {
@@ -23,7 +23,7 @@ dependencies {
     // kotlin
     implementation("org.jetbrains.kotlin:kotlin-stdlib")
     // selenium
-    implementation("org.seleniumhq.selenium:selenium-java:4.19.1")
+    implementation("org.seleniumhq.selenium:selenium-java:4.25.0")
     // testng
     implementation("org.testng", "testng", "7.5")
     // reportng

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,15 +6,15 @@ version: "3.9"
 services:
   selenium-hub:
     container_name: selenium-hub
-    image: selenium/hub:4.19.1-20240402
+    image: selenium/hub:4.25.0-20241024
     ports:
       - "4444:4444"
       - "4443:4443"
       - "4442:4442"
     environment:
       - TZ=Europe/Berlin
   chrome:
-    image: selenium/node-chrome:4.19.1-20240402
+    image: selenium/node-chrome:4.25.0-20241024
     deploy:
       replicas: 3
     shm_size: 512m

diff --git a/src/main/kotlin/testee/it/e2e/core/browser/WebDriverFactory.kt b/src/main/kotlin/testee/it/e2e/core/browser/WebDriverFactory.kt
@@ -187,6 +187,7 @@ object WebDriverFactory {
         opt.addArguments("--disable-notifications")
         opt.addArguments("--window-size=1280,800")
         opt.addArguments("--lang=de")
+        opt.addArguments("--disable-search-engine-choice-screen")
 
 
         val prefs = HashMap<String, Any>()

diff --git a/src/main/kotlin/testee/it/e2e/example/BasePage.kt b/src/main/kotlin/testee/it/e2e/example/BasePage.kt
@@ -53,7 +53,7 @@ abstract class BasePage(driver: WebDriver) : AbstractPage(driver) {
         /**
          * View specific [Page] and check the [title] on the [Page]
          */
-        fun <P : BasePage, T : BasePage> P.view(page: T): T {
+        fun <T : BasePage> view(page: T): T {
             (page).loaded().opened()
             return page
         }

diff --git a/src/main/kotlin/testee/it/e2e/example/matryoshka/MatryoshkaPage.kt b/src/main/kotlin/testee/it/e2e/example/matryoshka/MatryoshkaPage.kt
@@ -14,7 +14,10 @@ class MatryoshkaPage(driver: WebDriver) : BasePage(driver) {
     @FindBy(css = ".accept")
     private lateinit var acceptCookieAgreement: WebElement
 
-    @FindBy(id = "home-open-url")
+    @FindBy(id = "splash-file-menu")
+    private lateinit var menu: WebElement
+
+    @FindBy(id = "splash-file-url")
     private lateinit var createNewFromUrl: WebElement
 
     @FindBy(id = "image-url")
@@ -98,6 +101,8 @@ class MatryoshkaPage(driver: WebDriver) : BasePage(driver) {
     }
 
     fun openNewImageFromUrl(imageUrlStr: String): MatryoshkaPage = apply {
+        clickIfVisible(menu)
+        visible(createNewFromUrl)
         click(createNewFromUrl)
         sendText(imageUrl, imageUrlStr)
         click(dialogApply)

diff --git a/src/main/kotlin/testee/it/e2e/example/piano/PianoPage.kt b/src/main/kotlin/testee/it/e2e/example/piano/PianoPage.kt
@@ -4,6 +4,7 @@ import org.openqa.selenium.By
 import org.openqa.selenium.JavascriptExecutor
 import org.openqa.selenium.WebDriver
 import org.openqa.selenium.WebElement
+import org.openqa.selenium.interactions.Actions
 import org.openqa.selenium.support.FindBy
 import org.openqa.selenium.support.ui.ExpectedConditions
 import testee.it.e2e.example.BasePage
@@ -56,17 +57,23 @@ class PianoPage(driver: WebDriver) : BasePage(driver) {
     }
 
     fun mentorPlay(pause: Long = 180): PianoPage = apply {
-        setHighlight()
-        waitForSeconds(5)
-        click(start)
+//        setHighlight()
+//        waitForSeconds(5)
+//        click(start)
         println("Start")
         do {
-            driver().findElements(By.cssSelector(".key-white.key-next, .key-black.key-next"))
+            val start = driver().findElement(By.id("song-pattern")).findElements(By.tagName("span"))
+                .first().text
+            Actions(driver).sendKeys("start").perform()
+            driver().findElement(By.id("song-pattern")).findElements(By.tagName("span"))
+                .filter { !it.text.equals(".") }
+                .drop(0)
                 .forEach {
-                    println(it.getAttribute("id") + ",")
+                    println(it.text + ",")
                     click(it)
+                    Thread.sleep(pause)
                 }
-            Thread.sleep(pause)
+
             println("|")
         } while (
             tick().until(ExpectedConditions.numberOfElementsToBeMoreThan(By.cssSelector(".key-white.key-next, .key-black.key-next"), 0)).size > 0

diff --git a/src/test/kotlin/testee/it/tests/example/piano/PianoTest.kt b/src/test/kotlin/testee/it/tests/example/piano/PianoTest.kt
@@ -27,6 +27,7 @@ class PianoTest : TestBase(url = "https://virtualpiano.net", browser = Browser.C
         PianoPage(driver)
             .open("$url/?song-post-" + Note.FLY.id)
             .loaded()
+            .hideCookies()
             .mentorPlay()
             .waitForSeconds(10)
     }

diff --git a/src/test/kotlin/testee/it/tests/example/slack/SlackTest.kt b/src/test/kotlin/testee/it/tests/example/slack/SlackTest.kt
@@ -4,18 +4,14 @@ import org.testng.SkipException
 import org.testng.annotations.Test
 import testee.it.e2e.core.browser.Browser
 import testee.it.e2e.core.test.TestBase
-import testee.it.e2e.example.BasePage.Companion.loaded
 import testee.it.e2e.example.BasePage.Companion.newTab
 import testee.it.e2e.example.BasePage.Companion.switchTab
 import testee.it.e2e.example.BasePage.Companion.view
 import testee.it.e2e.example.BasePage.Companion.waitForSeconds
 import testee.it.e2e.example.slack.model.Channels
 import testee.it.e2e.example.slack.model.Slack
 import testee.it.e2e.example.slack.model.Tokens
-import testee.it.e2e.example.slack.model.User
-import testee.it.e2e.example.slack.model.Workspace
 import testee.it.e2e.example.slack.pages.SlackApiPage
-import testee.it.e2e.example.slack.pages.SlackWebLoginPage
 import testee.it.e2e.example.slack.pages.SlackWebPage
 import kotlin.random.Random
 
@@ -28,11 +24,7 @@ class SlackTest : TestBase(url = Slack.WEB.slack, browser = Browser.CHROME) {
 
     @Test
     fun `01 login into slack web`() {
-        SlackWebLoginPage(driver)
-            .opened()
-            .acceptAllCookies()
-            .login(Workspace.WORKSPACE, User.TEST)
-            .view(SlackWebPage(driver))
+        view(SlackWebPage(driver))
     }
 
     @Test