Skip to content

Commit

Permalink
update selenium, add selenium-hub and prepare firefox
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonas Eberle committed Nov 26, 2019
1 parent 66a5889 commit 916701c
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 18 deletions.
16 changes: 0 additions & 16 deletions .ddev/docker-compose.chrome.yaml

This file was deleted.

56 changes: 56 additions & 0 deletions .ddev/docker-compose.selenium.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
version: '3.6'

services:
selenium-chrome:
container_name: ddev-${DDEV_SITENAME}-selenium-chrome
image: selenium/node-chrome:3.141.59-xenon
depends_on:
- selenium-hub
labels:
com.ddev.site-name: ${DDEV_SITENAME}
com.ddev.platform: ddev
com.ddev.app-type: typo3
com.ddev.approot: $DDEV_APPROOT
environment:
- HUB_HOST=selenium-hub
- HUB_PORT=4444
links:
- selenium-hub:selenium-hub
external_links:
- ddev-router:$DDEV_HOSTNAME
volumes:
- /dev/shm:/dev/shm

# selenium-firefox:
# container_name: ddev-${DDEV_SITENAME}-selenium-firefox
# image: selenium/node-firefox:3.141.59-xenon
# depends_on:
# - selenium-hub
# labels:
# com.ddev.site-name: ${DDEV_SITENAME}
# com.ddev.platform: ddev
# com.ddev.app-type: typo3
# com.ddev.approot: $DDEV_APPROOT
# environment:
# - HUB_HOST=selenium-hub
# - HUB_PORT=4444
# links:
# - selenium-hub:selenium-hub
# external_links:
# - ddev-router:$DDEV_HOSTNAME
# volumes:
# - /dev/shm:/dev/shm

selenium-hub:
container_name: ddev-${DDEV_SITENAME}-selenium-hub
image: selenium/hub:3.141.59-xenon
labels:
com.ddev.site-name: ${DDEV_SITENAME}
com.ddev.platform: ddev
com.ddev.app-type: typo3
com.ddev.approot: $DDEV_APPROOT
environment:
- VIRTUAL_HOST=$DDEV_HOSTNAME
- HTTP_EXPOSE=4444
external_links:
- ddev-router:$DDEV_HOSTNAME
13 changes: 12 additions & 1 deletion Build/AcceptanceTests.codeception.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,21 @@ suites:
- WebDriver:
url: http://extension-cookieman-master.test
browser: chrome
host: ddev-extension-cookieman-master-chrome
host: selenium-hub
port: 4444
wait: 1
window_size: 1280x960
restart: true

env:
chrome:

firefox:
modules:
config:
WebDriver:
browser: firefox

extensions:
enabled:
- Codeception\Extension\RunFailed:
Expand Down
8 changes: 7 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,13 @@
"@cookieman:test:acceptance"
],
"cookieman:test:acceptance": [
"codecept run acceptance -d -c Build/AcceptanceTests.codeception.yml"
"@cookieman:test:acceptance:chrome"
],
"cookieman:test:acceptance:chrome": [
"codecept run acceptance --env chrome -d -c Build/AcceptanceTests.codeception.yml"
],
"cookieman:test:acceptance:firefox": [
"codecept run acceptance --env firefox -d -c Build/AcceptanceTests.codeception.yml"
],
"cookieman:test:cgl": [
"php-cs-fixer --config=.php_cs.dist fix -v --using-cache=no --dry-run",
Expand Down

0 comments on commit 916701c

Please sign in to comment.