Build: Upgrade to the latest Grunt and JSHint - Closes gh-786

2 files changed, 54 insertions, 50 deletions

diff --git a/tests/unit/datepicker/datepicker_tickets.js b/tests/unit/datepicker/datepicker_tickets.js
index e1b882a89..57b25c3ff 100644
--- a/tests/unit/datepicker/datepicker_tickets.js
+++ b/tests/unit/datepicker/datepicker_tickets.js
@@ -7,9 +7,9 @@ module("datepicker: tickets");
 
 // http://forum.jquery.com/topic/several-breaking-changes-in-jquery-ui-1-8rc1
 test('beforeShowDay-getDate', function() {
-    expect( 3 );
+	expect( 3 );
 	var inp = init('#inp', {beforeShowDay: function(date) { inp.datepicker('getDate'); return [true, '']; }}),
-	   dp = $('#ui-datepicker-div');
+		dp = $('#ui-datepicker-div');
 	inp.val('01/01/2010').datepicker('show');
 	// contains non-breaking space
 	equal($('div.ui-datepicker-title').text(), 'January 2010', 'Initial month');
@@ -26,63 +26,63 @@ test('beforeShowDay-getDate', function() {
 });
 
 test('Ticket 7602: Stop datepicker from appearing with beforeShow event handler', function(){
-    expect( 3 );
-    var inp = init('#inp',{
-            beforeShow: function(){
-                return false;
-            }
-        }),
-        dp = $('#ui-datepicker-div');
-    inp.datepicker('show');
-    equal(dp.css('display'), 'none',"beforeShow returns false");
-    inp.datepicker('destroy');
+	expect( 3 );
+	var inp = init('#inp',{
+			beforeShow: function(){
+				return false;
+			}
+		}),
+		dp = $('#ui-datepicker-div');
+	inp.datepicker('show');
+	equal(dp.css('display'), 'none',"beforeShow returns false");
+	inp.datepicker('destroy');
 
-    inp = init('#inp',{
-        beforeShow: function(){
-        }
-    });
-    dp = $('#ui-datepicker-div');
-    inp.datepicker('show');
-    equal(dp.css('display'), 'block',"beforeShow returns nothing");
+	inp = init('#inp',{
+		beforeShow: function(){
+		}
+	});
+	dp = $('#ui-datepicker-div');
+	inp.datepicker('show');
+	equal(dp.css('display'), 'block',"beforeShow returns nothing");
 	inp.datepicker('hide');
-    inp.datepicker('destroy');
+	inp.datepicker('destroy');
 
-    inp = init('#inp',{
-        beforeShow: function(){
-            return true;
-        }
-    });
-    dp = $('#ui-datepicker-div');
-    inp.datepicker('show');
-    equal(dp.css('display'), 'block',"beforeShow returns true");
+	inp = init('#inp',{
+		beforeShow: function(){
+			return true;
+		}
+	});
+	dp = $('#ui-datepicker-div');
+	inp.datepicker('show');
+	equal(dp.css('display'), 'block',"beforeShow returns true");
 	inp.datepicker('hide');
-    inp.datepicker('destroy');
+	inp.datepicker('destroy');
 });
 
 test('Ticket 6827: formatDate day of year calculation is wrong during day lights savings time', function(){
-    expect( 1 );
-    var time = $.datepicker.formatDate("oo", new Date("2010/03/30 12:00:00 CDT"));
-    equal(time, "089");
+	expect( 1 );
+	var time = $.datepicker.formatDate("oo", new Date("2010/03/30 12:00:00 CDT"));
+	equal(time, "089");
 });
 
 test('Ticket #7244: date parser does not fail when too many numbers are passed into the date function', function() {
-    expect( 4 );
-    var date;
-    try{
-        date = $.datepicker.parseDate('dd/mm/yy', '18/04/19881');
-        ok(false, "Did not properly detect an invalid date");
-    }catch(e){
-        ok("invalid date detected");
-    }
+	expect( 4 );
+	var date;
+	try{
+		date = $.datepicker.parseDate('dd/mm/yy', '18/04/19881');
+		ok(false, "Did not properly detect an invalid date");
+	}catch(e){
+		ok("invalid date detected");
+	}
 
-    try {
-      date = $.datepicker.parseDate('dd/mm/yy', '18/04/1988 @ 2:43 pm');
-      equal(date.getDate(), 18);
-      equal(date.getMonth(), 3);
-      equal(date.getFullYear(), 1988);
-    } catch(e) {
-      ok(false, "Did not properly parse date with extra text separated by whitespace");
-    }
+	try {
+		date = $.datepicker.parseDate('dd/mm/yy', '18/04/1988 @ 2:43 pm');
+		equal(date.getDate(), 18);
+		equal(date.getMonth(), 3);
+		equal(date.getFullYear(), 1988);
+	} catch(e) {
+		ok(false, "Did not properly parse date with extra text separated by whitespace");
+	}
 });
 
 })(jQuery);
diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index 06890d8d9..74a561c0d 100644
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -12,6 +12,10 @@ function includeScript( url ) {
 	document.write( "<script src='../../../" + url + "'></script>" );
 }
 
+function url( value ) {
+	return value + (/\?/.test(value) ? "&" : "?") + new Date().getTime() + "" + parseInt(Math.random() * 100000, 10);
+}
+
 reset = QUnit.reset;
 QUnit.reset = function() {
 	// Ensure jQuery events and data on the fixture are properly removed
@@ -65,11 +69,11 @@ TestHelpers.testJshint = function( module ) {
 
 		$.when(
 			$.ajax({
-				url: "../../../ui/.jshintrc",
+				url: url("../../../ui/.jshintrc"),
 				dataType: "json"
 			}),
 			$.ajax({
-				url: "../../../ui/jquery.ui." + module + ".js",
+				url: url("../../../ui/jquery.ui." + module + ".js"),
 				dataType: "text"
 			})
 		).done(function( hintArgs, srcArgs ) {