From b1b61f866eb1ae0d9ef86255458277d6ba2cfd57 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 13 May 2020 16:07:31 +1200 Subject: [PATCH] FIX Set nonce style on unit tests --- tests/php/Control/SimpleResourceURLGeneratorTest.php | 3 +++ tests/php/View/RequirementsTest.php | 3 +++ 2 files changed, 6 insertions(+) diff --git a/tests/php/Control/SimpleResourceURLGeneratorTest.php b/tests/php/Control/SimpleResourceURLGeneratorTest.php index d1f5bd22b..bfe1a768f 100644 --- a/tests/php/Control/SimpleResourceURLGeneratorTest.php +++ b/tests/php/Control/SimpleResourceURLGeneratorTest.php @@ -73,6 +73,7 @@ class SimpleResourceURLGeneratorTest extends SapphireTest { /** @var SimpleResourceURLGenerator $generator */ $generator = Injector::inst()->get(ResourceURLGenerator::class); + $generator->setNonceStyle('mtime'); $mtime = filemtime( __DIR__ . '/SimpleResourceURLGeneratorTest/_fakewebroot/vendor/silverstripe/mymodule/client/style.css' ); @@ -86,6 +87,7 @@ class SimpleResourceURLGeneratorTest extends SapphireTest { /** @var SimpleResourceURLGenerator $generator */ $generator = Injector::inst()->get(ResourceURLGenerator::class); + $generator->setNonceStyle('mtime'); $mtime = filemtime( __DIR__ . '/SimpleResourceURLGeneratorTest/_fakewebroot/public/basemodule/css/style.css' ); @@ -109,6 +111,7 @@ class SimpleResourceURLGeneratorTest extends SapphireTest { /** @var SimpleResourceURLGenerator $generator */ $generator = Injector::inst()->get(ResourceURLGenerator::class); + $generator->setNonceStyle('mtime'); $module = new Module( __DIR__ . '/SimpleResourceURLGeneratorTest/_fakewebroot/vendor/silverstripe/mymodule/', __DIR__ . '/SimpleResourceURLGeneratorTest/_fakewebroot/' diff --git a/tests/php/View/RequirementsTest.php b/tests/php/View/RequirementsTest.php index a0d64c444..668f2cb7e 100644 --- a/tests/php/View/RequirementsTest.php +++ b/tests/php/View/RequirementsTest.php @@ -642,6 +642,9 @@ class RequirementsTest extends SapphireTest $backend = Injector::inst()->create(Requirements_Backend::class); $this->setupRequirements($backend); + $generator = Injector::inst()->get(ResourceURLGenerator::class); + $generator->setNonceStyle('mtime'); + $backend->javascript('javascript/RequirementsTest_a.js?test=1&test=2&test=3'); $backend->css('css/RequirementsTest_a.css?test=1&test=2&test=3'); $html = $backend->includeInHTML(self::$html_template);