Commit Graph

1003 Commits

Author SHA1 Message Date
Wes Kocher
fb749897f2 Merge b2g-inbound to m-c a=merge 2014-12-12 16:43:37 -08:00
Chris Manchester
af8e1a3519 Bug 1099331 - Allow navigation resulting in about:blocked or about:error pages when explicitly requested without returning an error from the marionette server.;r=automatedtester
This allows navigation resulting in a blocked or error page without returning an error to the client. If an error page is reached, an error is returned in cases this was not specifically requested in the client: client.navigate("about:neterror") will navigate to this page and return to the client without an error, but client.navigate("does.not.exist.") will return to the client with an error as it has previously.
2014-12-12 12:08:32 -05:00
Chris Manchester
5f14271ff2 Bug 941749 - Add support for returning both known tabs and chrome windows from the marionette server.;r=automatedtester
This splits the api for getWindowHandles and getChromeWindowHandles for those
managing windows and tabs separately in tests. getWindowHandles is
re-implemented to return tabs when appropriate, and getChromeWindowHandles is
added to correspond to individual os windows (the prior behavior of
getWindowHandles). current_window_handle now corresponds to a tab on desktop,
while chrome_window_handle is provided for the current OS window.
switch_to_window will accept either a chrome window handle or tab handle.
In the case of a tab, switching will select the tab. In the
case of a chrome window handle, the prior behavior is retained.
2014-12-12 12:08:31 -05:00
Chris Manchester
a5b546d2b2 Bug 941749 - A test managing open windows and tabs with marionette.;r=automatedtester 2014-12-12 12:08:31 -05:00
Morris Tseng
0b66e315ac Bug 1092888 - Part 5: Add a parameter to toggle context menu when calling long_press. r=mdas 2014-11-16 18:52:00 -05:00
Dave Hunt
11e10d88f2 Bug 1104271 - Provide a logger for Marionette test cases. r=mdas 2014-12-09 07:28:00 -05:00
Chris Manchester
e06c9d4b48 Bug 1108714 - Make marionette's skip_if_b2g run desktop tests. r=mdas 2014-12-09 14:20:40 -05:00
Ryan VanderMeulen
0e0519738e Backed out 5 changesets (bug 1092888) because something in the push made Gij(2) permafail.
Backed out changeset 0ad25135a27f (bug 1092888)
Backed out changeset 7cd8260bfc16 (bug 1092888)
Backed out changeset 86385291d8c8 (bug 1092888)
Backed out changeset be16d194d5df (bug 1092888)
Backed out changeset daee46827258 (bug 1092888)
2014-12-09 12:08:59 -05:00
Ryan VanderMeulen
f452af0124 Backed out changeset d4dfb076f5f1 (bug 1108714) because something in the push made Gij(2) permafail. 2014-12-09 12:08:45 -05:00
Chris Manchester
cb425e733f Bug 1108714 - Make marionette's skip_if_b2g run desktop tests. r=mdas 2014-12-08 17:21:59 -05:00
Morris Tseng
455c5caf38 Bug 1092888 - Part 5: Add a parameter to toggle context menu when calling long_press. r=mdas 2014-11-16 18:52:00 +01:00
David Burns
1dc4e16bdf Bug 1107915: Allow switching to Browser elements from Marionette; r=mdas
--HG--
extra : rebase_source : 88739c49fd635ee701af0490fab8d62be0d15d7e
2014-12-05 15:33:21 +00:00
David Burns
dbb025e49f Bug 940954: Allow marionette to restart the browser and create a new session
This gives us the ability to restart a session from the client side, say for testing Firefox updates,
and then carry on the test. To do this it is just self.marionette.restart()

--HG--
extra : rebase_source : 536b85e5e82e12eb7710135945217dfe707e5b5d
2014-12-03 22:08:04 +00:00
Andrew Halberstadt
7cf8491887 Bug 1104742 - Marionette runner should cleanup marionette objects when gc'ed, r=AutomatedTester
--HG--
extra : rebase_source : 8a869167794d3bb439d167f4d29ceb8c820a5ebf
2014-12-04 10:17:12 -08:00
Malini Das
217c95020e Bug 1105748 - Fix Mn failure on emulator/device, r=dburns 2014-12-04 10:02:32 -08:00
Carsten "Tomcat" Book
21f1e0aa6c Merge mozilla-central to b2g-inbound 2014-12-03 13:45:36 +01:00
Phil Ringnalda
3cc6cbd47d Back out 1b87e7511983 (bug 940954) on suspicion of causing b2g desktop Mac sqlite troubles
CLOSED TREE
2014-12-02 18:40:15 -08:00
Alexandre Lissy
1d44500221 Bug 1100345 - Make Mulet appear as B2G for Marionette r=jgriffin
When running Gaia Marionette integration tests, we need to talk to Mulet
like if it was a B2G device. We define the "b2g.is_mulet" pref for this
purpose.
2014-11-27 03:07:00 +01:00
Andrew Halberstadt
a272aead22 Bug 1104941 - Bump marionette-client to 0.8.5, r=AutomatedTester
--HG--
extra : rebase_source : f6435707a5808e9119cca7bbe3ad5a8d40585b0f
2014-12-02 14:40:14 -08:00
David Burns
f5d9f594d5 Bug 940954: Allow marionette to restart the browser and create a new session
This gives us the ability to restart a session from the client side, say for testing Firefox updates,
and then carry on the test. To do this it is just self.marionette.restart()

--HG--
extra : rebase_source : 95d0c6d4fcd30865ff7cbbf97de0e5ca09b3eaab
2014-11-26 00:33:53 +00:00
Rob Wood
8ec92b6e5d Backed out changeset 5671737e4f24 (bug 984508) because of intermittent failures 2014-11-28 11:21:43 -05:00
Rob Wood
9af2a91f89 Backed out changeset b93c92150721 (bug 984508) because of intermittent failures 2014-11-28 11:21:21 -05:00
Chris Manchester
2acd46c0aa Bug 1105082 - Send the correct error when attempting to navigate with marionette in chrome scope.;r=ato 2014-11-26 16:25:55 -05:00
Dave Hunt
160b5aa67e Bug 1097032 - Add test for expected.elements_present when there are no elements found. r=atolfsen 2014-11-25 15:20:00 -05:00
Dave Hunt
adaff9fc42 Bug 1015242 - Provide a combined expected condition for element present and displayed. r=atolfsen
CLOSED TREE
2014-11-26 04:19:00 -05:00
Morris Tseng
643c4fbaf6 Backed out 5 changesets (bug 1092888) for breaking QA smoketest on b2g.
Backout changeset 8c513f282a9e (bug 1092888)
Backout changeset db37104f6fbd (bug 1092888)
Backout changeset b1a0a7ea1a32 (bug 1092888)
Backout changeset c53a6181a4b2 (bug 1092888)
Backout changeset 54e551c1f2cd (bug 1092888)
2014-11-26 10:11:38 +08:00
Andrew Halberstadt
9bc95683df Bug 1088666 - Re-organize marionette client's documentation into basic, advanced and api reference sections, r=AutomatedTester, DONTBUILD because NPOTB
--HG--
extra : rebase_source : 4dc97864c6944d1b102ab7ab98287b480fe51ad7
2014-11-24 09:49:42 -05:00
Dave Hunt
30aa4fc63b Bug 1103956 - Remove explicit type checking from Wait class. r=atolfsen 2014-11-24 05:44:00 +01:00
Wes Kocher
6d1fabc862 Bug 1104301 - Re-disable this test on linux after an accidental reenabling. r=me 2014-11-24 16:23:51 -08:00
Rob Wood
9a5408ffa8 Bug 984508 - Marionette should monitor listeners to ensure they're still alive; r=mdas 2014-10-14 18:46:34 -04:00
Chris Manchester
fdaf4a660a Bug 1103071 - Modify test_switch_remote_frame for compatibility with e10s. r=jgriffin 2014-11-21 14:26:48 -05:00
Chris Manchester
2c97e12119 Bug 1095260 - Make the response from a switchToWindow call correspond to the completion of loading the marionette listener script.;r=automatedtester 2014-11-21 13:58:00 -05:00
Ted Mielczarek
13cbcf82e1 Bug 1101539 - Make Marionette's GeckoInstance actually support passing a nonstandard port. r=jgriffin 2014-11-20 08:34:37 -05:00
David Burns
40e1ad900d Bug 1101172: Correct Exception thrown when passing invalid element search type; r=jgriffin
--HG--
extra : rebase_source : 8da9313980a4895b72dcff1f2e46efe241a14c26
2014-11-19 01:26:14 +00:00
David Burns
d8643cde3b Bug 1094441: Allow CSS Selector as a search strategy for Marionette in Chrome context; r=ahal
--HG--
extra : rebase_source : bfbd853e362e62d55ffb0fefff36667aa60ca04f
2014-11-18 22:57:23 +00:00
Chris Manchester
005f71fd1e Bug 1095635 - Accept '-' to correspond to stdout for marionette's --gecko-log option.;r=ahal 2014-11-17 22:21:51 -05:00
Chris Manchester
d2e6dc8cd7 Bug 1093707 - Return an error from marionette when attempting to navigate in chrome scope.;r=ato 2014-11-17 22:21:51 -05:00
Dave Hunt
6042b320b2 Bug 1089536 - Allow multiple test variable files to be specified on the command line. r=mdas 2014-11-18 13:34:46 +00:00
Dave Hunt
0336150f87 Bug 1001322 - Move wait_for_port to transport.py and call when starting a new session. r=mdas 2014-11-18 13:31:34 +00:00
Morris Tseng
165b76639e Bug 1092888 - Part 5: Add a parameter to toggle context menu when calling long_press. r=mdas 2014-11-16 18:52:00 +01:00
Wes Kocher
7fc6656368 Backed out changeset e9029cbd137c (bug 940954) for Gip bustage on a CLOSED TREE 2014-11-17 16:45:49 -08:00
Wes Kocher
718ffa5868 Bug 940954: Allow marionette to restart the browser and create a new session; r=jgriffin DONTBUILD
This gives us the ability to restart a session from the client side, say for testing Firefox updates,
and then carry on the test. To do this it is just self.marionette.restart()
2014-11-17 15:52:03 -08:00
Wes Kocher
0769b042a3 Backed out changeset ec9fc64e82a8 (bug 940955) for landing with the wrong bug number 2014-11-17 15:51:09 -08:00
David Burns
fdae0e16ae Bug 940955: Allow marionette to restart the browser and create a new session; r=jgriffin
This gives us the ability to restart a session from the client side, say for testing Firefox updates,
and then carry on the test. To do this it is just self.marionette.restart()

--HG--
extra : rebase_source : db352f88ebfc455ed8105eefac54fec6a0b0c40b
2014-11-17 11:38:37 +00:00
Carsten "Tomcat" Book
50f07b7e84 Backed out changeset d1962cb07ea5 (bug 1089536) for marionette test failures 2014-11-14 12:36:19 +01:00
Dave Hunt
6a7503a73f Bug 1089536 - Allow multiple test variable files to be specified on the command line. r=mdas 2014-11-14 10:21:42 +00:00
Andrew Halberstadt
fe9a8d4694 Bug 1084412 - marionette.findElements returns immediately when searchTimeout is set, r=AutomatedTester
--HG--
extra : rebase_source : bd89e6209edaa5a4a5f7552dc548e0db120c88e8
2014-11-10 17:17:09 -05:00
Andrew Halberstadt
f547a9e2fc Bug 1096571 - Don't call into webdriver's isShown() method when manipulating content XUL in marionette, r=AutomatedTester
--HG--
extra : rebase_source : 73029f3246e37a958ba8a6c90bf0c11a97f389c2
2014-11-10 16:44:00 -05:00
Ryan VanderMeulen
f24acb59af Backed out changeset 92fc5580994a (bug 1038868) for causing intermittent OSX Marionette timeouts.
--HG--
extra : rebase_source : dcf4d8c25d8612b043c3a08a862ffef99c16fd95
2014-11-12 14:39:59 -05:00
Chris Manchester
cfa9e8f212 Bug 1095018 - Forward marionette's cookie interactions to the parent process for compatibility with e10s.;r=ato
* * *
Fixes based on review feedback.
2014-11-11 13:15:02 -05:00