Use right port

SonarSource · Dec 4, 2024 · 3979bc0 · 3979bc0
1 parent 052639f
commit 3979bc0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -236,16 +236,21 @@ qa_task:
     source cirrus-env QA
     source .cirrus/use-gradle-wrapper.sh
     echo "Prepare env and start IDE ${IDEA_VERSION}"
+    echo "Prepare env and start IDE ${IDEA_VERSION}"
     source set_gradle_build_version
+    #echo "Prepare env and start IDE ${IDEA_VERSION}"
+    #echo gradle --version
     mvn org.apache.maven.plugins:maven-dependency-plugin:3.1.1:unpack -B -Dartifact=org.sonarsource.sonarlint.intellij:sonarlint-intellij:${PROJECT_VERSION}:zip "-DoutputDirectory=${CIRRUS_WORKING_DIR}/staged-plugin"
+    # echo ${CIRRUS_WORKING_DIR}
+    # echo ls ${CIRRUS_WORKING_DIR}/staged-plugin
     mkdir -p its/build/idea-sandbox/config-uiTest/
     gradle :its:runIdeForUiTests --stacktrace -i -PijVersion=${IDEA_VERSION} -PslPluginDirectory=${CIRRUS_WORKING_DIR}/staged-plugin > ${CIRRUS_WORKING_DIR}/runIdeGradle.log &
   wait_ide_script: |
     echo "Wait for IDE to start"
-    sleep 600s
+    sleep 500s
     curl --connect-timeout 1 --insecure -s -o /dev/null http://127.0.0.1:8082
     # TODO write windows version of wait-for-endpoint.sh
-    # .cirrus/wait-for-endpoint.sh http://127.0.0.1:8083 -t 500
+    # .cirrus/wait-for-endpoint.sh http://127.0.0.1:8082 -t 10
   run_its_script: |
     echo "Run ITs on ${IDEA_VERSION}"
     source .cirrus/use-gradle-wrapper.sh

diff --git a/its/src/test/kotlin/org/sonarlint/intellij/its/fixtures/WelcomeFrame.kt b/its/src/test/kotlin/org/sonarlint/intellij/its/fixtures/WelcomeFrame.kt
@@ -41,7 +41,7 @@ class WelcomeFrame(remoteRobot: RemoteRobot, remoteComponent: RemoteComponent) :
     fun openProjectButton(): ComponentFixture {
         selectTab("Projects")
         // This can match two things: If no previous projects, its a SVG icon, else a jbutton
-        return findAll<ComponentFixture>(byXpath("//div[contains(@accessiblename, 'Open') and (@class='MainButton' or @class='JButton')]")).first()
+        return findAll<ComponentFixture>(byXpath("//div[@defaulticon='open.svg']")).first()
     }
 
     fun openPreferences() = step("Opening preferences dialog") {

diff --git a/its/src/test/kotlin/org/sonarlint/intellij/its/utils/OpeningUtils.kt b/its/src/test/kotlin/org/sonarlint/intellij/its/utils/OpeningUtils.kt
@@ -83,7 +83,7 @@ class OpeningUtils {
             with(remoteRobot) {
                 welcomeFrame {
                     // Force the click on the left: https://github.com/JetBrains/intellij-ui-test-robot/issues/19
-                    openProjectButton().click(Point(10, 10))
+                    openProjectButton().click()
                 }
                 if (remoteRobot.isRider()) {
                     openSolutionBrowserDialog {