From 85d23f20525cfc4e10a9ef2d7f9f23f3ffbd18ba Mon Sep 17 00:00:00 2001 From: Andreas Tolfsen Date: Wed, 3 Feb 2016 19:00:46 +0000 Subject: [PATCH] Bug 1245153 - Remove testing/marionette/atoms; r=automatedtester MozReview-Commit-ID: 1aeRNnvqmcS --HG-- rename : testing/marionette/atoms/atoms.js => testing/marionette/atom.js extra : histedit_source : 3f864808e86d7cafbcb9edee3702f9cc16089b76 extra : rebase_source : 8d80f0505b8b0b3779eb04165c98c72f284ce573 extra : commitid : Ekqmuuhp0pC extra : source : 3edb67388ad6bbdee9f735b2a99d1999a1af0a46 extra : amend_source : 142a6496da5d8c7edb72b27f27944add2ce0dc8d extra : intermediate-source : 5fe42d498a2a4511b3d479c4d75b078817f05632 --- .../marionette/{atoms/atoms.js => atom.js} | 0 testing/marionette/atoms/HOWTO | 29 ------------------- testing/marionette/atoms/jar.mn | 7 ----- testing/marionette/atoms/moz.build | 7 ----- testing/marionette/driver.js | 2 +- testing/marionette/elements.js | 2 +- testing/marionette/interactions.js | 2 +- testing/marionette/jar.mn | 1 + testing/marionette/listener.js | 2 +- testing/marionette/moz.build | 2 +- 10 files changed, 6 insertions(+), 48 deletions(-) rename testing/marionette/{atoms/atoms.js => atom.js} (100%) delete mode 100644 testing/marionette/atoms/HOWTO delete mode 100644 testing/marionette/atoms/jar.mn delete mode 100644 testing/marionette/atoms/moz.build diff --git a/testing/marionette/atoms/atoms.js b/testing/marionette/atom.js similarity index 100% rename from testing/marionette/atoms/atoms.js rename to testing/marionette/atom.js diff --git a/testing/marionette/atoms/HOWTO b/testing/marionette/atoms/HOWTO deleted file mode 100644 index 72829e665e3f..000000000000 --- a/testing/marionette/atoms/HOWTO +++ /dev/null @@ -1,29 +0,0 @@ -These atoms are generated from the selenium trunk. They are minified versions of what's in the trunk, -optimized to run on Firefox. To generate them, clone the repo: - - svn checkout http://selenium.googlecode.com/svn/trunk/ selenium-read-only - -then run the Google closure compiler and specify which atom you'd like to get. -For example, this will generate the "get_text" atom: - - cd selenium-read-only - ./go //javascript/webdriver/atoms:get_text:firefox - -This generates the atom, which is a function. You'll need to assign that function to a variable of your choice -which you can then import, i.e.: you'll need to modify the atom with a variable assignment: - - var myVar = - -You can now import this atom and call it with myVar(). Please note the name of the function as a comment above this line to help readability in the atoms file. - -For more information on atoms, refer to http://code.google.com/p/selenium/wiki/AutomationAtoms#Atoms_Summary - -Currently bundled atoms (please update as you add more): -- clearElement -- click -- getAttributeValue -- getElementText -- isElementDisplayed -- isElementEnabled -- isElementSelected -- sendKeysToElement/type diff --git a/testing/marionette/atoms/jar.mn b/testing/marionette/atoms/jar.mn deleted file mode 100644 index 99d47021c84b..000000000000 --- a/testing/marionette/atoms/jar.mn +++ /dev/null @@ -1,7 +0,0 @@ -# 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/. - -marionette.jar: -% content marionette %content/ - content/atoms.js (atoms.js) diff --git a/testing/marionette/atoms/moz.build b/testing/marionette/atoms/moz.build deleted file mode 100644 index c97072bba2df..000000000000 --- a/testing/marionette/atoms/moz.build +++ /dev/null @@ -1,7 +0,0 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# 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/. - -JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/testing/marionette/driver.js b/testing/marionette/driver.js index f699e17eace6..3695def67e8f 100644 --- a/testing/marionette/driver.js +++ b/testing/marionette/driver.js @@ -24,7 +24,7 @@ XPCOMUtils.defineLazyServiceGetter( this, "cookieManager", "@mozilla.org/cookiemanager;1", "nsICookieManager2"); Cu.import("chrome://marionette/content/actions.js"); -Cu.import("chrome://marionette/content/atoms.js"); +Cu.import("chrome://marionette/content/atom.js"); Cu.import("chrome://marionette/content/interactions.js"); Cu.import("chrome://marionette/content/elements.js"); Cu.import("chrome://marionette/content/event.js"); diff --git a/testing/marionette/elements.js b/testing/marionette/elements.js index 297178d75f95..21e55d70a97c 100644 --- a/testing/marionette/elements.js +++ b/testing/marionette/elements.js @@ -6,7 +6,7 @@ const {classes: Cc, interfaces: Ci, utils: Cu} = Components; -Cu.import("chrome://marionette/content/atoms.js"); +Cu.import("chrome://marionette/content/atom.js"); Cu.import("chrome://marionette/content/error.js"); /** diff --git a/testing/marionette/interactions.js b/testing/marionette/interactions.js index 5cea585322bd..25c2b0fa5ce5 100644 --- a/testing/marionette/interactions.js +++ b/testing/marionette/interactions.js @@ -7,7 +7,7 @@ const {utils: Cu} = Components; Cu.import("chrome://marionette/content/accessibility.js"); -Cu.import("chrome://marionette/content/atoms.js"); +Cu.import("chrome://marionette/content/atom.js"); Cu.import("chrome://marionette/content/error.js"); Cu.import("chrome://marionette/content/elements.js"); Cu.import("chrome://marionette/content/event.js"); diff --git a/testing/marionette/jar.mn b/testing/marionette/jar.mn index cae32f2cb623..7bd349d361b6 100644 --- a/testing/marionette/jar.mn +++ b/testing/marionette/jar.mn @@ -24,6 +24,7 @@ marionette.jar: content/proxy.js (proxy.js) content/capture.js (capture.js) content/cookies.js (cookies.js) + content/atom.js (atom.js) #ifdef ENABLE_TESTS content/test.xul (client/marionette/chrome/test.xul) content/test2.xul (client/marionette/chrome/test2.xul) diff --git a/testing/marionette/listener.js b/testing/marionette/listener.js index 7b61fb76f187..d64646908de7 100644 --- a/testing/marionette/listener.js +++ b/testing/marionette/listener.js @@ -14,7 +14,7 @@ loader.loadSubScript("chrome://marionette/content/simpletest.js"); loader.loadSubScript("chrome://marionette/content/common.js"); Cu.import("chrome://marionette/content/actions.js"); -Cu.import("chrome://marionette/content/atoms.js"); +Cu.import("chrome://marionette/content/atom.js"); Cu.import("chrome://marionette/content/capture.js"); Cu.import("chrome://marionette/content/cookies.js"); Cu.import("chrome://marionette/content/elements.js"); diff --git a/testing/marionette/moz.build b/testing/marionette/moz.build index 9c0b3a39f60a..2df34a120fa5 100644 --- a/testing/marionette/moz.build +++ b/testing/marionette/moz.build @@ -2,7 +2,7 @@ # 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/. -DIRS += ["components", "atoms"] +DIRS += ["components"] JAR_MANIFESTS += ["jar.mn"] MARIONETTE_UNIT_MANIFESTS += ['client/marionette/tests/unit/unit-tests.ini']