Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 5a2e085824ae (bug 1107336)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2015-01-21 16:10:57 +01:00
parent 7137cb17aa
commit b038666e4a
4 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layout/base/tests/marionette/test_selectioncarets.py
View File

@ -3,11 +3,11 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
from marionette_driver.by import By from by import By
from marionette_driver.marionette import Actions from marionette import Actions
from marionette_test import MarionetteTestCase from marionette_test import MarionetteTestCase
from marionette_driver.selection import SelectionManager from selection import SelectionManager
from marionette_driver.gestures import long_press_without_contextmenu from gestures import long_press_without_contextmenu
class SelectionCaretsTest(MarionetteTestCase): class SelectionCaretsTest(MarionetteTestCase):

8
layout/base/tests/marionette/test_selectioncarets_multiplerange.py
View File

@ -3,11 +3,11 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
from marionette_driver.by import By from by import By
from marionette_driver.marionette import Actions from marionette import Actions
from marionette_test import MarionetteTestCase from marionette_test import MarionetteTestCase
from marionette_driver.selection import SelectionManager from selection import SelectionManager
from marionette_driver.gestures import long_press_without_contextmenu from gestures import long_press_without_contextmenu
class SelectionCaretsMultipleRangeTest(MarionetteTestCase): class SelectionCaretsMultipleRangeTest(MarionetteTestCase):

29
testing/marionette/client/marionette/__init__.py
View File

@ -2,7 +2,33 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
from marionette_driver.gestures import smooth_scroll, pinch
from marionette_driver.by import By
from marionette_driver.marionette import Marionette, HTMLElement, Actions, MultiActions
from marionette_test import MarionetteTestCase, MarionetteJSTestCase, CommonTestCase, expectedFailure, skip, SkipTest from marionette_test import MarionetteTestCase, MarionetteJSTestCase, CommonTestCase, expectedFailure, skip, SkipTest
from marionette_driver.errors import (
ElementNotVisibleException,
ElementNotAccessibleException,
ErrorCodes,
FrameSendFailureError,
FrameSendNotInitializedError,
InvalidCookieDomainException,
InvalidElementStateException,
InvalidResponseException,
InvalidSelectorException,
JavascriptException,
MarionetteException,
MoveTargetOutOfBoundsException,
NoAlertPresentException,
NoSuchElementException,
NoSuchFrameException,
NoSuchWindowException,
ScriptTimeoutException,
StaleElementException,
TimeoutException,
UnableToSetCookieException,
XPathLookupException,
)
from runner import ( from runner import (
B2GTestCaseMixin, B2GTestCaseMixin,
B2GTestResultMixin, B2GTestResultMixin,
@ -24,3 +50,6 @@ from runner import (
TestResult, TestResult,
TestResultCollection TestResultCollection
) )
from marionette_driver.wait import Wait
from marionette_driver.date_time_value import DateTimeValue
import marionette_driver.decorators

6
testing/marionette/driver/marionette_driver/__init__.py
View File

@ -1,8 +1,4 @@
from marionette_driver import ( errors, by, decorators, expected, geckoinstance, from marionette_driver import ( errors, by, decorators, expected, geckoinstance,
gestures, keys, marionette, selection, wait, gestures, keys, marionette, selection, wait,
application_cache, date_time_value ) application_cache, date_time_value )
from marionette_driver.by import By from marionette_driver.gestures import smooth_scroll, pinch
from marionette_driver.date_time_value import DateTimeValue
from marionette_driver.gestures import smooth_scroll, pinch
from marionette_driver.wait import Wait