tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9511 from creative-commoners/pulls/4/nonce-unit-test-fix

Browse Source 
FIX Reset nonce style to prevent affecting other unit tests
This commit is contained in:
Robbie Averill 2020-05-12 21:46:39 -07:00 committed by GitHub
commit f3a6922d5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/php/Control/SimpleResourceURLGeneratorTest.php
View File

@ -73,6 +73,7 @@ class SimpleResourceURLGeneratorTest extends SapphireTest
{ {
/** @var SimpleResourceURLGenerator $generator */ /** @var SimpleResourceURLGenerator $generator */
$generator = Injector::inst()->get(ResourceURLGenerator::class); $generator = Injector::inst()->get(ResourceURLGenerator::class);
$generator->setNonceStyle('mtime');
$mtime = filemtime( $mtime = filemtime(
__DIR__ . '/SimpleResourceURLGeneratorTest/_fakewebroot/vendor/silverstripe/mymodule/client/style.css' __DIR__ . '/SimpleResourceURLGeneratorTest/_fakewebroot/vendor/silverstripe/mymodule/client/style.css'
); );
@ -86,6 +87,7 @@ class SimpleResourceURLGeneratorTest extends SapphireTest
{ {
/** @var SimpleResourceURLGenerator $generator */ /** @var SimpleResourceURLGenerator $generator */
$generator = Injector::inst()->get(ResourceURLGenerator::class); $generator = Injector::inst()->get(ResourceURLGenerator::class);
$generator->setNonceStyle('mtime');
$mtime = filemtime( $mtime = filemtime(
__DIR__ . '/SimpleResourceURLGeneratorTest/_fakewebroot/public/basemodule/css/style.css' __DIR__ . '/SimpleResourceURLGeneratorTest/_fakewebroot/public/basemodule/css/style.css'
); );
@ -109,6 +111,7 @@ class SimpleResourceURLGeneratorTest extends SapphireTest
{ {
/** @var SimpleResourceURLGenerator $generator */ /** @var SimpleResourceURLGenerator $generator */
$generator = Injector::inst()->get(ResourceURLGenerator::class); $generator = Injector::inst()->get(ResourceURLGenerator::class);
$generator->setNonceStyle('mtime');
$module = new Module( $module = new Module(
__DIR__ . '/SimpleResourceURLGeneratorTest/_fakewebroot/vendor/silverstripe/mymodule/', __DIR__ . '/SimpleResourceURLGeneratorTest/_fakewebroot/vendor/silverstripe/mymodule/',
__DIR__ . '/SimpleResourceURLGeneratorTest/_fakewebroot/' __DIR__ . '/SimpleResourceURLGeneratorTest/_fakewebroot/'

3
tests/php/View/RequirementsTest.php
View File

@ -642,6 +642,9 @@ class RequirementsTest extends SapphireTest
$backend = Injector::inst()->create(Requirements_Backend::class); $backend = Injector::inst()->create(Requirements_Backend::class);
$this->setupRequirements($backend); $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->javascript('javascript/RequirementsTest_a.js?test=1&test=2&test=3');
$backend->css('css/RequirementsTest_a.css?test=1&test=2&test=3'); $backend->css('css/RequirementsTest_a.css?test=1&test=2&test=3');
$html = $backend->includeInHTML(self::$html_template); $html = $backend->includeInHTML(self::$html_template);