Fix issue where tests would fail on iPhone because it identified as both MobileSafari and WebKit.

Author: savetheclocktower

test/unit/tests/base.test.js

@@ -14,39 +14,44 @@ suite('Base', function () {
 
     info('User agent string is: ' + navigator.userAgent);
 
-    assert(trues.size() === 0 || trues.size() === 1,
-     'There should be only one or no browser detected.');
-
-     // we should have definite trues or falses here
-     trues.each(function(result) {
-       assert(result[1] === true);
-     }, this);
-     falses.each(function(result) {
-       assert(result[1] === false);
-     }, this);
-
-     var ua = navigator.userAgent;
-
-     if (ua.indexOf('AppleWebKit/') > -1) {
-       info('Running on WebKit');
-       assert(Prototype.Browser.WebKit);
-     }
-
-     if (Object.prototype.toString.call(window.opera) === '[object Opera]') {
-       info('Running on Opera');
-       assert(Prototype.Browser.Opera);
-     }
-
-     if (ua.indexOf('MSIE') > -1) {
-       info('Running on IE');
-       assert(Prototype.Browser.IE);
-     }
-
-     if (ua.indexOf('Gecko') > -1 && ua.indexOf('KHTML') === -1) {
-       info('Running on Gecko');
-       assert(Prototype.Browser.Gecko);
-     }
-
+    // It's OK for there to be two true values if we're on MobileSafari,
+    // since it's also a WebKit browser.
+    if (Prototype.Browser.MobileSafari) {
+      assert(trues.size() === 2, 'MobileSafari should also identify as WebKit.');
+    } else {
+      assert(trues.size() === 0 || trues.size() === 1,
+       'There should be only one or no browser detected.');
+    }
+
+    // we should have definite trues or falses here
+    trues.each(function(result) {
+      assert(result[1] === true);
+    }, this);
+    falses.each(function(result) {
+      assert(result[1] === false);
+    }, this);
+
+    var ua = navigator.userAgent;
+
+    if (ua.indexOf('AppleWebKit/') > -1) {
+      info('Running on WebKit');
+      assert(Prototype.Browser.WebKit);
+    }
+
+    if (Object.prototype.toString.call(window.opera) === '[object Opera]') {
+      info('Running on Opera');
+      assert(Prototype.Browser.Opera);
+    }
+
+    if (ua.indexOf('MSIE') > -1) {
+      info('Running on IE');
+      assert(Prototype.Browser.IE);
+    }
+
+    if (ua.indexOf('Gecko') > -1 && ua.indexOf('KHTML') === -1) {
+      info('Running on Gecko');
+      assert(Prototype.Browser.Gecko);
+    }
   });
 
 });

test/unit/tests/prototype.test.js

@@ -14,8 +14,14 @@ suite('Prototype', function () {
 
     info('User agent string is: ' + ua);
 
-    assert(trues.size() == 0 || trues.size() == 1,
-     'There should be only one or no browser detected.');
+    // It's OK for there to be two true values if we're on MobileSafari,
+    // since it's also a WebKit browser.
+    if (Prototype.Browser.MobileSafari) {
+      assert(trues.size() === 2, 'MobileSafari should also identify as WebKit.');
+    } else {
+      assert(trues.size() === 0 || trues.size() === 1,
+       'There should be only one or no browser detected.');
+    }
 
     // we should have definite trues or falses here
     trues.each(function(result) {