the remote url is now updated on any history method invocation

app/js/api/cypress/cy/commands/navigation.coffee

@@ -1,10 +1,13 @@
 $Cypress.register "Navigation", (Cypress, _, $) ->
 
   overrideRemoteLocationGetters = (cy, contentWindow) ->
+    navigated = ->
+      cy.$remoteIframe.trigger("history:event")
+
     location = (attr) ->
       cy.sync.location(attr, {log: false})
 
-    Cypress.Location.override(contentWindow, location)
+    Cypress.Location.override(contentWindow, location, navigated)
 
   Cypress.Cy.extend
     onBeforeLoad: (contentWindow) ->

app/js/api/cypress/location.coffee

@@ -128,7 +128,20 @@ $Cypress.Location = do ($Cypress, _, Uri) ->
       }
 
     ## override pathname + query here
-    @override = (win, location) ->
+    @override = (win, location, navigated) ->
+      ## history does not fire events until a click or back has happened
+      ## so we have to know when they do manually
+      _.each ["back", "forward", "go", "pushState", "replaceState"], (attr) ->
+        ## dont use underscore wrap here because its potentially very
+        ## confusing for users and this manually override is faster anyway
+        return if not orig = win.history?[attr]
+
+        win.history[attr] = ->
+          orig.apply(@, arguments)
+
+          ## let our function know we've navigated
+          navigated()
+
       _.each ["hash", "host", "hostname", "origin", "pathname", "port", "protocol", "search"], (attr) ->
         try
           Object.defineProperty win.location, attr, {

app/js/backbone/apps/test_iframe/show/show_view.coffee

@@ -324,6 +324,10 @@
 
       @$remote = $("<iframe />", remoteOpts).appendTo(@ui.size)
 
+      ## when apps go through the history object
+      ## and change the url, update it now
+      @$remote.on "history:event", @updateRemoteUrl
+
       ## when the remote iframe visits an external URL
       ## we want to update our header's input
       @$remote.on "visit:start", (e, url) =>

spec/client/api/cy/navigation_spec.coffee

@@ -90,6 +90,22 @@ describe "$Cypress.Cy Navigation Commands", ->
       it "search", ->
         @eq "search", "?foo=bar"
 
+    describe "history method overrides", ->
+      beforeEach ->
+        @cy
+          .visit("fixtures/html/sinon.html")
+          .window().as("win")
+          .then ->
+            @trigger = @sandbox.stub @cy.$remoteIframe, "trigger"
+
+      _.each ["back", "forward", "go", "pushState", "replaceState"], (attr) =>
+        it "fires 'history:event' on attr: '#{attr}'", ->
+          if attr is "go"
+            arg = -1
+
+          @win.history[attr](arg)
+          expect(@trigger).to.be.calledWith "history:event"
+
     describe "visit:start", ->
       beforeEach ->
         trigger = @sandbox.stub $.fn, "trigger"