Fix the third test

Author: Chasen Le Hara

static/canjs.js

@@ -371,6 +371,16 @@ function navigate(href, updateLocation) {
 		return;
 	}
 
+	// don’t do anything if just the hash changed
+	var currentHrefBase = currentHref.replace(/#.*/, '');// This is the current URL without the hash
+	var hrefBase = href.replace(/#.*/, '');// This is the new URL without the hash
+	if (currentHrefBase === hrefBase) {
+		if (updateLocation !== false) {// We don’t want to pushState when our popstate listener calls this
+			window.history.pushState({ articleScroll: getPageScrollTop() }, null, href);
+		}
+		return;
+	}
+
 	loader.start();
 
 	if($menuButton.is(':visible')){

test/scroll.js

@@ -32,7 +32,7 @@ QUnit.test('Scroll down and refresh the page', function(assert) {
 		F.win.location.reload();
 
 		// Wait for the page to be loaded
-		F("body").wait(function(){
+		F("body").wait(function() {
 			// Check whether the element exists
 			return this[0] ? true : false;
 		}, function() {
@@ -61,41 +61,57 @@ QUnit.test('Refresh after going to a specific section', function(assert) {
 		F.win.location.reload();
 
 		// Wait for the page to be loaded
-		F("#Components").wait(function(){
+		F("#Components").wait(function() {
 			// Check whether the element exists
 			return this[0] ? true : false;
-		}, F.wait(300, function() {
-			// Determine whether the section is in view
-			var rect = F.win.$("#Components")[0].getBoundingClientRect();
-			assert.ok(utils.rectIntersectsWithWindow(rect, F.win));
-			done();
-		}));
+		}, function() {
+			// Wait for the restoration logic to run
+			setTimeout(function() {
+				// Determine whether the section is in view
+				var rect = F.win.$("#Components")[0].getBoundingClientRect();
+				assert.ok(utils.rectIntersectsWithWindow(rect, F.win));
+				done();
+			}, 300);
+		});
 	});
 });
 
 QUnit.test("Refresh after going to a specific section and scrolling", function(assert) {
 	var done = assert.async();
 
+	// Open a page
 	F.open('../doc/guides/html.html', function() {
+		var offset = 100;
+
+		// Set the size so the page takes up some space
 		F.frame.height = 400;
 		F.frame.width = "100%";
 
+		// Click a TOC link to go to a specific section
 		F(".on-this-page-table a[href='#Overview']").click();
 
-		var pos = F("#Components").offset().top - 60;
-		F.win.scroll("top", pos);
-		F.win.location.reload();
-
-		F("#Components").wait(function() {
-			var element = this[0];
-			if (!element) {
-				return false;
-			}
-			var rect = element.getBoundingClientRect();
-			return utils.rectIntersectsWithWindow(rect, F.win)
-		}, function() {
-			assert.ok(true);
-			done();
+		// Wait for the page to be scrolled down to the section
+		F.wait(300, function() {
+
+			// Scroll to 100px from the top of the page
+			F.win.scroll("top", offset);
+
+			// Reload the page
+			F.win.location.reload();
+
+			// Wait for the page to be loaded
+			F("body").wait(function() {
+				// Check whether the element exists
+				return this[0] ? true : false;
+			}, function() {
+				// Wait for the restoration logic to run
+				setTimeout(function() {
+					// Get the amount the body has been scrolled
+					var bodyTopOffset = F("body")[0].getBoundingClientRect().top;
+					assert.equal(bodyTopOffset, 0 - offset);
+					done();
+				}, 300);
+			});
 		});
 	});
-})
+});