diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2014-10-20 07:00:41 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2014-10-20 07:00:41 +0400 |
| commit | 2dd6a293949d4878fd785c161206a4731bc65cee (patch) | |
| tree | 32e8089db1edebce940b173bbc0efbe24670118f /tests | |
| parent | 9946f0eff353f9c5bf4712fffc3c982ca34bfba7 (diff) | |
| parent | 81e3628243cf20e3b44c03f3a715b7feed8e737f (diff) | |
Merge branch 'master' into introducingBower
Diffstat (limited to 'tests')
| m--------- | tests/PHPUnit/UI | 0 | ||||
| -rw-r--r-- | tests/PHPUnit/Unit/DeprecatedMethodsTest.php | 6 | ||||
| -rwxr-xr-x | tests/travis/initiate_ui_tests.sh | 2 | ||||
| -rw-r--r-- | tests/travis/php-fpm.ini | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI -Subproject 15cbdb081a9d75cd9e83c013215d321acca6ca4 +Subproject ee7bcb2fea45a7250053a84b0f89be1ecdd0c7b diff --git a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php index 8bd55c49f8..022de25ca4 100644 --- a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php +++ b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php @@ -17,17 +17,17 @@ class DeprecatedMethodsTest extends PHPUnit_Framework_TestCase public function test_version2_0_4() { - $validTill = '2014-10-20'; + $validTill = '2014-10-27'; $this->assertDeprecatedMethodIsRemoved('\Piwik\Period', 'factory', $validTill); - $validTill = '2014-10-20'; + $validTill = '2014-10-27'; $this->assertDeprecatedMethodIsRemoved('\Piwik\Config', 'getConfigSuperUserForBackwardCompatibility', $validTill); $this->assertDeprecatedMethodIsRemoved('\Piwik\Menu\MenuAdmin', 'addEntry', $validTill); $this->assertDeprecatedMethodIsRemoved('\Piwik\Menu\MenuAdmin', 'removeEntry', $validTill); $this->assertDeprecatedMethodIsRemoved('\Piwik\Menu\MenuTop', 'addEntry', $validTill); $this->assertDeprecatedMethodIsRemoved('\Piwik\Menu\MenuTop', 'removeEntry', $validTill); - $validTill = '2014-10-20'; + $validTill = '2014-10-27'; $this->assertDeprecatedMethodIsRemoved('\Piwik\SettingsPiwik', 'rewriteTmpPathWithHostname', $validTill); $validTill = '2015-02-06'; diff --git a/tests/travis/initiate_ui_tests.sh b/tests/travis/initiate_ui_tests.sh index c3efd8af09..f9c1559ce6 100755 --- a/tests/travis/initiate_ui_tests.sh +++ b/tests/travis/initiate_ui_tests.sh @@ -1,7 +1,7 @@ #!/bin/bash # initiate UI tests before starting system tests for php 5.5 -if [ "$TEST_SUITE" != "SystemTests" ] || [[ "$TRAVIS_PHP_VERSION" != 5\.4* ]]; then +if [ "$TEST_SUITE" != "SystemTests" ] || [[ "$TRAVIS_PHP_VERSION" != 5\.6* ]]; then echo "Not initiating UI tests (\$TEST_SUITE = $TEST_SUITE, \$TRAVIS_PHP_VERSION = $TRAVIS_PHP_VERSION)." exit fi diff --git a/tests/travis/php-fpm.ini b/tests/travis/php-fpm.ini index e592e6638f..b79aaa4b65 100644 --- a/tests/travis/php-fpm.ini +++ b/tests/travis/php-fpm.ini @@ -9,3 +9,4 @@ pm = static pm.max_children = 2 php_admin_value[memory_limit] = 128M +php_admin_value[always_populate_raw_post_data] = -1 |