Merging in jQuery.proxy() branch.

[jquery.git] / test / unit / core.js

diff --git a/test/unit/core.js b/test/unit/core.js
index eb00f23..d50997b 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -154,41 +154,27 @@ test("selector state", function() {
        );
 });
 
+if ( !isLocal ) {
 test("browser", function() {
-       expect(13);
-       var browsers = {
-               //Internet Explorer
-               "Mozilla/5.0 (Windows; U; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 2.0.50727)": "6.0",
-               "Mozilla/4.0 (compatible; MSIE 7.0b; Windows NT 5.1; .NET CLR 1.1.4322; InfoPath.1; .NET CLR 2.0.50727)": "7.0",
-               /** Failing #1876
-                * "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) ; .NET CLR 2.0.50727; .NET CLR 1.1.4322; .NET CLR 3.0.04506.30)": "7.0",
-                */
-               //Browsers with Gecko engine
-               //Mozilla
-               "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915" : "1.7.12",
-               //Firefox
-               "Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.3) Gecko/20070309 Firefox/2.0.0.3": "1.8.1.3",
-               //Netscape
-               "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20070321 Netscape/8.1.3" : "1.7.5",
-               //Flock
-               "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.11) Gecko/20070321 Firefox/1.5.0.11 Flock/0.7.12" : "1.8.0.11",
-               //Opera browser
-               "Opera/9.20 (X11; Linux x86_64; U; en)": "9.20",
-               "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; en) Opera 9.20" : "9.20",
-               "Mozilla/5.0 (Windows NT 5.1; U; pl; rv:1.8.0) Gecko/20060728 Firefox/1.5.0 Opera 9.20": "9.20",
-               //WebKit engine
-               "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; sv-se) AppleWebKit/418.9 (KHTML, like Gecko) Safari/419.3": "418.9",
-               "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/418.8 (KHTML, like Gecko) Safari/419.3" : "418.8",
-               "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; sv-se) AppleWebKit/312.8 (KHTML, like Gecko) Safari/312.5": "312.8",
-               //Other user agent string
-               "Other browser's user agent 1.0":null
-       };
-       for (var i in browsers) {
-               var v = i.toLowerCase().match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ); // RegEx from Core jQuery.browser.version check
-               var version = v ? v[1] : null;
-               equals( version, browsers[i], "Checking UA string" );
-       }
+       stop();
+
+       jQuery.get("data/ua.txt", function(data){
+               var uas = data.split("\n");
+               expect( (uas.length - 1) * 2 );
+
+               jQuery.each(uas, function(){
+                       var parts = this.split("\t");
+                       if ( parts[2] ) {
+                               var ua = jQuery.uaMatch( parts[2] );
+                               equals( ua.browser, parts[0], "Checking browser for " + parts[2] );
+                               equals( ua.version, parts[1], "Checking version string for " + parts[2] );
+                       }
+               });
+
+               start();
+       });
 });
+}
 
 test("noConflict", function() {
        expect(6);