Bug 1245153 - Remove testing/marionette/atoms; r=automatedtester
☠☠ backed out by 2baea2550106 ☠ ☠
authorAndreas Tolfsen <ato@mozilla.com>
Wed, 03 Feb 2016 19:00:46 +0000
changeset 320308 5fe42d498a2a4511b3d479c4d75b078817f05632
parent 320307 b3be2d2f3ac1e2d10a39202e463178101a47e840
child 320309 63a56310a1b5593eeec4d546c87c9e9c4c04252d
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersautomatedtester
bugs1245153
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1245153 - Remove testing/marionette/atoms; r=automatedtester MozReview-Commit-ID: 1aeRNnvqmcS
testing/marionette/atom.js
testing/marionette/atoms/HOWTO
testing/marionette/atoms/atoms.js
testing/marionette/atoms/jar.mn
testing/marionette/atoms/moz.build
testing/marionette/driver.js
testing/marionette/elements.js
testing/marionette/interactions.js
testing/marionette/jar.mn
testing/marionette/listener.js
testing/marionette/moz.build
rename from testing/marionette/atoms/atoms.js
rename to testing/marionette/atom.js
deleted file mode 100644
--- 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 = <atom code>
-
-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
deleted file mode 100644
--- 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)
deleted file mode 100644
--- 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
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -19,17 +19,17 @@ Cu.import("resource://gre/modules/XPCOMU
 
 var {devtools} = Cu.import("resource://devtools/shared/Loader.jsm", {});
 this.DevToolsUtils = devtools.require("devtools/shared/DevToolsUtils");
 
 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");
 Cu.import("chrome://marionette/content/frame-manager.js");
 Cu.import("chrome://marionette/content/error.js");
 Cu.import("chrome://marionette/content/modal.js");
 Cu.import("chrome://marionette/content/proxy.js");
 Cu.import("chrome://marionette/content/simpletest.js");
--- a/testing/marionette/elements.js
+++ b/testing/marionette/elements.js
@@ -1,17 +1,17 @@
 /* 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/. */
 
 "use strict";
 
 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");
 
 /**
  * The ElementManager manages DOM element references and
  * interactions with elements.
  *
  * A web element is an abstraction used to identify an element when it
  * is transported across the protocol, between remote- and local ends.
--- a/testing/marionette/interactions.js
+++ b/testing/marionette/interactions.js
@@ -2,17 +2,17 @@
  * 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/. */
 
 "use strict";
 
 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");
 
 this.EXPORTED_SYMBOLS = ["Interactions"];
 
 /**
  * XUL elements that support disabled attribtue.
--- a/testing/marionette/jar.mn
+++ b/testing/marionette/jar.mn
@@ -19,16 +19,17 @@ marionette.jar:
   content/error.js (error.js)
   content/message.js (message.js)
   content/dispatcher.js (dispatcher.js)
   content/emulator.js (emulator.js)
   content/modal.js (modal.js)
   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)
   content/test_nested_iframe.xul  (client/marionette/chrome/test_nested_iframe.xul)
   content/test_anonymous_content.xul  (client/marionette/chrome/test_anonymous_content.xul)
 #endif
 
 % content specialpowers %content/
--- a/testing/marionette/listener.js
+++ b/testing/marionette/listener.js
@@ -9,17 +9,17 @@ var uuidGen = Cc["@mozilla.org/uuid-gene
 
 var loader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
     .getService(Ci.mozIJSSubScriptLoader);
 
 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");
 Cu.import("chrome://marionette/content/error.js");
 Cu.import("chrome://marionette/content/event.js");
 Cu.import("chrome://marionette/content/proxy.js");
 Cu.import("chrome://marionette/content/interactions.js");
 
--- a/testing/marionette/moz.build
+++ b/testing/marionette/moz.build
@@ -1,13 +1,13 @@
 # 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/.
 
-DIRS += ["components", "atoms"]
+DIRS += ["components"]
 
 JAR_MANIFESTS += ["jar.mn"]
 MARIONETTE_UNIT_MANIFESTS += ['client/marionette/tests/unit/unit-tests.ini']
 MARIONETTE_UPDATE_MANIFESTS += ['client/marionette/tests/update-tests.ini']
 MARIONETTE_WEBAPI_MANIFESTS += ['client/marionette/tests/webapi-tests.ini']
 XPCSHELL_TESTS_MANIFESTS += ["unit.ini"]
 
 with Files("**"):