Don't update URL bar for iframe navigation

Fix #4191 Auditors: @bbondy Test Plan: Covered by automated test
brave · Sep 22, 2016 · 2350448 · 2350448 · bbondy · Sep 22, 2016
1 parent e599037
commit 2350448
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 2 deletions.
diff --git a/js/components/frame.js b/js/components/frame.js
@@ -938,8 +938,10 @@ class Frame extends ImmutableComponent {
       }
     })
     this.webview.addEventListener('did-navigate-in-page', (e) => {
-      windowActions.setNavigated(e.url, this.props.frameKey, true)
-      loadEnd(true)
+      if (e.isMainFrame) {
+        windowActions.setNavigated(e.url, this.props.frameKey, true)
+        loadEnd(true)
+      }
     })
     this.webview.addEventListener('enter-html-full-screen', () => {
       windowActions.setFullScreen(this.frame, true, true)

diff --git a/test/components/navigationBarTest.js b/test/components/navigationBarTest.js
@@ -107,6 +107,30 @@ describe('navigationBar', function () {
       })
     })
 
+    describe('iframe navigation', function () {
+      Brave.beforeAll(this)
+
+      before(function * () {
+        var page1 = Brave.server.url('in_page_nav.html')
+        yield setup(this.app.client)
+        yield this.app.client
+          .tabByUrl(Brave.newTabUrl)
+          .url(page1)
+          .waitForUrl(page1)
+      })
+
+      it('location does not change', function * () {
+        var page1 = Brave.server.url('in_page_nav.html')
+        yield this.app.client
+          .windowByUrl(Brave.browserWindowUrl)
+          .waitUntil(function () {
+            return this.getValue(urlInput).then((val) => {
+              return val === page1
+            })
+          })
+      })
+    })
+
     describe('page with a title', function () {
       Brave.beforeAll(this)
 

diff --git a/test/fixtures/iframe1.html b/test/fixtures/iframe1.html
@@ -0,0 +1,3 @@
+<html>
+    <script>window.location.href = window.location.href + '#foo'</script>
+</html>
diff --git a/test/fixtures/in_page_nav.html b/test/fixtures/in_page_nav.html
@@ -0,0 +1,4 @@
+<html>
+    <iframe src='./iframe1.html'>
+    </iframe>
+</html>