Merge pull request #169 from jdi-testing/revert-168-1563-bug-system-d…

…oesnt-recognize-that-the-element-is-invisible-2 Revert "1563 bug system doesnt recognize that the element is invisible 2"
jdi-testing · Nov 21, 2023 · dc9923e · dc9923e
2 parents 61d9670 + 9131a83
commit dc9923e
Show file tree

Hide file tree

Showing 9 changed files with 143 additions and 16 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,19 +8,6 @@ RUN apt-get update -y && \
 
 RUN apt install -y curl wget mc gcc make
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends gnupg wget curl unzip && \
-    wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
-    echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list && \
-    apt-get update -y && \
-    apt-get install -y --no-install-recommends google-chrome-stable && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/* && \
-    CHROME_VERSION=$(google-chrome --product-version) && \
-    wget -q --continue -P /chromedriver "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$CHROME_VERSION/linux64/chromedriver-linux64.zip" && \
-    unzip /chromedriver/chromedriver* -d /usr/local/bin/ && \
-    rm -rf /chromedriver \
-
 ENV APP_HOME=/jdi-qasp-ml
 WORKDIR ${APP_HOME}
 

diff --git a/app/selenium_app.py b/app/selenium_app.py
@@ -13,9 +13,18 @@ def get_element_id_to_is_displayed_mapping(page_content_str):
     chrome_options = Options()
     chrome_options.add_argument("--no-sandbox")
     chrome_options.add_argument("--headless")
-    chrome_options.add_argument('--disable-dev-shm-usage')
-    driver = webdriver.Chrome(
-        executable_path="/usr/local/bin/chromedriver-linux64/chromedriver", options=chrome_options)
+
+    capabilities = {
+        "browserName": "chrome",
+        "browserVersion": "118.0",
+        "selenoid:options": {
+            "enableVideo": False
+        }
+    }
+
+    driver = webdriver.Remote(
+        command_executor="http://jdi-qasp-ml-selenoid:4444/wd/hub",
+        desired_capabilities=capabilities, options=chrome_options)
 
     driver.execute_script("document.body.insertAdjacentHTML('beforeend', arguments[0]);", dom)
     wait = WebDriverWait(driver, 10)

diff --git a/browsers.json b/browsers.json
@@ -0,0 +1,17 @@
+{
+  "chrome": {
+    "default": "91.0",
+    "versions": {
+      "91.0": {
+        "image": "selenoid/vnc_chrome:91.0",
+        "port": "4444"
+      }, "114.0": {
+        "image": "selenoid/vnc_chrome:114.0",
+        "port": "4444"
+      }, "118.0": {
+        "image": "selenoid/vnc_chrome:118.0",
+        "port": "4444"
+      }
+    }
+  }
+}
diff --git a/docker-compose-rc.yaml b/docker-compose-rc.yaml
@@ -14,6 +14,25 @@ services:
     environment:
       ENV: LOCAL
 
+  chrome:
+    image: selenoid/vnc_chrome:118.0
+    logging:
+      driver: none
+
+  selenoid:
+    container_name: "jdi-qasp-ml-selenoid"
+    image: "aerokube/selenoid:latest"
+    ports:
+      - "4445:4444"
+    volumes:
+      - ".:/etc/selenoid"
+      - "./target:/output"
+      - "/var/run/docker.sock:/var/run/docker.sock"
+      - "./target:/opt/selenoid/video"
+    environment:
+      - "OVERRIDE_VIDEO_OUTPUT_DIR=$PWD/target"
+    command: [ "-conf", "/etc/selenoid/browsers.json", "-video-output-dir", "/opt/selenoid/video", "-container-network", "jdi-qasp-ml_default" ]
+
   celery:
     image: "ghcr.io/jdi-testing/jdi-qasp-ml:rc"
     container_name: jdi-qasp-ml-celery

diff --git a/docker-compose-stable.yaml b/docker-compose-stable.yaml
@@ -12,6 +12,25 @@ services:
       options:
         max-size: "256m"
 
+  chrome:
+    image: selenoid/vnc_chrome:118.0
+    logging:
+      driver: none
+
+  selenoid:
+    container_name: "jdi-qasp-ml-selenoid"
+    image: "aerokube/selenoid:latest"
+    ports:
+      - "4445:4444"
+    volumes:
+      - ".:/etc/selenoid"
+      - "./target:/output"
+      - "/var/run/docker.sock:/var/run/docker.sock"
+      - "./target:/opt/selenoid/video"
+    environment:
+      - "OVERRIDE_VIDEO_OUTPUT_DIR=$PWD/target"
+    command: [ "-conf", "/etc/selenoid/browsers.json", "-video-output-dir", "/opt/selenoid/video", "-container-network", "jdi-qasp-ml_default" ]
+
   celery:
     image: "ghcr.io/jdi-testing/jdi-qasp-ml:stable"
     container_name: jdi-qasp-ml-celery

diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml
@@ -16,6 +16,25 @@ services:
       options:
         max-size: "256m"
 
+  chrome:
+    image: selenoid/vnc_chrome:118.0
+    logging:
+      driver: none
+
+  selenoid:
+    container_name: "jdi-qasp-ml-selenoid"
+    image: "aerokube/selenoid:latest"
+    ports:
+      - "4445:4444"
+    volumes:
+      - ".:/etc/selenoid"
+      - "./target:/output"
+      - "/var/run/docker.sock:/var/run/docker.sock"
+      - "./target:/opt/selenoid/video"
+    environment:
+      - "OVERRIDE_VIDEO_OUTPUT_DIR=$PWD/target"
+    command: [ "-conf", "/etc/selenoid/browsers.json", "-video-output-dir", "/opt/selenoid/video", "-container-network", "jdi-qasp-ml_default"]
+
   celery:
     container_name: jdi-qasp-ml-celery
     command: celery -A app.celery_app:celery_app worker -l info

diff --git a/docker-compose.remote_server.yaml b/docker-compose.remote_server.yaml
@@ -18,6 +18,25 @@ services:
       options:
         max-size: "256m"
 
+  chrome:
+    image: selenoid/vnc_chrome:118.0
+    logging:
+      driver: none
+
+  selenoid:
+    container_name: "jdi-qasp-ml-selenoid"
+    image: "aerokube/selenoid:latest"
+    ports:
+      - "4445:4444"
+    volumes:
+      - ".:/etc/selenoid"
+      - "./target:/output"
+      - "/var/run/docker.sock:/var/run/docker.sock"
+      - "./target:/opt/selenoid/video"
+    environment:
+      - "OVERRIDE_VIDEO_OUTPUT_DIR=$PWD/target"
+    command: [ "-conf", "/etc/selenoid/browsers.json", "-video-output-dir", "/opt/selenoid/video", "-container-network", "jdi-qasp-ml_default" ]
+
   celery:
     container_name: jdi-qasp-ml-celery
     command: celery -A app.celery_app:celery_app worker -l info

diff --git a/docker-compose.remote_server_dev.yaml b/docker-compose.remote_server_dev.yaml
@@ -18,6 +18,25 @@ services:
       options:
         max-size: "256m"
 
+  chrome:
+    image: selenoid/vnc_chrome:118.0
+    logging:
+      driver: none
+
+  selenoid:
+    container_name: "jdi-qasp-ml-selenoid"
+    image: "aerokube/selenoid:latest"
+    ports:
+      - "4445:4444"
+    volumes:
+      - ".:/etc/selenoid"
+      - "./target:/output"
+      - "/var/run/docker.sock:/var/run/docker.sock"
+      - "./target:/opt/selenoid/video"
+    environment:
+      - "OVERRIDE_VIDEO_OUTPUT_DIR=$PWD/target"
+    command: [ "-conf", "/etc/selenoid/browsers.json", "-video-output-dir", "/opt/selenoid/video", "-container-network", "jdi-qasp-ml_default" ]
+
   celery-dev:
     container_name: jdi-qasp-ml-celery-dev
     command: celery -A app.celery_app:celery_app worker -l info

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -14,6 +14,25 @@ services:
     environment:
       ENV: LOCAL
 
+  chrome:
+    image: selenoid/vnc_chrome:118.0
+    logging:
+      driver: none
+
+  selenoid:
+    container_name: "jdi-qasp-ml-selenoid"
+    image: "aerokube/selenoid:latest"
+    ports:
+      - "4445:4444"
+    volumes:
+      - ".:/etc/selenoid"
+      - "./target:/output"
+      - "/var/run/docker.sock:/var/run/docker.sock"
+      - "./target:/opt/selenoid/video"
+    environment:
+      - "OVERRIDE_VIDEO_OUTPUT_DIR=$PWD/target"
+    command: [ "-conf", "/etc/selenoid/browsers.json", "-video-output-dir", "/opt/selenoid/video", "-container-network", "jdi-qasp-ml_default" ]
+
   celery:
     image: "ghcr.io/jdi-testing/jdi-qasp-ml:latest"
     container_name: jdi-qasp-ml-celery