fix for broken init test and some whitespace

This commit is contained in:
John Bender 2011-03-13 23:09:32 -07:00
parent fc0cd38c4e
commit c629e34e74
2 changed files with 15 additions and 10 deletions

View file

@ -3,12 +3,12 @@
<head>
<meta charset="UTF-8" />
<title>jQuery Mobile Init Test Suite</title>
<!-- meta viewport left out on purpose for test append -->
<!-- meta viewport left out on purpose for test append -->
<script type="text/javascript" src="../../../js/jquery.js"></script>
<script type="text/javascript" src="../../../js/"></script>
<script type="text/javascript" src="../../../external/qunit.js"></script>
<script type="text/javascript" src="../../jquery.testHelper.js"></script>
<script type="text/javascript" src="init_core.js"></script>
<script type="text/javascript" src="../../../js/"></script>
<!-- added explicitly for library reloading (see testHelper ) -->
<script type="text/javascript" src="../../../js/jquery.mobile.init.js"></script>
<script type="text/javascript" src="../../../js/jquery.mobile.core.js"></script>

View file

@ -2,7 +2,9 @@
* mobile init tests
*/
(function($){
var mobilePage = undefined, mobileSelect = undefined,
var mobilePage = undefined,
mobileSelect = undefined,
metaViewportContentDefault = $.mobile.metaViewportContent,
libName = 'jquery.mobile.init.js',
setGradeA = function(value) { $.mobile.gradeA = function(){ return value; }; },
extendFn = $.extend;
@ -20,6 +22,9 @@
// NOTE reset for pageLoading tests
$('.ui-loader').remove();
// reset meta view port content
$.mobile.metaViewportContent = metaViewportContentDefault;
}
});
@ -65,12 +70,11 @@
});
var findMeta = function(){
return $("head meta").filter("[name='viewport']");
},
return $("head meta[name='viewport']");
},
setViewPortContent = function(){
$.testHelper.reloadLib( libName );
};
$.testHelper.reloadLib( libName );
};
test( "meta viewport element not added to head when not defined on mobile", function(){
$.mobile.metaViewportContent = null;
@ -84,14 +88,15 @@
setViewPortContent();
same( findMeta().length, 1);
});
test( "meta viewport element is not added to head when defined on mobile and a meta already exists", function(){
findMeta().remove();
$( '<meta name="viewport" content="width=device-width">').prependTo("head");
setViewPortContent();
same( findMeta().length, 1);
});
var findFirstPage = function() {
var findFirstPage = function() {
return $("[data-role='page']").first();
};