diff options
| author | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2011-01-04 12:30:56 +0300 |
|---|---|---|
| committer | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2011-01-04 12:30:56 +0300 |
| commit | c4df19a09d37739a6e01ce97193c677d67885f03 (patch) | |
| tree | a025dddaeba75b6132f241154815ed0ef2f86270 | |
| parent | 4b207343df0450d54ee3fad2a16457b3938f18ba (diff) | |
| parent | 983b1a032737934426216fdab2788c618dae01ed (diff) | |
1.1 without the fatal error for some php versions
| -rw-r--r-- | core/Log.php | 2 | ||||
| -rw-r--r-- | tests/webtest/testcases/level0/1.1-install.xml (renamed from tests/webtest/testcases/level0/installation.xml) | 6 | ||||
| -rw-r--r-- | tests/webtest/testcases/level0/1.2-loginforms.xml (renamed from tests/webtest/testcases/level0/loginforms.xml) | 2 | ||||
| -rw-r--r-- | tests/webtest/testcases/level0/1.3-unit-tests.xml (renamed from tests/webtest/testcases/level0/unit-tests.xml) | 1 | ||||
| -rw-r--r-- | tests/webtest/testcases/level1/1.2-install.xml | 6 | ||||
| -rw-r--r-- | tests/webtest/testcases/level1/1.3-update.xml | 4 |
6 files changed, 12 insertions, 9 deletions
diff --git a/core/Log.php b/core/Log.php index 6b4dfa1c6b..8c42c97225 100644 --- a/core/Log.php +++ b/core/Log.php @@ -173,7 +173,7 @@ class Piwik_Log_Formatter_ScreenFormatter implements Zend_Log_Formatter_Interfac function formatEvent($event) { // no injection in error messages, backtrace when displayed on screen - return array_map('Piwik_Common::sanitizeInputValue', $event); + return array_map(array('Piwik_Common','sanitizeInputValue'), $event); } function format($string) diff --git a/tests/webtest/testcases/level0/installation.xml b/tests/webtest/testcases/level0/1.1-install.xml index e60df2caec..ffb560484c 100644 --- a/tests/webtest/testcases/level0/installation.xml +++ b/tests/webtest/testcases/level0/1.1-install.xml @@ -210,15 +210,15 @@ <verifyText description="check page text" text="Hello" /> <!-- change language --> - <retryClickLink description="click 'Deutsch'" href="index.php?module=LanguagesManager&action=saveLanguage&language=de" maxcount="5" seconds="1" /> + <retryClickLink description="click 'Deutsch'" href="index.php?module=LanguagesManager&action=saveLanguage&language=de" seconds="5" /> <verifyText description="check page text" text="Hallo" /> - <retryClickLink description="click 'Français'" href="index.php?module=LanguagesManager&action=saveLanguage&language=fr" maxcount="5" seconds="1" /> + <retryClickLink description="click 'Français'" href="index.php?module=LanguagesManager&action=saveLanguage&language=fr" seconds="5" /> <verifyText description="check page text" text="Bonjour" /> - <retryClickLink description="click 'English'" href="index.php?module=LanguagesManager&action=saveLanguage&language=en" maxcount="5" seconds="1" /> + <retryClickLink description="click 'English'" href="index.php?module=LanguagesManager&action=saveLanguage&language=en" seconds="5" /> <verifyText description="check page text" text="Hello" /> </steps> diff --git a/tests/webtest/testcases/level0/loginforms.xml b/tests/webtest/testcases/level0/1.2-loginforms.xml index e7ba38c163..197fa69082 100644 --- a/tests/webtest/testcases/level0/loginforms.xml +++ b/tests/webtest/testcases/level0/1.2-loginforms.xml @@ -149,7 +149,7 @@ <verifyText description="check page text" text="Hello" /> <verifyText description="check page text" text="Sign out" /> - <retryClickLink description="click 'Sign out'" label="Sign out" maxcount="5" seconds="1" /> + <retryClickLink description="click 'Sign out'" label="Sign out" seconds="5" /> <!-- logged out --> diff --git a/tests/webtest/testcases/level0/unit-tests.xml b/tests/webtest/testcases/level0/1.3-unit-tests.xml index 5ba2df2819..150d0319ec 100644 --- a/tests/webtest/testcases/level0/unit-tests.xml +++ b/tests/webtest/testcases/level0/1.3-unit-tests.xml @@ -14,6 +14,7 @@ &time; <target name="webtest"> <webtest name="unit tests"> + <config timeout="600" /> <steps> <echo>Unit Tests</echo> diff --git a/tests/webtest/testcases/level1/1.2-install.xml b/tests/webtest/testcases/level1/1.2-install.xml index 1d6a76ee94..19bcf2bd1d 100644 --- a/tests/webtest/testcases/level1/1.2-install.xml +++ b/tests/webtest/testcases/level1/1.2-install.xml @@ -210,15 +210,15 @@ <verifyText description="check page text" text="Hello" /> <!-- change language --> - <retryClickLink description="click 'Deutsch'" href="index.php?module=LanguagesManager&action=saveLanguage&language=de" maxcount="5" seconds="1" /> + <retryClickLink description="click 'Deutsch'" href="index.php?module=LanguagesManager&action=saveLanguage&language=de" seconds="5" /> <verifyText description="check page text" text="Hallo" /> - <retryClickLink description="click 'Français'" href="index.php?module=LanguagesManager&action=saveLanguage&language=fr" maxcount="5" seconds="1" /> + <retryClickLink description="click 'Français'" href="index.php?module=LanguagesManager&action=saveLanguage&language=fr" seconds="5" /> <verifyText description="check page text" text="Bonjour" /> - <retryClickLink description="click 'English'" href="index.php?module=LanguagesManager&action=saveLanguage&language=en" maxcount="5" seconds="1" /> + <retryClickLink description="click 'English'" href="index.php?module=LanguagesManager&action=saveLanguage&language=en" seconds="5" /> <verifyText description="check page text" text="Hello" /> </steps> diff --git a/tests/webtest/testcases/level1/1.3-update.xml b/tests/webtest/testcases/level1/1.3-update.xml index 83514f9f8a..af92f3a1cc 100644 --- a/tests/webtest/testcases/level1/1.3-update.xml +++ b/tests/webtest/testcases/level1/1.3-update.xml @@ -46,7 +46,8 @@ <mouseOver description="expand header message" htmlId="header_message" /> <verifyText description="check page text" text="Please update now!" /> - <retryClickLink description="click 'Please update now'" href="action=newVersionAvailable" maxcount="30" seconds="3" /> + <enableJavaScript enable="false" /> + <clickLink description="click 'Please update now'" href="action=newVersionAvailable" /> <!-- one click update --> @@ -87,6 +88,7 @@ </not> <verifyText description="check page text" text="Piwik has been successfully updated!" /> + <clickButton description="click 'Continue to Piwik' button" label="Continue to Piwik" /> </then> </ifStep> |