Skip to content
Snippets Groups Projects
Commit 2268a56b authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !86
parents 81369050 3b7f56d2
No related branches found
No related tags found
1 merge request!86Merging develop into main
Pipeline #1162910 passed
......@@ -234,6 +234,9 @@ class Handler extends BaseHandler {
'invoiceninja' => [
'enable' => 0,
],
'tests' => [
'behat' => TRUE,
],
];
}
......
......@@ -477,7 +477,7 @@ services:
- /etc/localtime:/etc/localtime:ro
- {{ projectroot }}/files/debug:/mnt/files
{% endif %}
{% if selenium.enable and not drupal.live|default(0) %}
{% if tests.behat or (selenium.enable and not drupal.live|default(0)) %}
hub:
image: '{{ docker_image_prefix }}elgalu/selenium'
......@@ -490,10 +490,12 @@ services:
SELENIUM_HUB_HOST: 'hub'
SELENIUM_HUB_PORT: '4444'
GRID: 'true'
CHROME: 'false'
CHROME: '{% if tests.behat %}true{% else %}false{% endif %}'
FIREFOX: 'false'
depends_on:
- php
{% endif %}
{% if selenium.enable and not drupal.live|default(0) %}
chrome:
image: '{{ docker_image_prefix }}elgalu/selenium'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment