Merge remote-tracking branch 'origin/develop' into feature/remove_mootols

This commit is contained in:
Ezequiel Bergamaschi 2014-07-13 02:39:19 -03:00
commit 3a83430771
2 changed files with 4 additions and 0 deletions

View File

@ -47,6 +47,7 @@ public class SupportedUserAgent implements Serializable {
boolean result = browser == Browser.FIREFOX && majorVersion >= 10;
result = result || browser == Browser.FIREFOX2 && majorVersion >= 17;
result = result || browser == Browser.FIREFOX3 && majorVersion >= 29;
result = result || browser == Browser.IE8 || browser == Browser.IE9 || browser == Browser.IE11 ;
result = result || browser == Browser.IE && majorVersion >= 8;
result = result || browser == Browser.OPERA10 && majorVersion >= 11;

View File

@ -54,6 +54,9 @@ public class UserAgentTest {
final SupportedUserAgent firefox20 = SupportedUserAgent.create("Mozilla/5.0 (Windows NT 6.1; WOW64; rv:20.0) Gecko/20121215 Firefox/20.0 AppEngine-Google; (+http://code.google.com/appengine; appid: slubuntuk)");
Assert.assertEquals(firefox20.isBrowserSupported(), true);
final SupportedUserAgent firefox30 = SupportedUserAgent.create("Mozilla/5.0 (Windows NT 5.1; rv:31.0) Gecko/20100101 Firefox/31.0");
Assert.assertEquals(firefox30.isBrowserSupported(), true);
}