diff --git a/Jenkinsfile b/Jenkinsfile index f5ac8f6ee..8cc41f4ff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,6 +15,7 @@ elifePipeline { stage 'Project tests', { sh "IMAGE_TAG=${commit} docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d" + dockerComposeProjectTestsParallel('journal', commit, [ 'phpunit': '/srv/journal/build/ci/phpunit/*.xml', 'behat': '/srv/journal/build/ci/behat/*.xml' @@ -28,6 +29,7 @@ elifePipeline { './smoke_tests.sh localhost 8080', ] ]) + } stage 'Generate critical CSS', { diff --git a/app/Resources/views/page.html.twig b/app/Resources/views/page.html.twig index 042bf6c92..a94eba9a5 100644 --- a/app/Resources/views/page.html.twig +++ b/app/Resources/views/page.html.twig @@ -209,13 +209,6 @@ {% endblock %} {% block content %} - {% if gtm_id %} - - {% endif %} -
- + + + diff --git a/composer.json b/composer.json index 74fba3be9..c18cfe7fd 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "elife/api-client": "^1.0@dev", "elife/api-sdk": "dev-master", "elife/civi-contacts": "dev-master", - "elife/patterns": "dev-master", + "elife/patterns": "dev-cookiebot-auto-blocking", "fabpot/goutte": "^3.2", "fig/link-util": "^1.0", "firebase/php-jwt": "^5.0", diff --git a/composer.lock b/composer.lock index 45f0b7902..91088db10 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "cc6b3eb8581ce24b68d16d11a9db35f5", + "content-hash": "5719592e5bf2eab8e53e883a841738fa", "packages": [ { "name": "beberlei/assert", @@ -1334,16 +1334,16 @@ }, { "name": "elife/patterns", - "version": "dev-master", + "version": "dev-cookiebot-auto-blocking", "source": { "type": "git", "url": "https://github.com/elifesciences/patterns-php.git", - "reference": "85d707ea5e408b388e4453ac6fb484db81f7999d" + "reference": "21522946269018f2ecd5cb5cccfd8b6da1a18818" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/85d707ea5e408b388e4453ac6fb484db81f7999d", - "reference": "85d707ea5e408b388e4453ac6fb484db81f7999d", + "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/21522946269018f2ecd5cb5cccfd8b6da1a18818", + "reference": "21522946269018f2ecd5cb5cccfd8b6da1a18818", "shasum": "" }, "require": { @@ -1366,7 +1366,6 @@ "suggest": { "twig/twig": "^2.0, to use PatternExtension" }, - "default-branch": true, "type": "library", "autoload": { "files": [ @@ -1382,9 +1381,9 @@ ], "description": "eLife patterns", "support": { - "source": "https://github.com/elifesciences/patterns-php/tree/master" + "source": "https://github.com/elifesciences/patterns-php/tree/cookiebot-auto-blocking" }, - "time": "2024-03-25T12:04:32+00:00" + "time": "2024-03-27T03:21:24+00:00" }, { "name": "fabpot/goutte", @@ -6346,5 +6345,5 @@ "platform-overrides": { "php": "7.1.33" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } diff --git a/test/Controller/HomeControllerTest.php b/test/Controller/HomeControllerTest.php index 9320fbcf1..a9c425530 100644 --- a/test/Controller/HomeControllerTest.php +++ b/test/Controller/HomeControllerTest.php @@ -512,7 +512,7 @@ public function it_configures_javascript_libraries_through_a_script_element() $this->assertSame(200, $client->getResponse()->getStatusCode()); $scriptTag = $crawler->filter('script')->last()->text(); - $this->assertContains('window.elifeConfig.domain = \'localhost\';', $scriptTag); + $this->assertContains('window.Elife.initialiseUnsafeComponentList', $scriptTag); } /**