diff --git a/testing/marionette/client/marionette/tests/unit/test_getactiveframe_oop.py b/testing/marionette/client/marionette/tests/unit/test_getactiveframe_oop.py
new file mode 100644
index 000000000000..3892428b177a
--- /dev/null
+++ b/testing/marionette/client/marionette/tests/unit/test_getactiveframe_oop.py
@@ -0,0 +1,110 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from marionette_test import MarionetteTestCase
+
+
+class TestGetActiveFrameOOP(MarionetteTestCase):
+ def setUp(self):
+ super(TestGetActiveFrameOOP, self).setUp()
+ self.oop_by_default = self.marionette.execute_script("""
+ try {
+ return SpecialPowers.getBoolPref('dom.ipc.browser_frames.oop_by_default');
+ }
+ catch(e) {}
+ """)
+ self.mozBrowserFramesEnabled = self.marionette.execute_script("""
+ try {
+ return SpecialPowers.getBoolPref('dom.mozBrowserFramesEnabled');
+ }
+ catch(e) {}
+ """)
+ self.marionette.execute_script("""
+ SpecialPowers.setBoolPref('dom.ipc.browser_frames.oop_by_default', true);
+ """)
+ self.marionette.execute_script("""
+ SpecialPowers.setBoolPref('dom.mozBrowserFramesEnabled', true);
+ """)
+
+ def test_active_frame_oop(self):
+ self.marionette.navigate(self.marionette.absolute_url("test.html"))
+ self.marionette.execute_script("SpecialPowers.addPermission('browser', true, document)")
+
+ # Create first OOP frame
+ self.marionette.execute_script("""
+ let iframe1 = document.createElement("iframe");
+ SpecialPowers.wrap(iframe1).mozbrowser = true;
+ SpecialPowers.wrap(iframe1).remote = true;
+ iframe1.id = "remote_iframe1";
+ iframe1.style.height = "100px";
+ iframe1.style.width = "100%%";
+ iframe1.src = "%s";
+ document.body.appendChild(iframe1);
+ """ % self.marionette.absolute_url("test_oop_1.html"))
+
+ # Currently no active frame
+ self.assertEqual(self.marionette.get_active_frame(), None)
+ self.assertTrue("test.html" in self.marionette.get_url())
+
+ # Switch to iframe1, get active frame
+ self.marionette.switch_to_frame('remote_iframe1')
+ active_frame1 = self.marionette.get_active_frame()
+ self.assertNotEqual(active_frame1.id, None)
+
+ # Switch to top-level then back to active frame, verify correct frame
+ self.marionette.switch_to_frame()
+ self.marionette.switch_to_frame(active_frame1)
+ self.assertTrue("test_oop_1.html" in self.marionette.get_url())
+
+ # Create another OOP frame
+ self.marionette.switch_to_frame()
+ self.marionette.execute_script("""
+ let iframe2 = document.createElement("iframe");
+ SpecialPowers.wrap(iframe2).mozbrowser = true;
+ SpecialPowers.wrap(iframe2).remote = true;
+ iframe2.id = "remote_iframe2";
+ iframe2.style.height = "100px";
+ iframe2.style.width = "100%%";
+ iframe2.src = "%s";
+ document.body.appendChild(iframe2);
+ """ % self.marionette.absolute_url("test_oop_2.html"))
+
+ # Switch to iframe2, get active frame
+ self.marionette.switch_to_frame('remote_iframe2')
+ active_frame2 = self.marionette.get_active_frame()
+ self.assertNotEqual(active_frame2.id, None)
+
+ # Switch to top-level then back to active frame 1, verify correct frame
+ self.marionette.switch_to_frame()
+ self.marionette.switch_to_frame(active_frame1)
+ self.assertTrue("test_oop_1.html" in self.marionette.get_url())
+
+ # Switch to top-level then back to active frame 2, verify correct frame
+ self.marionette.switch_to_frame()
+ self.marionette.switch_to_frame(active_frame2)
+ self.assertTrue("test_oop_2.html" in self.marionette.get_url())
+
+ # NOTE: For some reason the emulator, the contents of the OOP iframes are not
+ # actually rendered, even though the page_source is correct. When this test runs
+ # on a b2g device, the contents do appear
+ #print self.marionette.get_url()
+ #print self.marionette.page_source
+
+ def tearDown(self):
+ if self.oop_by_default is None:
+ self.marionette.execute_script("""
+ SpecialPowers.clearUserPref('dom.ipc.browser_frames.oop_by_default');
+ """)
+ else:
+ self.marionette.execute_script("""
+ SpecialPowers.setBoolPref('dom.ipc.browser_frames.oop_by_default', %s);
+ """ % 'true' if self.oop_by_default else 'false')
+ if self.mozBrowserFramesEnabled is None:
+ self.marionette.execute_script("""
+ SpecialPowers.clearUserPref('dom.mozBrowserFramesEnabled');
+ """)
+ else:
+ self.marionette.execute_script("""
+ SpecialPowers.setBoolPref('dom.mozBrowserFramesEnabled', %s);
+ """ % 'true' if self.mozBrowserFramesEnabled else 'false')
diff --git a/testing/marionette/client/marionette/tests/unit/unit-tests.ini b/testing/marionette/client/marionette/tests/unit/unit-tests.ini
index 0b66cd70c50c..ea7d6750ba01 100644
--- a/testing/marionette/client/marionette/tests/unit/unit-tests.ini
+++ b/testing/marionette/client/marionette/tests/unit/unit-tests.ini
@@ -92,3 +92,4 @@ b2g = false
[test_implicit_waits.py]
[test_date_time_value.py]
+[test_getactiveframe_oop.py]
diff --git a/testing/marionette/client/marionette/www/test_oop_1.html b/testing/marionette/client/marionette/www/test_oop_1.html
new file mode 100644
index 000000000000..62e4ad0473bb
--- /dev/null
+++ b/testing/marionette/client/marionette/www/test_oop_1.html
@@ -0,0 +1,15 @@
+
+
+
+
+
+OOP Test Frame 1
+
+
+ OOP Test Frame 1
+ Hello!
+
+
+
diff --git a/testing/marionette/client/marionette/www/test_oop_2.html b/testing/marionette/client/marionette/www/test_oop_2.html
new file mode 100644
index 000000000000..05aca5adba86
--- /dev/null
+++ b/testing/marionette/client/marionette/www/test_oop_2.html
@@ -0,0 +1,15 @@
+
+
+
+
+
+OOP Test Frame 2
+
+
+ OOP Test Frame 2
+ Hello!
+
+
+