FIXED changing location.hash should be synchronous #781

assaf · assaf · commit d5f92bda80c5 · 2014-11-13T18:22:13.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ FIXED updated to JSDOM 1.2.1
 
 FIXED browser.evaluate({throws error}) should throw an error #790
 
+FIXED changing location.hash should be synchronous #781
+
     681 passing
     10 sec to complete
 
diff --git a/src/zombie/history.coffee b/src/zombie/history.coffee
@@ -321,13 +321,19 @@ createLocation = (history, url)->
   Object.defineProperties location,
     assign:
       value: (url)->
-        browser.eventLoop.next ->
+        if hashChange(history.current, url)
           history.assign(url)
+        else
+          browser.eventLoop.next ->
+            history.assign(url)
 
     replace:
       value: (url)->
-        browser.eventLoop.next ->
+        if hashChange(history.current, url)
           history.replace(url)
+        else
+          browser.eventLoop.next ->
+            history.replace(url)
 
     reload:
       value: (force)->
diff --git a/test/history_test.js b/test/history_test.js
@@ -351,7 +351,6 @@ describe('History', function() {
         browser.document.body.innerHTML = '<html><body>Wolf</body></html>';
         browser.window.addEventListener('hashchange', ()=> done());
         browser.window.location.hash = 'boo';
-        browser.wait();
       });
 
       it('should add page to history', function() {
