Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-15 22:44:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 771224 - use chrome:// instead of loading remote xul. r=jgriffin

Browse Source
This commit is contained in:
Malini Das 2012-07-12 11:01:20 -04:00
parent 4dfabffcbe
commit 0647850ec7
13 changed files with 19 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/marionette/Makefile.in
View File

@ -15,4 +15,8 @@ ifdef ENABLE_MARIONETTE
$(NULL)
endif
ifdef ENABLE_TESTS
DEFINES += -DENABLE_TESTS
endif
include $(topsrcdir)/config/rules.mk

4
testing/marionette/client/marionette/www/test.xul → testing/marionette/client/marionette/chrome/test.xul
View File

@ -16,6 +16,6 @@
<textbox id="textInput3" class="asdf" size="6" value="test" label="input" />
</vbox>
<iframe id="iframe" name="iframename" src="test2.xul"/>
<iframe id="iframe" name="iframename" src="test_nested_iframe.xul"/>
<iframe id="iframe" name="iframename" src="chrome://marionette/content/test2.xul"/>
<iframe id="iframe" name="iframename" src="chrome://marionette/content/test_nested_iframe.xul"/>
</dialog>

0
testing/marionette/client/marionette/www/test2.xul → testing/marionette/client/marionette/chrome/test2.xul
View File

0
testing/marionette/client/marionette/www/test_nested_iframe.xul → testing/marionette/client/marionette/chrome/test_nested_iframe.xul
View File

3
testing/marionette/client/marionette/geckoinstance.py
View File

@ -20,8 +20,7 @@ class GeckoInstance(object):
def start(self):
profile = self.profile
if not profile:
prefs = {"dom.allow_XUL_XBL_for_file": True,
"marionette.defaultPrefs.enabled": True,
prefs = {"marionette.defaultPrefs.enabled": True,
"marionette.defaultPrefs.port": 2828}
profile = {"preferences": prefs, "restore":False}
print "starting runner"

7
testing/marionette/client/marionette/tests/unit/test_click.py
View File

@ -24,12 +24,7 @@ class TestClickChrome(MarionetteTestCase):
MarionetteTestCase.setUp(self)
self.marionette.set_context("chrome")
self.win = self.marionette.get_window()
#need to get the file:// path for xul
unit = os.path.abspath(os.path.join(os.path.realpath(__file__), os.path.pardir))
tests = os.path.abspath(os.path.join(unit, os.path.pardir))
mpath = os.path.abspath(os.path.join(tests, os.path.pardir))
xul = "file://" + os.path.join(mpath, "www", "test.xul")
self.marionette.execute_script("window.open('" + xul +"', '_blank', 'chrome,centerscreen');")
self.marionette.execute_script("window.open('chrome://marionette/content/test.xul', '_blank', 'chrome,centerscreen');")
def tearDown(self):
self.marionette.execute_script("window.close();")

7
testing/marionette/client/marionette/tests/unit/test_elementState.py
View File

@ -27,12 +27,7 @@ class TestStateChrome(MarionetteTestCase):
MarionetteTestCase.setUp(self)
self.marionette.set_context("chrome")
self.win = self.marionette.get_window()
#need to get the file:// path for xul
unit = os.path.abspath(os.path.join(os.path.realpath(__file__), os.path.pardir))
tests = os.path.abspath(os.path.join(unit, os.path.pardir))
mpath = os.path.abspath(os.path.join(tests, os.path.pardir))
xul = "file://" + os.path.join(mpath, "www", "test.xul")
self.marionette.execute_script("window.open('" + xul +"', '_blank', 'chrome,centerscreen');")
self.marionette.execute_script("window.open('chrome://marionette/content/test.xul', '_blank', 'chrome,centerscreen');")
def tearDown(self):
self.marionette.execute_script("window.close();")

7
testing/marionette/client/marionette/tests/unit/test_findelement.py
View File

@ -128,12 +128,7 @@ class TestElementsChrome(MarionetteTestCase):
MarionetteTestCase.setUp(self)
self.marionette.set_context("chrome")
self.win = self.marionette.get_window()
#need to get the file:// path for xul
unit = os.path.abspath(os.path.join(os.path.realpath(__file__), os.path.pardir))
tests = os.path.abspath(os.path.join(unit, os.path.pardir))
mpath = os.path.abspath(os.path.join(tests, os.path.pardir))
xul = "file://" + os.path.join(mpath, "www", "test.xul")
self.marionette.execute_script("window.open('" + xul +"', '_blank', 'chrome,centerscreen');")
self.marionette.execute_script("window.open('chrome://marionette/content/test.xul', '_blank', 'chrome,centerscreen');")
def tearDown(self):
self.marionette.execute_script("window.close();")

7
testing/marionette/client/marionette/tests/unit/test_getattr.py
View File

@ -17,12 +17,7 @@ class TestGetAttributeChrome(MarionetteTestCase):
MarionetteTestCase.setUp(self)
self.marionette.set_context("chrome")
self.win = self.marionette.get_window()
#need to get the file:// path for xul
unit = os.path.abspath(os.path.join(os.path.realpath(__file__), os.path.pardir))
tests = os.path.abspath(os.path.join(unit, os.path.pardir))
mpath = os.path.abspath(os.path.join(tests, os.path.pardir))
xul = "file://" + os.path.join(mpath, "www", "test.xul")
self.marionette.execute_script("window.open('" + xul +"', '_blank', 'chrome,centerscreen');")
self.marionette.execute_script("window.open('chrome://marionette/content/test.xul', '_blank', 'chrome,centerscreen');")
def tearDown(self):
self.marionette.execute_script("window.close();")

7
testing/marionette/client/marionette/tests/unit/test_selected.py
View File

@ -19,12 +19,7 @@ class TestSelectedChrome(MarionetteTestCase):
MarionetteTestCase.setUp(self)
self.marionette.set_context("chrome")
self.win = self.marionette.get_window()
#need to get the file:// path for xul
unit = os.path.abspath(os.path.join(os.path.realpath(__file__), os.path.pardir))
tests = os.path.abspath(os.path.join(unit, os.path.pardir))
mpath = os.path.abspath(os.path.join(tests, os.path.pardir))
xul = "file://" + os.path.join(mpath, "www", "test.xul")
self.marionette.execute_script("window.open('" + xul +"', '_blank', 'chrome,centerscreen');")
self.marionette.execute_script("window.open('chrome://marionette/content/test.xul', '_blank', 'chrome,centerscreen');")
def tearDown(self):
self.marionette.execute_script("window.close();")

7
testing/marionette/client/marionette/tests/unit/test_switch_frame.py
View File

@ -37,12 +37,7 @@ class TestSwitchFrameChrome(MarionetteTestCase):
MarionetteTestCase.setUp(self)
self.marionette.set_context("chrome")
self.win = self.marionette.get_window()
#need to get the file:// path for xul
unit = os.path.abspath(os.path.join(os.path.realpath(__file__), os.path.pardir))
tests = os.path.abspath(os.path.join(unit, os.path.pardir))
mpath = os.path.abspath(os.path.join(tests, os.path.pardir))
xul = "file://" + os.path.join(mpath, "www", "test.xul")
self.marionette.execute_script("window.open('" + xul +"', '_blank', 'chrome,centerscreen');")
self.marionette.execute_script("window.open('chrome://marionette/content/test.xul', '_blank', 'chrome,centerscreen');")
def tearDown(self):
self.marionette.execute_script("window.close();")

7
testing/marionette/client/marionette/tests/unit/test_text.py
View File

@ -33,12 +33,7 @@ class TestTextChrome(MarionetteTestCase):
MarionetteTestCase.setUp(self)
self.marionette.set_context("chrome")
self.win = self.marionette.get_window()
#need to get the file:// path for xul
unit = os.path.abspath(os.path.join(os.path.realpath(__file__), os.path.pardir))
tests = os.path.abspath(os.path.join(unit, os.path.pardir))
mpath = os.path.abspath(os.path.join(tests, os.path.pardir))
xul = "file://" + os.path.join(mpath, "www", "test.xul")
self.marionette.execute_script("window.open('" + xul +"', '_blank', 'chrome,centerscreen');")
self.marionette.execute_script("window.open('chrome://marionette/content/test.xul', '_blank', 'chrome,centerscreen');")
def tearDown(self):
self.marionette.execute_script("window.close();")

5
testing/marionette/jar.mn
View File

@ -12,6 +12,11 @@ marionette.jar:
content/marionette-perf.js (marionette-perf.js)
content/EventUtils.js (EventUtils.js)
content/ChromeUtils.js (ChromeUtils.js)
#ifdef ENABLE_TESTS
content/test.xul (client/marionette/chrome/test.xul)
content/test2.xul (client/marionette/chrome/test2.xul)
content/test_nested_iframe.xul (client/marionette/chrome/test_nested_iframe.xul)
#endif
% content specialpowers %content/
content/specialpowers.js (../mochitest/specialpowers/content/specialpowers.js)