diff --git a/.travis.yml b/.travis.yml index 56e9edc17..cf9b0d3ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: php sudo: false +dist: precise + addons: apt: packages: diff --git a/tests/php/Core/Manifest/ConfigManifestTest.php b/tests/php/Core/Manifest/ConfigManifestTest.php index 5d619d183..32b8483d0 100644 --- a/tests/php/Core/Manifest/ConfigManifestTest.php +++ b/tests/php/Core/Manifest/ConfigManifestTest.php @@ -210,9 +210,9 @@ class ConfigManifestTest extends SapphireTest 'Fragment is included if both Only rules succeed.' ); - $this->assertTrue( - isset($config['TwoExceptSucceed']), - 'Fragment is included if one of the Except rules matches.' + $this->assertFalse( + isset($config['OneExceptFail']), + 'Fragment is not included if one of the Except rules fails.' ); $this->assertFalse( diff --git a/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/multiplerules.yml b/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/multiplerules.yml index ae9a25bf1..1addb62d0 100644 --- a/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/multiplerules.yml +++ b/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/multiplerules.yml @@ -21,7 +21,7 @@ Except: --- SilverStripe\Core\Tests\Manifest\ConfigManifestTest: MultipleRules: - TwoExceptSucceed: "included - one of the excepts succeeds" + OneExceptFail: "excluded - one of the excepts fails" --- Except: ConstantDefined: MULTIPLERULES_DEFINEDCONSTANT