Skip to content

Commit

Permalink
* All js_fragment definitions based on atoms code belong in
Browse files Browse the repository at this point in the history
//javascript/atoms/fragments/build.desc

* Removed redundant js_fragment rules.
  • Loading branch information
jleyba committed Dec 30, 2013
1 parent 80649a0 commit 9455d43
Show file tree
Hide file tree
Showing 3 changed files with 156 additions and 169 deletions.
56 changes: 28 additions & 28 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -596,34 +596,34 @@ end
task :sizzle_header => [ "cpp/iedriver/sizzle.h" ]

task :ios_driver => [
"//javascript/atoms:getVisibleText:ios",
"//javascript/atoms:isShown:ios",
"//javascript/atoms:click:ios",
"//javascript/atoms:back:ios",
"//javascript/atoms:forward:ios",
"//javascript/atoms:submit:ios",
"//javascript/atoms:refresh:ios",
"//javascript/atoms:xpath:ios",
"//javascript/atoms:xpaths:ios",
"//javascript/atoms:type:ios",
"//javascript/atoms:getAttribute:ios",
"//javascript/atoms:clear:ios",
"//javascript/atoms:isSelected:ios",
"//javascript/atoms:isEnabled:ios",
"//javascript/atoms:stringify:ios",
"//javascript/atoms:linkText:ios",
"//javascript/atoms:linkTexts:ios",
"//javascript/atoms:partialLinkText:ios",
"//javascript/atoms:partialLinkTexts:ios",
"//javascript/atoms:getLocationInView:ios",
"//javascript/atoms:getInteractableSize:ios",
"//javascript/atoms:scrollIntoView:ios",
"//javascript/atoms:getPageOffset:ios",
"//javascript/atoms:getFramedPageOffset:ios",
"//javascript/atoms:getPosition:ios",
"//javascript/atoms:getViewPortSize:ios",
"//javascript/atoms:getEffectiveStyle:ios",
"//javascript/atoms:setCursorAtTheEnd:ios"
"//javascript/atoms/fragments:get_visible_text:ios",
"//javascript/atoms/fragments:is_displayed:ios",
"//javascript/atoms/fragments:click:ios",
"//javascript/atoms/fragments:back:ios",
"//javascript/atoms/fragments:forward:ios",
"//javascript/atoms/fragments:submit:ios",
"//javascript/atoms/fragments:refresh:ios",
"//javascript/atoms/fragments:xpath:ios",
"//javascript/atoms/fragments:xpaths:ios",
"//javascript/atoms/fragments:type:ios",
"//javascript/atoms/fragments:get_attribute:ios",
"//javascript/atoms/fragments:clear:ios",
"//javascript/atoms/fragments:is_selected:ios",
"//javascript/atoms/fragments:is_enabled:ios",
"//javascript/atoms/fragments:stringify:ios",
"//javascript/atoms/fragments:link_text:ios",
"//javascript/atoms/fragments:link_texts:ios",
"//javascript/atoms/fragments:partial_link_text:ios",
"//javascript/atoms/fragments:partial_link_texts:ios",
"//javascript/atoms/fragments:get_location_in_view:ios",
"//javascript/atoms/fragments:get_interactable_size:ios",
"//javascript/atoms/fragments:scroll_into_view:ios",
"//javascript/atoms/fragments:get_page_offset:ios",
"//javascript/atoms/fragments:get_framed_page_offset:ios",
"//javascript/atoms/fragments:get_position:ios",
"//javascript/atoms/fragments:get_view_port_size:ios",
"//javascript/atoms/fragments:get_effective_style:ios",
"//javascript/atoms/fragments:set_cursor_at_the_end:ios"
]

file "build/javascript/deps.js" => FileList[
Expand Down
143 changes: 2 additions & 141 deletions javascript/atoms/build.desc
Original file line number Diff line number Diff line change
Expand Up @@ -53,146 +53,7 @@ js_test(name = "test",
"//java/server/test/org/openqa/selenium:server-with-tests:uber",
])

js_fragment( name = "getVisibleText",
module ="bot.dom",
function = "bot.dom.getVisibleText",
deps = [ "//javascript/atoms:all_js"])

js_fragment(name="isShown",
module="bot.dom",
function="bot.dom.isShown",
deps=["//javascript/atoms:all_js"])

js_fragment(name="click",
module="bot.action",
function="bot.action.click",
deps=["//javascript/atoms:all_js"])

js_fragment(name="back",
module="bot.window",
function="bot.window.back",
deps=["//javascript/atoms:all_js"])

js_fragment(name="forward",
module="bot.window",
function="bot.window.forward",
deps=["//javascript/atoms:all_js"])

js_fragment(name="submit",
module="bot.action",
function="bot.action.submit",
deps=["//javascript/atoms:all_js"])


js_fragment(name="refresh",
module="bot.window",
function="bot.window.refresh",
deps=["//javascript/atoms:all_js"])

js_fragment(name="xpath",
module="bot.locators.xpath",
function="bot.locators.xpath.single",
deps=["//javascript/atoms:all_js"])


js_fragment(name="xpaths",
module="bot.locators.xpath",
function="bot.locators.xpath.many",
deps=["//javascript/atoms:all_js"])


js_fragment(name="type",
module="bot.action",
function="bot.action.type",
deps=["//javascript/atoms:all_js"])


js_fragment(name="getAttribute",
module="bot.dom",
function="bot.dom.getAttribute",
deps=["//javascript/atoms:all_js"])

js_fragment(name="clear",
module="bot.action",
function="bot.action.clear",
deps=["//javascript/atoms:all_js"])

js_fragment(name="isSelected",
module="bot.dom",
function="bot.dom.isSelected",
deps=["//javascript/atoms:all_js"])

js_fragment(name="isEnabled",
module="bot.dom",
function="bot.dom.isEnabled",
deps=["//javascript/atoms:all_js"])

js_fragment(name="stringify",
module="bot.json",
function="bot.json.stringify",
deps=["//javascript/atoms:all_js"])

js_fragment(name="linkText",
module="bot.locators.linkText",
function="bot.locators.linkText.single",
deps=["//javascript/atoms:all_js"])

js_fragment(name="linkTexts",
module="bot.locators.linkText",
function="bot.locators.linkText.many",
deps=["//javascript/atoms:all_js"])

js_fragment(name="partialLinkText",
module="bot.locators.linkText",
function="bot.locators.partialLinkText.single",
deps=["//javascript/atoms:all_js"])

js_fragment(name="partialLinkTexts",
module="bot.locators.linkText",
function="bot.locators.partialLinkText.many",
deps=["//javascript/atoms:all_js"])

js_fragment(name="getLocationInView",
module="bot.dom",
function="bot.dom.getLocationInView",
deps=["//javascript/atoms:all_js"])

js_fragment(name="getInteractableSize",
module="bot.window",
function="bot.window.getInteractableSize",
deps=["//javascript/atoms:all_js"])

js_fragment(name="scrollIntoView",
module="bot.action",
function="bot.action.scrollIntoView",
deps=["//javascript/atoms:all_js"])

js_fragment(name="getPageOffset",
module="bot.dom",
function="bot.dom.getPageOffset",
deps=["//javascript/atoms:all_js"])

js_fragment(name="getFramedPageOffset",
module="bot.dom",
function="bot.dom.getFramedPageOffset",
deps=["//javascript/atoms:all_js"])

js_fragment(name="getPosition",
module="bot.dom",
function="bot.dom.getPosition",
deps=["//javascript/atoms:all_js"])

js_fragment(name="getViewPortSize",
module="bot.dom",
function="bot.dom.getViewPortSize",
deps=["//javascript/atoms:all_js"])

js_fragment(name="setCursorAtTheEnd",
module="bot.Keyboard",
function="bot.Keyboard.setCursorAtTheEnd",
deps=["//javascript/atoms:all_js"])

js_fragment(name="getEffectiveStyle",
module="bot.dom",
function="bot.dom.getEffectiveStyle",
deps=["//javascript/atoms:all_js"])


126 changes: 126 additions & 0 deletions javascript/atoms/fragments/build.desc
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,72 @@ js_fragment(
module = "bot.locators",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "get_attribute",
module = "bot.dom",
function = "bot.dom.getAttribute",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "get_effective_style",
function = "bot.dom.getEffectiveStyle",
module = "bot.dom",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "get_framed_page_offset",
module = "bot.dom",
function = "bot.dom.getFramedPageOffset",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "get_interactable_size",
module = "bot.window",
function = "bot.window.getInteractableSize",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "get_location",
function = "goog.style.getPageOffset",
module = "goog.style",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "get_location_in_view",
module = "bot.dom",
function = "bot.dom.getLocationInView",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "get_page_offset",
module = "bot.dom",
function = "bot.dom.getPageOffset",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "get_position",
module = "bot.dom",
function = "bot.dom.getPosition",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "get_size",
function = "goog.style.getSize",
module = "goog.style",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "get_view_port_size",
module = "bot.dom",
function = "bot.dom.getViewPortSize",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "get_visible_text",
function = "bot.dom.getVisibleText",
module = "bot.dom",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "is_displayed",
function = "bot.dom.isShown",
Expand All @@ -76,6 +124,54 @@ js_fragment(
module = "bot.dom",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "is_selected",
function = "bot.dom.isSelected",
module = "bot.dom",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "link_text",
module = "bot.locators.linkText",
function = "bot.locators.linkText.single",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "link_texts",
module = "bot.locators.linkText",
function = "bot.locators.linkText.many",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "partial_link_text",
module = "bot.locators.linkText",
function = "bot.locators.partialLinkText.single",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "partial_link_texts",
module = "bot.locators.linkText",
function = "bot.locators.partialLinkText.many",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "scroll_into_view",
module = "bot.action",
function = "bot.action.scrollIntoView",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "set_cursor_at_the_end",
module = "bot.Keyboard",
function = "bot.Keyboard.setCursorAtTheEnd",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "stringify",
module = "bot.json",
function = "bot.json.stringify",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "submit",
function = "bot.action.submit",
Expand Down Expand Up @@ -135,3 +231,33 @@ js_fragment(
function = "bot.storage.database.executeSql",
module = "bot.storage.database",
deps = [ "//javascript/atoms:all_js" ])

js_fragment(
name = "back",
module = "bot.window",
function = "bot.window.back",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "forward",
module = "bot.window",
function = "bot.window.forward",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "refresh",
module = "bot.window",
function = "bot.window.refresh",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "xpath",
module = "bot.locators.xpath",
function = "bot.locators.xpath.single",
deps = ["//javascript/atoms:all_js"])

js_fragment(
name = "xpaths",
module = "bot.locators.xpath",
function = "bot.locators.xpath.many",
deps = ["//javascript/atoms:all_js"])

0 comments on commit 9455d43

Please sign in to comment.