Merge remote-tracking branch 'origin/master' into 1.2

This commit is contained in:
Robbie Averill 2017-05-12 14:29:35 +12:00
commit 937eb88242

View File

@ -1,5 +1,6 @@
<?php
class VersionFeedFunctionalTest extends FunctionalTest {
protected $usesDatabase = true;
protected $requiredExtensions = array(
'Page' => array('VersionFeed'),
@ -17,6 +18,10 @@ class VersionFeedFunctionalTest extends FunctionalTest {
$this->userIP = isset($_SERVER['HTTP_CLIENT_IP']) ? $_SERVER['HTTP_CLIENT_IP'] : null;
Config::nest();
// Enable history by default
Config::inst()->update('VersionFeed', 'changes_enabled', true);
Config::inst()->update('VersionFeed', 'allchanges_enabled', true);
// Disable caching and locking by default
Config::inst()->update('VersionFeed\Filters\CachedContentFilter', 'cache_enabled', false);
Config::inst()->update('VersionFeed\Filters\RateLimitFilter', 'lock_timeout', 0);