Fix browser version detection and failing tests

Aleksander Machniak

2013-11-18 3373e4ae1026b4ec729172074a7ec540410ebee4

Fix browser version detection and failing tests

 program/lib/Roundcube/rcube_browser.php

@@ -41,7 +41,7 @@
        $this->safari = !$this->chrome && (strpos($HTTP_USER_AGENT, 'safari') !== false || strpos($HTTP_USER_AGENT, 'applewebkit') !== false);
        $this->mz     = !$this->ie && !$this->safari && !$this->chrome && !$this->ns && strpos($HTTP_USER_AGENT, 'mozilla') !== false;

        if (preg_match('/(mozilla|chrome|msie|opera|safari|applewebkit|khtml)(\s*|\/)([0-9.]+)/', $HTTP_USER_AGENT, $regs)) {
        if (preg_match('/(chrome|msie|opera|version|khtml)(\s*|\/)([0-9.]+)/', $HTTP_USER_AGENT, $regs)) {
            $this->ver = (float) $regs[3];
        }
        else if (preg_match('/rv:([0-9.]+)/', $HTTP_USER_AGENT, $regs)) {

 tests/Framework/Browser.php

@@ -21,7 +21,7 @@
    /**
     * @dataProvider browsers
     */
    function test_browser($useragent, $opera, $chrome, $ie, $ns, $ns4, $khtml, $safari, $mz)
    function test_browser($useragent, $opera, $chrome, $ie, $ns, $safari, $mz)
    {

        $object = $this->getBrowser($useragent);
@@ -30,8 +30,6 @@
        $this->assertEquals($chrome, $object->chrome, 'Check for Chrome failed');
        $this->assertEquals($ie, $object->ie, 'Check for IE failed');
        $this->assertEquals($ns, $object->ns, 'Check for NS failed');
        $this->assertEquals($ns4, $object->ns4, 'Check for NS4 failed');
        $this->assertEquals($khtml, $object->khtml, 'Check for khtml failed');
        $this->assertEquals($safari, $object->safari, 'Check for Safari failed');
        $this->assertEquals($mz, $object->mz, 'Check for MZ failed');
    }
@@ -132,7 +130,7 @@

    function browsers()
    {
        return $this->extractDataSet(array('isOpera','isChrome','isIE','isNS','isNS4','isKHTML','isSafari','isMZ'));
        return $this->extractDataSet(array('isOpera','isChrome','isIE','isNS','isSafari','isMZ'));
    }

    function useragents()
@@ -149,8 +147,6 @@
                 'isChrome'     => false,                                                                                           //isChrome
                 'isIE'         => false,                                                                                           //isIE
                 'isNS'         => false,                                                                                           //isNS
                 'isNS4'        => false,                                                                                           //isNS4
                 'isKHTML'      => false,                                                                                           //isKHTML
                 'isSafari'     => false,                                                                                           //isSafari
                 'isMZ'         => true,                                                                                           //isMZ
                 'lang'         => 'en-US',                                                                               //lang
@@ -169,8 +165,6 @@
                 'isChrome'     => false,                                                                                           //isChrome
                 'isIE'         => false,                                                                                           //isIE
                 'isNS'         => false,                                                                                           //isNS
                 'isNS4'        => false,                                                                                           //isNS4
                 'isKHTML'      => false,                                                                                           //isKHTML
                 'isSafari'     => false,                                                                                           //isSafari
                 'isMZ'         => true,                                                                                           //isMZ
                 'lang'         => 'en-US',                                                                               //lang
@@ -181,7 +175,7 @@

            'Chrome Mac' => array(
                 'useragent'    => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_4; en-US) AppleWebKit/534.3 (KHTML, like Gecko) Chrome/6.0.461.0 Safari/534.3',
                 'version'      => '5',                                                                                      //Version
                 'version'      => '6',                                                                                      //Version
                 'isWin'        => false,                                                                                           //isWindows
                 'isLinux'      => false,
                 'isMac'        => true,                                                                                           //isMac
@@ -190,8 +184,6 @@
                 'isChrome'     => true,                                                                                           //isChrome
                 'isIE'         => false,                                                                                           //isIE
                 'isNS'         => false,                                                                                           //isNS
                 'isNS4'        => false,                                                                                           //isNS4
                 'isKHTML'      => true,                                                                                           //isKHTML
                 'isSafari'     => false,                                                                                           //isSafari
                 'isMZ'         => false,                                                                                           //isMZ
                 'lang'         => 'en-US',                                                                               //lang
@@ -211,8 +203,6 @@
                 'isChrome'     => false,                                                                                           //isChrome
                 'isIE'         => true,                                                                                           //isIE
                 'isNS'         => false,                                                                                           //isNS
                 'isNS4'        => false,                                                                                           //isNS4
                 'isKHTML'      => false,                                                                                           //isKHTML
                 'isSafari'     => false,                                                                                           //isSafari
                 'isMZ'         => false,                                                                                           //isMZ
                 'lang'         => '',                                                                                         //lang