diff options
| -rw-r--r-- | .drone.yml | 22 | ||||
| -rw-r--r-- | tests/acceptance/config/behat.yml | 24 | ||||
| -rwxr-xr-x | tests/acceptance/run.sh | 4 |
3 files changed, 37 insertions, 13 deletions
diff --git a/.drone.yml b/.drone.yml index be09d9b3888..d2059b766b5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1709,7 +1709,7 @@ steps: services: - name: selenium - image: selenium/standalone-firefox:2.53.1-beryllium + image: selenium/standalone-chrome:3.141.59 environment: # Reduce default log level for Selenium server (INFO) as it is too # verbose. @@ -1739,7 +1739,7 @@ trigger: # #services: #- name: selenium -# image: selenium/standalone-firefox:2.53.1-beryllium +# image: selenium/standalone-chrome:3.141.59 # environment: # # Reduce default log level for Selenium server (INFO) as it is too # # verbose. @@ -1769,7 +1769,7 @@ steps: services: - name: selenium - image: selenium/standalone-firefox:2.53.1-beryllium + image: selenium/standalone-chrome:3.141.59 environment: # Reduce default log level for Selenium server (INFO) as it is too # verbose. @@ -1799,7 +1799,7 @@ steps: services: - name: selenium - image: selenium/standalone-firefox:2.53.1-beryllium + image: selenium/standalone-chrome:3.141.59 environment: # Reduce default log level for Selenium server (INFO) as it is too # verbose. @@ -1829,7 +1829,7 @@ steps: services: - name: selenium - image: selenium/standalone-firefox:2.53.1-beryllium + image: selenium/standalone-chrome:3.141.59 environment: # Reduce default log level for Selenium server (INFO) as it is too # verbose. @@ -1859,7 +1859,7 @@ steps: services: - name: selenium - image: selenium/standalone-firefox:2.53.1-beryllium + image: selenium/standalone-chrome:3.141.59 environment: # Reduce default log level for Selenium server (INFO) as it is too # verbose. @@ -1889,7 +1889,7 @@ steps: services: - name: selenium - image: selenium/standalone-firefox:2.53.1-beryllium + image: selenium/standalone-chrome:3.141.59 environment: # Reduce default log level for Selenium server (INFO) as it is too # verbose. @@ -1919,7 +1919,7 @@ steps: services: - name: selenium - image: selenium/standalone-firefox:2.53.1-beryllium + image: selenium/standalone-chrome:3.141.59 environment: # Reduce default log level for Selenium server (INFO) as it is too # verbose. @@ -1949,7 +1949,7 @@ steps: services: - name: selenium - image: selenium/standalone-firefox:2.53.1-beryllium + image: selenium/standalone-chrome:3.141.59 environment: # Reduce default log level for Selenium server (INFO) as it is too # verbose. @@ -1979,7 +1979,7 @@ steps: services: - name: selenium - image: selenium/standalone-firefox:2.53.1-beryllium + image: selenium/standalone-chrome:3.141.59 environment: # Reduce default log level for Selenium server (INFO) as it is too # verbose. @@ -2009,7 +2009,7 @@ steps: services: - name: selenium - image: selenium/standalone-firefox:2.53.1-beryllium + image: selenium/standalone-chrome:3.141.59 environment: # Reduce default log level for Selenium server (INFO) as it is too # verbose. diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml index a43bcb504a6..eb5c7d61f8c 100644 --- a/tests/acceptance/config/behat.yml +++ b/tests/acceptance/config/behat.yml @@ -65,15 +65,39 @@ default: default: selenium2: wd_host: %selenium.server% + browser: "chrome" + capabilities: + extra_capabilities: + goog:chromeOptions: + args: ["disable-dev-shm-usage"] + w3c: false John: selenium2: wd_host: %selenium.server% + browser: "chrome" + capabilities: + extra_capabilities: + goog:chromeOptions: + args: ["disable-dev-shm-usage"] + w3c: false Jane: selenium2: wd_host: %selenium.server% + browser: "chrome" + capabilities: + extra_capabilities: + goog:chromeOptions: + args: ["disable-dev-shm-usage"] + w3c: false Jim: selenium2: wd_host: %selenium.server% + browser: "chrome" + capabilities: + extra_capabilities: + goog:chromeOptions: + args: ["disable-dev-shm-usage"] + w3c: false Rubeus: # Rubeus uses a browser that has CSS grid support. selenium2: diff --git a/tests/acceptance/run.sh b/tests/acceptance/run.sh index 48e39bcd119..9a77d717a0c 100755 --- a/tests/acceptance/run.sh +++ b/tests/acceptance/run.sh @@ -108,12 +108,12 @@ function prepareSelenium() { SELENIUM_CONTAINER=selenium-nextcloud-local-test-acceptance echo "Starting Selenium server" - docker run --detach --name=$SELENIUM_CONTAINER --publish 4444:4444 --publish 5900:5900 $DOCKER_OPTIONS selenium/standalone-firefox-debug:2.53.1-beryllium + docker run --detach --name=$SELENIUM_CONTAINER --publish 4444:4444 --publish 5900:5900 $DOCKER_OPTIONS selenium/standalone-chrome-debug:3.141.59 echo "Waiting for Selenium server to be ready" if ! $TIMEOUT 10s bash -c "while ! curl 127.0.0.1:4444 >/dev/null 2>&1; do sleep 1; done"; then echo "Could not start Selenium server; running" \ - "\"docker run --rm --publish 4444:4444 --publish 5900:5900 $DOCKER_OPTIONS selenium/standalone-firefox-debug:2.53.1-beryllium\"" \ + "\"docker run --rm --publish 4444:4444 --publish 5900:5900 $DOCKER_OPTIONS selenium/standalone-chrome-debug:3.141.59\"" \ "could give you a hint of the problem" exit 1 |