sproutcore 1.7.1.beta → 1.8.0

data/lib/frameworks/sproutcore/frameworks/bootstrap/system/loader.js

@@ -8,34 +8,35 @@
 // sc_require("system/browser");
 
 SC.setupBodyClassNames = function() {
-  var el = document.body ;
+  var el = document.body,
+      browser, platform, shadows, borderRad, classNames, style, ieVersion;
   if (!el) return ;
-  var browser, platform, shadows, borderRad, classNames, style;
+
   browser = SC.browser.current ;
   platform = SC.browser.windows ? 'windows' : SC.browser.mac ? 'mac' : 'other-platform' ;
   style = document.documentElement.style;
-  shadows = (style.MozBoxShadow !== undefined) || 
+  shadows = (style.MozBoxShadow !== undefined) ||
                 (style.webkitBoxShadow !== undefined) ||
                 (style.oBoxShadow !== undefined) ||
                 (style.boxShadow !== undefined);
-  
-  borderRad = (style.MozBorderRadius !== undefined) || 
+
+  borderRad = (style.MozBorderRadius !== undefined) ||
               (style.webkitBorderRadius !== undefined) ||
               (style.oBorderRadius !== undefined) ||
               (style.borderRadius !== undefined);
-  
+
   classNames = el.className ? el.className.split(' ') : [] ;
   if(shadows) classNames.push('box-shadow');
   if(borderRad) classNames.push('border-rad');
-  classNames.push(browser) ;
-  if (browser === 'chrome') classNames.push('safari');
-  classNames.push(platform) ;
-  
-  var ieVersion = parseInt(SC.browser.msie,10);
-  if (ieVersion) {
+  classNames.push(browser, platform) ;
+
+  // This isn't a perfectly correct way to compare versions, but should be okay
+  // in practical usage.
+  ieVersion = parseInt(SC.browser.version, 10);
+  if (SC.browser.isIE) {
     if (ieVersion === 7) {
       classNames.push('ie7');
-    } 
+    }
     else if (ieVersion === 8) {
       classNames.push('ie8');
     }
@@ -43,8 +44,12 @@ SC.setupBodyClassNames = function() {
       classNames.push('ie9');
     }
   }
-  
+
+  if(browser==="safari" || browser==="chrome") classNames.push('webkit');
   if (SC.browser.mobileSafari) classNames.push('mobile-safari') ;
   if ('createTouch' in document) classNames.push('touch');
   el.className = classNames.join(' ') ;
 } ;
+
+
+

data/lib/frameworks/sproutcore/frameworks/bootstrap/tests/system/browser.js

@@ -5,183 +5,505 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-var cleanBrowser = {
-  version: 0,
-  windows: 0,
-  mac: 0,
-  iOS: 0,
-  iPhone: 0,
-  iPod: 0,
-  iPad: 0,
-  android: 0,
-  opera: 0,
-  msie: 0,
-  mozilla: 0,
-  webkit: 0,
-  chrome: 0,
-  mobileSafari: 0,
-  iPadSafari: 0,
-  iPodSafari: 0,
-  iPhoneSafari: 0,
-  safari: 0
-};
 
-// quick and dirty function to combine passed browser props
-// with cleanBrowser
-function combine(hash) {
-  var ret = {},
-      key;
-  
-  for (key in cleanBrowser) {
-    if (!cleanBrowser.hasOwnProperty(key)) continue;
-    ret[key] = cleanBrowser[key];
-  }
-  
-  for (key in hash) {
-    if (!hash.hasOwnProperty(key)) continue;
-    ret[key] = hash[key];
-  }
-  
-  return ret;
-}
+var userAgents = {
 
-function testUserAgent(userAgent, matchers) {
-  var browser = SC._detectBrowser(userAgent), key;
-  matchers = combine(matchers);
-  for (key in matchers) equals(browser[key], matchers[key], "'" + key + "' should be '" + matchers[key] + "'");
-}
+// CHROME
 
-test("Chrome Mac 9.0.572.1 with Webkit v534.12", function() {
-  var userAgent = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_5; en-US) AppleWebKit/534.12 (KHTML, like Gecko) Chrome/9.0.572.1 Safari/534.12";
-  testUserAgent(userAgent, { version: '9.0.572.1', chrome: '9.0.572.1', webkit: '534.12', current: 'chrome', mac: true });
-});
+  "Mozilla/5.0 (compatible; Konqueror/4.4; Linux) KHTML/4.4.1 (like Gecko) Fedora/4.4.1-1.fc12": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.unknown,
+    version: '0',
+    os: SC.OS.linux,
+    osVersion: '0',
+    engine: SC.BROWSER.unknown,
+    engineVersion: '0'
+  },
+  "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_5; en-US) AppleWebKit/534.12 (KHTML, like Gecko) Chrome/9.0.572.1 Safari/534.12": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.chrome,
+    version: '9.0.572.1',
+    os: SC.OS.mac,
+    osVersion: '10.6.5',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '534.12'
+  },
+  "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/535.7 (KHTML, like Gecko) Chrome/16.0.912.63 Safari/535.7": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.chrome,
+    version: '16.0.912.63',
+    os: SC.OS.mac,
+    osVersion: '10.7.2',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '535.7'
+  },
+  "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/535.7 (KHTML, like Gecko) Chrome/16.0.912.36 Safari/535.7": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.chrome,
+    version: '16.0.912.36',
+    os: SC.OS.windows,
+    osVersion: '6.1',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '535.7'
+  },
 
-test("Safari Windows with Webkit v533.18.1", function() {
-  var userAgent = "Mozilla/5.0 (Windows; U; Windows NT 6.1; zh-HK) AppleWebKit/533.18.1 (KHTML, like Gecko) Version/5.0.2 Safari/533.18.5";
-  testUserAgent(userAgent, { version: '533.18.1', safari: '533.18.1', webkit: '533.18.1', current: 'safari', windows: true });
-});
+// OPERA
 
-test("Safari Mac with Webkit v533.19.4", function() {
-  var userAgent = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; en-us) AppleWebKit/533.19.4 (KHTML, like Gecko) Version/5.0.3 Safari/533.19.4";
-  testUserAgent(userAgent, { version: '533.19.4', safari: '533.19.4', webkit: '533.19.4', current: 'safari', mac: true });
-});
+  "Opera/9.00 (X11; Linux i686; U; pl)": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.opera,
+    version: '9.00',
+    os: SC.OS.linux,
+    osVersion: '0',
+    engine: SC.ENGINE.opera,
+    engineVersion: '9.00'
+  },
+  "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) Opera 8.65 [en]": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.opera,
+    version: '8.65',
+    os: SC.OS.windows,
+    osVersion: '5.1',
+    engine: SC.ENGINE.opera,
+    engineVersion: '8.65'
+  },
+  "Opera/9.80 (Windows NT 6.1; U; en) Presto/2.6.30 Version/10.62": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.opera,
+    version: '10.62',
+    os: SC.OS.windows,
+    osVersion: '6.1',
+    engine: SC.ENGINE.presto,
+    engineVersion: '2.6.30'
+  },
+  "Opera/9.80 (Windows NT 5.1; U; en) Presto/2.9.168 Version/11.51": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.opera,
+    version: '11.51',
+    os: SC.OS.windows,
+    osVersion: '5.1',
+    engine: SC.ENGINE.presto,
+    engineVersion: '2.9.168'
+  },
+  "Opera/9.80 (Windows NT 6.1; U; es-ES) Presto/2.9.181 Version/12.00": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.opera,
+    version: '12.00',
+    os: SC.OS.windows,
+    osVersion: '6.1',
+    engine: SC.ENGINE.presto,
+    engineVersion: '2.9.181'
+  },
+  "Opera/9.80 (Macintosh; Intel Mac OS X; U; en) Presto/2.6.30 Version/10.62": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.opera,
+    version: '10.62',
+    os: SC.OS.mac,
+    osVersion: '0',
+    engine: SC.ENGINE.presto,
+    engineVersion: '2.6.30'
+  },
+  "Opera/9.80 (Macintosh; Intel Mac OS X 10.6.8; U; fr) Presto/2.9.168 Version/11.52": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.opera,
+    version: '11.52',
+    os: SC.OS.mac,
+    osVersion: '10.6.8',
+    engine: SC.ENGINE.presto,
+    engineVersion: '2.9.168'
+  },
 
-test("Safari Windows with Webkit v533.19.4", function() {
-  var userAgent = "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-us) AppleWebKit/533.19.4 (KHTML, like Gecko) Version/5.0.3 Safari/533.19.4";
-  testUserAgent(userAgent, { version: '533.19.4', safari: '533.19.4', webkit: '533.19.4', current: 'safari', windows: true });
-});
+// INTERNET EXPLORER
 
-test("Opera Linux 9.0", function() {
-  var userAgent = "Opera/9.00 (X11; Linux i686; U; pl)";
-  testUserAgent(userAgent, { version: '9.00', opera: '9.00', current: 'opera' });
-});
+  "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.ie,
+    version: '7.0',
+    os: SC.OS.windows,
+    osVersion: '6.0',
+    engine: SC.ENGINE.trident,
+    engineVersion: '7.0'
+  },
+  "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0)": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.ie,
+    version: '8.0',
+    os: SC.OS.windows,
+    osVersion: '6.0',
+    engine: SC.ENGINE.trident,
+    engineVersion: '4.0'
+  },
+  "Mozilla/5.0 (Windows; U; MSIE 9.0; Windows NT 9.0; en-US))": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.ie,
+    version: '9.0',
+    os: SC.OS.windows,
+    osVersion: '9.0',
+    engine: SC.ENGINE.trident,
+    engineVersion: '9.0'
+  },
+  "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.ie,
+    version: '10.0',
+    os: SC.OS.windows,
+    osVersion: '6.1',
+    engine: SC.ENGINE.trident,
+    engineVersion: '6.0'
+  },
+  "Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.ie,
+    version: '10.6',
+    os: SC.OS.windows,
+    osVersion: '6.1',
+    engine: SC.ENGINE.trident,
+    engineVersion: '5.0'
+  },
+  "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Win64; x64; Trident/6.0)": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.ie,
+    version: '10.0',
+    os: SC.OS.windows,
+    osVersion: '6.2',
+    engine: SC.ENGINE.trident,
+    engineVersion: '6.0'
+  },
 
-test("Opera Windows 8.65", function() {
-  var userAgent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) Opera 8.65 [en]";
-  testUserAgent(userAgent, { version: '8.65', opera: '8.65', current: 'opera', windows: true });
-});
+// MOZILLA
 
-test("Opera Mac 10.62", function() {
-  var userAgent = "Opera/9.80 (Macintosh; Intel Mac OS X; U; en) Presto/2.6.30 Version/10.62";
-  testUserAgent(userAgent, { version: '9.80', opera: '9.80', current: 'opera', mac: true });
-});
+  "Mozilla/5.0 (Windows; U; Windows NT 6.1; it; rv:2.0b4) Gecko/20100818": {
+    device: SC.DEVICE.desktop,
+    name: SC.ENGINE.gecko,
+    version: '0',
+    os: SC.OS.windows,
+    osVersion: '6.1',
+    engine: SC.ENGINE.gecko,
+    engineVersion: '2.0b4'
+  },
 
-test("Opera Windows 10.62", function() {
-  var userAgent = "Opera/9.80 (Windows NT 6.1; U; en) Presto/2.6.30 Version/10.62";
-  testUserAgent(userAgent, { version: '9.80', opera: '9.80', current: 'opera', windows: true });
-});
+// FIREFOX
 
-test("Internet Explorer 7.0", function() {
-  var userAgent = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)";
-  testUserAgent(userAgent, { version: '7.0', msie: '7.0', current: 'msie', windows: true });
-});
+  "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.1.13) Gecko/20100914 Firefox/3.5.13": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.firefox,
+    version: '3.5.13',
+    os: SC.OS.mac,
+    osVersion: '10.6',
+    engine: SC.ENGINE.gecko,
+    engineVersion: '1.9.1.13'
+  },
+  "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.10) Gecko/20100914 Firefox/3.6.10": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.firefox,
+    version: '3.6.10',
+    os: SC.OS.mac,
+    osVersion: '10.6',
+    engine: SC.ENGINE.gecko,
+    engineVersion: '1.9.2.10'
+  },
+  "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:9.0) Gecko/20100101 Firefox/9.0": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.firefox,
+    version: '9.0',
+    os: SC.OS.mac,
+    osVersion: '10.6',
+    engine: SC.ENGINE.gecko,
+    engineVersion: '9.0'
+  },
+  "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.13) Gecko/20100914 Firefox/3.5.13": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.firefox,
+    version: '3.5.13',
+    os: SC.OS.windows,
+    osVersion: '6.1',
+    engine: SC.ENGINE.gecko,
+    engineVersion: '1.9.1.13'
+  },
+  "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.10) Gecko/20100914 Firefox/3.6.10": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.firefox,
+    version: '3.6.10',
+    os: SC.OS.windows,
+    osVersion: '6.1',
+    engine: SC.ENGINE.gecko,
+    engineVersion: '1.9.2.10'
+  },
+  "Mozilla/5.0 (Windows NT 6.1; rv:2.0b7pre) Gecko/20100921 Firefox/4.0b7pre": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.firefox,
+    version: '4.0b7pre',
+    os: SC.OS.windows,
+    osVersion: '6.1',
+    engine: SC.ENGINE.gecko,
+    engineVersion: '2.0b7pre'
+  },
+  "Mozilla/5.0 (Windows NT 6.1; rv:6.0) Gecko/20110814 Firefox/6.0": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.firefox,
+    version: '6.0',
+    os: SC.OS.windows,
+    osVersion: '6.1',
+    engine: SC.ENGINE.gecko,
+    engineVersion: '6.0'
+  },
 
-test("Internet Explorer 8.0", function() {
-  var userAgent = "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0)";
-  testUserAgent(userAgent, { version: '8.0', msie: '8.0', current: 'msie', windows: true });
-});
+// SAFARI
 
-test("Internet Explorer 9.0", function() {
-  var userAgent = "Mozilla/5.0 (Windows; U; MSIE 9.0; Windows NT 9.0; en-US))";
-  testUserAgent(userAgent, { version: '9.0', msie: '9.0', current: 'msie', windows: true });
-});
+  "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; sv-se) AppleWebKit/419 (KHTML, like Gecko) Safari/419.3": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.safari,
+    version: '0',
+    os: SC.OS.mac,
+    osVersion: '0',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '419'
+  },
+  "Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_5_8; ja-jp) AppleWebKit/530.19.2 (KHTML, like Gecko) Version/3.2.3 Safari/525.28.3": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.safari,
+    version: '3.2.3',
+    os: SC.OS.mac,
+    osVersion: '10.5.8',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '530.19.2'
+  },
+  "Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_4_11; nl-nl) AppleWebKit/533.16 (KHTML, like Gecko) Version/4.1 Safari/533.16": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.safari,
+    version: '4.1',
+    os: SC.OS.mac,
+    osVersion: '10.4.11',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '533.16'
+  },
+  "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; en-us) AppleWebKit/533.19.4 (KHTML, like Gecko) Version/5.0.3 Safari/533.19.4": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.safari,
+    version: '5.0.3',
+    os: SC.OS.mac,
+    osVersion: '10.6.6',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '533.19.4'
+  },
+  "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.safari,
+    version: '5.0.5',
+    os: SC.OS.mac,
+    osVersion: '10.6.8',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '533.21.1'
+  },
+  "Mozilla/5.0 (Windows; U; Windows NT 5.0; en-en) AppleWebKit/533.16 (KHTML, like Gecko) Version/4.1 Safari/533.16": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.safari,
+    version: '4.1',
+    os: SC.OS.windows,
+    osVersion: '5.0',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '533.16'
+  },
+  "Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US) AppleWebKit/533.17.8 (KHTML, like Gecko) Version/5.0.1 Safari/533.17.8": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.safari,
+    version: '5.0.1',
+    os: SC.OS.windows,
+    osVersion: '5.2',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '533.17.8'
+  },
+  "Mozilla/5.0 (Windows; U; Windows NT 6.1; zh-HK) AppleWebKit/533.18.1 (KHTML, like Gecko) Version/5.0.2 Safari/533.18.5": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.safari,
+    version: '5.0.2',
+    os: SC.OS.windows,
+    osVersion: '6.1',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '533.18.1'
+  },
+  "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-us) AppleWebKit/533.19.4 (KHTML, like Gecko) Version/5.0.3 Safari/533.19.4": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.safari,
+    version: '5.0.3',
+    os: SC.OS.windows,
+    osVersion: '6.0',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '533.19.4'
+  },
+  "Mozilla/5.0 (Windows; U; Windows NT 6.1; tr-TR) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.safari,
+    version: '5.0.4',
+    os: SC.OS.windows,
+    osVersion: '6.1',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '533.20.25'
+  },
 
-test("Mozilla Windows 2.0b4", function() {
-  var userAgent;
-  userAgent = "Mozilla/5.0 (Windows; U; Windows NT 6.1; it; rv:2.0b4) Gecko/20100818";
-  testUserAgent(userAgent, { version: '2.0b4', mozilla: '2.0b4', current: 'mozilla', windows: true });
-});
+// BLACKBERRY
 
-test("Firefox Mac 3.5.13", function() {
-  var userAgent = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.1.13) Gecko/20100914 Firefox/3.5.13";
-  testUserAgent(userAgent, { version: '1.9.1.13', mozilla: '1.9.1.13', current: 'mozilla', mac: true });
-});
+  "Mozilla/5.0 (BlackBerry; U; BlackBerry 9850; en-US) AppleWebKit/534.11+ (KHTML, like Gecko) Version/7.0.0.115 Mobile Safari/534.11+": {
+    device: SC.DEVICE.blackberry,
+    name: SC.BROWSER.blackberry,
+    version: '7.0.0.115',
+    os: SC.OS.blackberry,
+    osVersion: '0',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '534.11+'
+  },
 
-test("Firefox Windows 3.5.13", function() {
-  var userAgent = "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.13) Gecko/20100914 Firefox/3.5.13";
-  testUserAgent(userAgent, { version: '1.9.1.13', mozilla: '1.9.1.13', current: 'mozilla', windows: true });
-});
+// MOBILE SAFARI
 
-test("Firefox Mac 3.6.10", function() {
-  var userAgent = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.10) Gecko/20100914 Firefox/3.6.10";
-  testUserAgent(userAgent, { version: '1.9.2.10', mozilla: '1.9.2.10', current: 'mozilla', mac: true });
-});
+  "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7": {
+    device: SC.DEVICE.iphone,
+    name: SC.BROWSER.safari,
+    version: '4.0.5',
+    os: SC.OS.ios,
+    osVersion: '4.0',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '532.9'
+  },
+  "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7": {
+    device: SC.DEVICE.iphone,
+    name: SC.BROWSER.safari,
+    version: '4.0.5',
+    os: SC.OS.ios,
+    osVersion: '4.1',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '532.9'
+  },
+  "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Mobile/8B117": {
+    device: SC.DEVICE.iphone,
+    name: SC.BROWSER.safari,
+    version: '0',
+    os: SC.OS.ios,
+    osVersion: '4.1',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '532.9'
+  },
+  "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_2_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Mobile/8C14": {
+    device: SC.DEVICE.iphone,
+    name: SC.BROWSER.safari,
+    version: '0',
+    os: SC.OS.ios,
+    osVersion: '4.2.1',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '533.17.9'
+  },
+  "Mozilla/5.0 (iPhone; CPU iPhone OS 5_0_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A405 Safari/7534.48.3": {
+    device: SC.DEVICE.iphone,
+    name: SC.BROWSER.safari,
+    version: '5.1',
+    os: SC.OS.ios,
+    osVersion: '5.0.1',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '534.46'
+  },
+  "Mozilla/5.0 (iPad; U; CPU OS 3_2_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B500 Safari/531.21.10": {
+    device: SC.DEVICE.ipad,
+    name: SC.BROWSER.safari,
+    version: '4.0.4',
+    os: SC.OS.ios,
+    osVersion: '3.2.2',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '531.21.10'
+  },
+  "Mozilla/5.0(iPad; U; CPU OS 4_3 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8F191 Safari/6533.18.5": {
+    device: SC.DEVICE.ipad,
+    name: SC.BROWSER.safari,
+    version: '5.0.2',
+    os: SC.OS.ios,
+    osVersion: '4.3',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '533.17.9'
+  },
 
-test("Firefox Windows 3.6.10", function() {
-  var userAgent = "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.10) Gecko/20100914 Firefox/3.6.10";
-  testUserAgent(userAgent, { version: '1.9.2.10', mozilla: '1.9.2.10', current: 'mozilla', windows: true });
-});
+// Android
 
-test("Firefox Windows 4.0b7pre", function() {
-  var userAgent = "Mozilla/5.0 (Windows NT 6.1; rv:2.0b7pre) Gecko/20100921 Firefox/4.0b7pre";
-  testUserAgent(userAgent, { version: '2.0b7pre', mozilla: '2.0b7pre', current: 'mozilla', windows: true });
-});
+  "Mozilla/5.0 (Linux; U; Android 2.1-update1; en-us; SCH-I500 Build/ECLAIR) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17": {
+    device: SC.DEVICE.android,
+    name: SC.BROWSER.android,
+    version: '4.0',
+    os: SC.OS.android,
+    osVersion: '2.1-update1',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '530.17'
+  },
+  "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; T-Mobile myTouch 3G Slide Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1": {
+    device: SC.DEVICE.android,
+    name: SC.BROWSER.android,
+    version: '4.0',
+    os: SC.OS.android,
+    osVersion: '2.3.4',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '533.1'
+  },
+  "Mozilla/5.0 (Linux; U; Android 2.3.4; fr-fr; HTC Desire Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1": {
+    device: SC.DEVICE.android,
+    name: SC.BROWSER.android,
+    version: '4.0',
+    os: SC.OS.android,
+    osVersion: '2.3.4',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '533.1'
+  },
+  "Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1": {
+    device: SC.DEVICE.android,
+    name: SC.BROWSER.android,
+    version: '4.0',
+    os: SC.OS.android,
+    osVersion: '2.3.5',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '533.1'
+  },
 
-test("Mobile Safari - iOS 3.2.2 iPad", function() {
-  var userAgent = "Mozilla/5.0 (iPad; U; CPU OS 3_2_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B500 Safari/531.21.10";
-  testUserAgent(userAgent, { version: '531.21.10', webkit: '531.21.10', mobileSafari: '531.21.10', iPadSafari: '531.21.10', current: 'mobile-safari', iOS: true, iPad: true });
-});
+// KINDLE
 
-test("Mobile Safari - iOS 4.0 iPhone", function() {
-  var userAgent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7";
-  testUserAgent(userAgent, { version: '532.9', webkit: '532.9', mobileSafari: '532.9', iPhoneSafari: '532.9', current: 'mobile-safari', iOS: true, iPhone: true });
-});
+  "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Kindle Fire Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1": {
+    device: SC.DEVICE.android,
+    name: SC.BROWSER.android,
+    version: '4.0',
+    os: SC.OS.android,
+    osVersion: '2.3.4',
+    engine: SC.ENGINE.webkit,
+    engineVersion: '533.1'
+  }
 
-test("Mobile Safari - iOS 4.1 iPhone", function() {
-  var userAgent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7";
-  testUserAgent(userAgent, { version: '532.9', webkit: '532.9', mobileSafari: '532.9', iPhoneSafari: '532.9', current: 'mobile-safari', iOS: true, iPhone: true });
-});
+};
 
-test("iOS WebView - iOS 4.1 iPhone", function() {
-  var userAgent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Mobile/8B117";
-  testUserAgent(userAgent, { version: '532.9', webkit: '532.9', current: 'unknown', iOS: true, iPhone: true });
-});
+// Cycle through all the given user agents and test them individually against their expected
+// values.
+for (var userAgent in userAgents) {
 
-test("iOS WebView - iOS 4.2.1 iPhone", function() {
-  var userAgent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_2_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Mobile/8C14";
-  testUserAgent(userAgent, { version: '533.17.9', webkit: '533.17.9', current: 'unknown', iOS: true, iPhone: true });
-});
+  test(userAgent, function() {
+    var userAgent,
+        browser,
+        expected;
 
-test("Unknown", function() {
-  var userAgent = "Mozilla/5.0 (compatible; Konqueror/4.4; Linux) KHTML/4.4.1 (like Gecko) Fedora/4.4.1-1.fc12";
-  testUserAgent(userAgent, { version: undefined, current: 'unknown' });
-});
+    userAgent = this.working.test;
+    browser = SC.detectBrowser(userAgent);
+    expected = userAgents[userAgent];
+    for (var key in expected) {
+      if (browser[key] && typeof browser[key] !== "function") {
+        equals(browser[key], expected[key], "'" + key + "' should be '" + expected[key] + "'");
+      }
+    }
+  });
 
-test("Windows - using Safari with Webkit v533.17.8", function(){
-  var userAgent = "Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US) AppleWebKit/533.17.8 (KHTML, like Gecko) Version/5.0.1 Safari/533.17.8";
-  testUserAgent(userAgent, { windows: true, version: '533.17.8', safari: '533.17.8', webkit: '533.17.8' });
-});
+}
 
-test("Mac - using Chrome 9.0.572.1 with Webkit v534.12", function(){
-  var userAgent = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_5; en-US) AppleWebKit/534.12 (KHTML, like Gecko) Chrome/9.0.572.1 Safari/534.12";
-  testUserAgent(userAgent, { mac: true, version: '9.0.572.1', chrome: '9.0.572.1', webkit: '534.12', current: 'chrome' });
-});
+// COMMON
 
-test("Android - using Samsung Galaxy S on Android 2.1", function() {
-  var userAgent = "Mozilla/5.0 (Linux; U; Android 2.1-update1; en-us; SCH-I500 Build/ECLAIR) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17";
-  testUserAgent(userAgent, {android: true, version: '530.17', webkit: '530.17'});
+test("Language", function(){
+  equals(SC.detectBrowser(undefined, 'fr').language, 'fr', "should only show base language part");
+  equals(SC.detectBrowser(undefined, 'en-US').language, 'en', "should only show base language part");
+  equals(SC.detectBrowser(undefined, 'es-ES').language, 'es', "should only show base language part");
 });
 
-test("Language", function(){
-  equals(SC._detectBrowser(undefined, 'en-US').language, 'en', "should only show base language part");
+test("CountyCode", function(){
+  equals(SC.detectBrowser(undefined, 'fr').countryCode, undefined, "should not have a countryCode if the language doesn't indicate it");
+  equals(SC.detectBrowser(undefined, 'en-US').countryCode, 'us', "should only show ISO 639-1 countryCode part");
+  equals(SC.detectBrowser(undefined, 'es-ES').countryCode, 'es', "should only show ISO 639-1 countryCode part");
 });
+