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 #7198 from open-sausages/pulls/4.0/fix-config-rules

Browse Source 
BUG fix config rules to match updated `Except`
This commit is contained in:
Daniel Hensby 2017-07-21 15:23:33 +01:00 committed by GitHub
commit 43620129c0
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -2,6 +2,8 @@ language: php
sudo: false sudo: false
dist: precise
addons: addons:
apt: apt:
packages: packages:

6
tests/php/Core/Manifest/ConfigManifestTest.php
View File

@ -210,9 +210,9 @@ class ConfigManifestTest extends SapphireTest
'Fragment is included if both Only rules succeed.' 'Fragment is included if both Only rules succeed.'
); );
$this->assertTrue( $this->assertFalse(
isset($config['TwoExceptSucceed']), isset($config['OneExceptFail']),
'Fragment is included if one of the Except rules matches.' 'Fragment is not included if one of the Except rules fails.'
); );
$this->assertFalse( $this->assertFalse(

2
tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/multiplerules.yml
View File

@ -21,7 +21,7 @@ Except:
--- ---
SilverStripe\Core\Tests\Manifest\ConfigManifestTest: SilverStripe\Core\Tests\Manifest\ConfigManifestTest:
MultipleRules: MultipleRules:
TwoExceptSucceed: "included - one of the excepts succeeds" OneExceptFail: "excluded - one of the excepts fails"
--- ---
Except: Except:
ConstantDefined: MULTIPLERULES_DEFINEDCONSTANT ConstantDefined: MULTIPLERULES_DEFINEDCONSTANT