@@ -12,11 +12,7 @@ require 'spec/rake/spectask' require 'selenium/rake/tasks' CLEAN.include("COMMENTS") -CLEAN.include( - 'lib/selenium/client/generated_driver.rb', - '**/*.log', - "target" -) +CLEAN.include('lib/selenium/client/generated_driver.rb', '**/*.log', "target", "pkg") if ENV["SELENIUM_RC_JAR"] # User override @@ -149,7 +145,7 @@ end specification = Gem::Specification.new do |s| s.name = "selenium-client" s.summary = "Official Ruby Client for Selenium RC." - s.version = "1.3" + s.version = "1.2" s.author = "OpenQA" s.email = 'selenium-client@rubyforge.org' s.homepage = "http://selenium-client.rubyforge.com" @@ -165,9 +161,12 @@ specification = Gem::Specification.new do |s| end Rake::GemPackageTask.new(specification) do |package| - package.need_zip = false - package.need_tar = false + package.need_zip = false + package.need_tar = false end + +desc "Build the RubyGem" +task :gem desc "Generate documentation" Rake::RDocTask.new("rdoc") do |rdoc| Rakefile @@ -198,7 +198,7 @@ FUNCTION <xsl:text>)&nl;&tab;&tab;&tab;</xsl:text> <xsl:if test="count(./return) = 0"> - <xsl:text>do_command</xsl:text> + <xsl:text>remote_control_command</xsl:text> </xsl:if> <xsl:apply-templates select="return" mode="implementation" /> <xsl:text>("</xsl:text> @@ -216,22 +216,22 @@ RETURN <xsl:param name="type" /> <xsl:choose> <xsl:when test="$type='string'"> - <xsl:text>get_string</xsl:text> + <xsl:text>string_command</xsl:text> </xsl:when> <xsl:when test="$type='number'"> - <xsl:text>get_number</xsl:text> + <xsl:text>number_command</xsl:text> </xsl:when> <xsl:when test="$type='boolean'"> - <xsl:text>get_boolean</xsl:text> + <xsl:text>boolean_command</xsl:text> </xsl:when> <xsl:when test="$type='string[]'"> - <xsl:text>get_string_array</xsl:text> + <xsl:text>string_array_command</xsl:text> </xsl:when> <xsl:when test="$type='number[]'"> - <xsl:text>get_number_array</xsl:text> + <xsl:text>number_array_command</xsl:text> </xsl:when> <xsl:when test="$type='boolean[]'"> - <xsl:text>get_boolean_array</xsl:text> + <xsl:text>boolean_array_command</xsl:text> </xsl:when> <xsl:otherwise> <xsl:message terminate="yes">returntype is invalid: <xsl:value-of select="$type"/></xsl:message> iedoc2ruby.xml @@ -150,11 +150,11 @@ module Selenium end def stop() - do_command("testComplete", []) + remote_control_command("testComplete", []) @session_id = nil end - def do_command(verb, args) + def remote_control_command(verb, args) timeout(@timeout) do http = Net::HTTP.new(@server_host, @server_port) command_string = '/selenium-server/driver/?cmd=' + CGI::escape(verb) @@ -176,11 +176,11 @@ module Selenium end def get_string(verb, args) - result = do_command(verb, args) + result = remote_control_command(verb, args) return result[3..result.length] end - def get_string_array(verb, args) + def string_array_command(verb, args) csv = get_string(verb, args) token = "" tokens = [] @@ -204,17 +204,17 @@ module Selenium return tokens end - def get_number(verb, args) + def number_command(verb, args) # Is there something I need to do here? return get_string(verb, args) end - def get_number_array(verb, args) + def number_array_command(verb, args) # Is there something I need to do here? - return get_string_array(verb, args) + return string_array_command(verb, args) end - def get_boolean(verb, args) + def boolean_command(verb, args) boolstr = get_string(verb, args) if ("true" == boolstr) return true @@ -225,8 +225,8 @@ module Selenium raise ValueError, "result is neither 'true' nor 'false': " + boolstr end - def get_boolean_array(verb, args) - boolarr = get_string_array(verb, args) + def boolean_array_command(verb, args) + boolarr = string_array_command(verb, args) boolarr.length.times do |i| if ("true" == boolstr) boolarr[i] = true @@ -249,7 +249,7 @@ module Selenium # # 'locator' is an element locator def click(locator) - do_command("click", [locator,]) + remote_control_command("click", [locator,]) end @@ -259,7 +259,7 @@ module Selenium # # 'locator' is an element locator def double_click(locator) - do_command("doubleClick", [locator,]) + remote_control_command("doubleClick", [locator,]) end @@ -267,7 +267,7 @@ module Selenium # # 'locator' is an element locator def context_menu(locator) - do_command("contextMenu", [locator,]) + remote_control_command("contextMenu", [locator,]) end @@ -278,7 +278,7 @@ module Selenium # 'locator' is an element locator # 'coordString' is specifies the x,y position (i.e. - 10,20) of the mouse event relative to the element returned by the locator. def click_at(locator,coordString) - do_command("clickAt", [locator,coordString,]) + remote_control_command("clickAt", [locator,coordString,]) end @@ -289,7 +289,7 @@ module Selenium # 'locator' is an element locator # 'coordString' is specifies the x,y position (i.e. - 10,20) of the mouse event relative to the element returned by the locator. def double_click_at(locator,coordString) - do_command("doubleClickAt", [locator,coordString,]) + remote_control_command("doubleClickAt", [locator,coordString,]) end @@ -298,7 +298,7 @@ module Selenium # 'locator' is an element locator # 'coordString' is specifies the x,y position (i.e. - 10,20) of the mouse event relative to the element returned by the locator. def context_menu_at(locator,coordString) - do_command("contextMenuAt", [locator,coordString,]) + remote_control_command("contextMenuAt", [locator,coordString,]) end @@ -308,7 +308,7 @@ module Selenium # 'locator' is an element locator # 'eventName' is the event name, e.g. "focus" or "blur" def fire_event(locator,eventName) - do_command("fireEvent", [locator,eventName,]) + remote_control_command("fireEvent", [locator,eventName,]) end @@ -316,7 +316,7 @@ module Selenium # # 'locator' is an element locator def focus(locator) - do_command("focus", [locator,]) + remote_control_command("focus", [locator,]) end @@ -325,63 +325,63 @@ module Selenium # 'locator' is an element locator # 'keySequence' is Either be a string("\" followed by the numeric keycode of the key to be pressed, normally the ASCII value of that key), or a single character. For example: "w", "\119". def key_press(locator,keySequence) - do_command("keyPress", [locator,keySequence,]) + remote_control_command("keyPress", [locator,keySequence,]) end # Press the shift key and hold it down until doShiftUp() is called or a new page is loaded. # def shift_key_down() - do_command("shiftKeyDown", []) + remote_control_command("shiftKeyDown", []) end # Release the shift key. # def shift_key_up() - do_command("shiftKeyUp", []) + remote_control_command("shiftKeyUp", []) end # Press the meta key and hold it down until doMetaUp() is called or a new page is loaded. # def meta_key_down() - do_command("metaKeyDown", []) + remote_control_command("metaKeyDown", []) end # Release the meta key. # def meta_key_up() - do_command("metaKeyUp", []) + remote_control_command("metaKeyUp", []) end # Press the alt key and hold it down until doAltUp() is called or a new page is loaded. # def alt_key_down() - do_command("altKeyDown", []) + remote_control_command("altKeyDown", []) end # Release the alt key. # def alt_key_up() - do_command("altKeyUp", []) + remote_control_command("altKeyUp", []) end # Press the control key and hold it down until doControlUp() is called or a new page is loaded. # def control_key_down() - do_command("controlKeyDown", []) + remote_control_command("controlKeyDown", []) end # Release the control key. # def control_key_up() - do_command("controlKeyUp", []) + remote_control_command("controlKeyUp", []) end @@ -390,7 +390,7 @@ module Selenium # 'locator' is an element locator # 'keySequence' is Either be a string("\" followed by the numeric keycode of the key to be pressed, normally the ASCII value of that key), or a single character. For example: "w", "\119". def key_down(locator,keySequence) - do_command("keyDown", [locator,keySequence,]) + remote_control_command("keyDown", [locator,keySequence,]) end @@ -399,7 +399,7 @@ module Selenium # 'locator' is an element locator # 'keySequence' is Either be a string("\" followed by the numeric keycode of the key to be pressed, normally the ASCII value of that key), or a single character. For example: "w", "\119". def key_up(locator,keySequence) - do_command("keyUp", [locator,keySequence,]) + remote_control_command("keyUp", [locator,keySequence,]) end @@ -407,7 +407,7 @@ module Selenium # # 'locator' is an element locator def mouse_over(locator) - do_command("mouseOver", [locator,]) + remote_control_command("mouseOver", [locator,]) end @@ -415,7 +415,7 @@ module Selenium # # 'locator' is an element locator def mouse_out(locator) - do_command("mouseOut", [locator,]) + remote_control_command("mouseOut", [locator,]) end @@ -424,7 +424,7 @@ module Selenium # # 'locator' is an element locator def mouse_down(locator) - do_command("mouseDown", [locator,]) + remote_control_command("mouseDown", [locator,]) end @@ -433,7 +433,7 @@ module Selenium # # 'locator' is an element locator def mouse_down_right(locator) - do_command("mouseDownRight", [locator,]) + remote_control_command("mouseDownRight", [locator,]) end @@ -443,7 +443,7 @@ module Selenium # 'locator' is an element locator # 'coordString' is specifies the x,y position (i.e. - 10,20) of the mouse event relative to the element returned by the locator. def mouse_down_at(locator,coordString) - do_command("mouseDownAt", [locator,coordString,]) + remote_control_command("mouseDownAt", [locator,coordString,]) end @@ -453,7 +453,7 @@ module Selenium # 'locator' is an element locator # 'coordString' is specifies the x,y position (i.e. - 10,20) of the mouse event relative to the element returned by the locator. def mouse_down_right_at(locator,coordString) - do_command("mouseDownRightAt", [locator,coordString,]) + remote_control_command("mouseDownRightAt", [locator,coordString,]) end @@ -462,7 +462,7 @@ module Selenium # # 'locator' is an element locator def mouse_up(locator) - do_command("mouseUp", [locator,]) + remote_control_command("mouseUp", [locator,]) end @@ -471,7 +471,7 @@ module Selenium # # 'locator' is an element locator def mouse_up_right(locator) - do_command("mouseUpRight", [locator,]) + remote_control_command("mouseUpRight", [locator,]) end @@ -481,7 +481,7 @@ module Selenium # 'locator' is an element locator # 'coordString' is specifies the x,y position (i.e. - 10,20) of the mouse event relative to the element returned by the locator. def mouse_up_at(locator,coordString) - do_command("mouseUpAt", [locator,coordString,]) + remote_control_command("mouseUpAt", [locator,coordString,]) end @@ -491,7 +491,7 @@ module Selenium # 'locator' is an element locator # 'coordString' is specifies the x,y position (i.e. - 10,20) of the mouse event relative to the element returned by the locator. def mouse_up_right_at(locator,coordString) - do_command("mouseUpRightAt", [locator,coordString,]) + remote_control_command("mouseUpRightAt", [locator,coordString,]) end @@ -500,7 +500,7 @@ module Selenium # # 'locator' is an element locator def mouse_move(locator) - do_command("mouseMove", [locator,]) + remote_control_command("mouseMove", [locator,]) end @@ -510,7 +510,7 @@ module Selenium # 'locator' is an element locator # 'coordString' is specifies the x,y position (i.e. - 10,20) of the mouse event relative to the element returned by the locator. def mouse_move_at(locator,coordString) - do_command("mouseMoveAt", [locator,coordString,]) + remote_control_command("mouseMoveAt", [locator,coordString,]) end @@ -523,7 +523,7 @@ module Selenium # 'locator' is an element locator # 'value' is the value to type def type(locator,value) - do_command("type", [locator,value,]) + remote_control_command("type", [locator,value,]) end @@ -542,7 +542,7 @@ module Selenium # 'locator' is an element locator # 'value' is the value to type def type_keys(locator,value) - do_command("typeKeys", [locator,value,]) + remote_control_command("typeKeys", [locator,value,]) end @@ -551,7 +551,7 @@ module Selenium # # 'value' is the number of milliseconds to pause after operation def set_speed(value) - do_command("setSpeed", [value,]) + remote_control_command("setSpeed", [value,]) end @@ -569,7 +569,7 @@ module Selenium # # 'locator' is an element locator def check(locator) - do_command("check", [locator,]) + remote_control_command("check", [locator,]) end @@ -577,7 +577,7 @@ module Selenium # # 'locator' is an element locator def uncheck(locator) - do_command("uncheck", [locator,]) + remote_control_command("uncheck", [locator,]) end @@ -620,7 +620,7 @@ module Selenium # 'selectLocator' is an element locator identifying a drop-down menu # 'optionLocator' is an option locator (a label by default) def select(selectLocator,optionLocator) - do_command("select", [selectLocator,optionLocator,]) + remote_control_command("select", [selectLocator,optionLocator,]) end @@ -631,7 +631,7 @@ module Selenium # 'locator' is an element locator identifying a multi-select box # 'optionLocator' is an option locator (a label by default) def add_selection(locator,optionLocator) - do_command("addSelection", [locator,optionLocator,]) + remote_control_command("addSelection", [locator,optionLocator,]) end @@ -642,7 +642,7 @@ module Selenium # 'locator' is an element locator identifying a multi-select box # 'optionLocator' is an option locator (a label by default) def remove_selection(locator,optionLocator) - do_command("removeSelection", [locator,optionLocator,]) + remote_control_command("removeSelection", [locator,optionLocator,]) end @@ -650,7 +650,7 @@ module Selenium # # 'locator' is an element locator identifying a multi-select box def remove_all_selections(locator) - do_command("removeAllSelections", [locator,]) + remote_control_command("removeAllSelections", [locator,]) end @@ -659,7 +659,7 @@ module Selenium # # 'formLocator' is an element locator for the form you want to submit def submit(formLocator) - do_command("submit", [formLocator,]) + remote_control_command("submit", [formLocator,]) end @@ -676,7 +676,7 @@ module Selenium # # 'url' is the URL to open; may be relative or absolute def open(url) - do_command("open", [url,]) + remote_control_command("open", [url,]) end @@ -692,7 +692,7 @@ module Selenium # 'url' is the URL to open, which can be blank # 'windowID' is the JavaScript window ID of the window to select def open_window(url,windowID) - do_command("openWindow", [url,windowID,]) + remote_control_command("openWindow", [url,windowID,]) end @@ -740,7 +740,7 @@ module Selenium # # 'windowID' is the JavaScript window ID of the window to select def select_window(windowID) - do_command("selectWindow", [windowID,]) + remote_control_command("selectWindow", [windowID,]) end @@ -756,7 +756,7 @@ module Selenium # # 'locator' is an element locator identifying a frame or iframe def select_frame(locator) - do_command("selectFrame", [locator,]) + remote_control_command("selectFrame", [locator,]) end @@ -772,7 +772,7 @@ module Selenium # 'currentFrameString' is starting frame # 'target' is new frame (which might be relative to the current one) def get_whether_this_frame_match_frame_expression(currentFrameString,target) - return get_boolean("getWhetherThisFrameMatchFrameExpression", [currentFrameString,target,]) + return boolean_command("getWhetherThisFrameMatchFrameExpression", [currentFrameString,target,]) end @@ -788,7 +788,7 @@ module Selenium # 'currentWindowString' is starting window # 'target' is new window (which might be relative to the current one, e.g., "_parent") def get_whether_this_window_match_window_expression(currentWindowString,target) - return get_boolean("getWhetherThisWindowMatchWindowExpression", [currentWindowString,target,]) + return boolean_command("getWhetherThisWindowMatchWindowExpression", [currentWindowString,target,]) end @@ -797,7 +797,7 @@ module Selenium # 'windowID' is the JavaScript window "name" of the window that will appear (not the text of the title bar) # 'timeout' is a timeout in milliseconds, after which the action will return with an error def wait_for_pop_up(windowID,timeout) - do_command("waitForPopUp", [windowID,timeout,]) + remote_control_command("waitForPopUp", [windowID,timeout,]) end @@ -810,7 +810,7 @@ module Selenium # confirmation. # def choose_cancel_on_next_confirmation() - do_command("chooseCancelOnNextConfirmation", []) + remote_control_command("chooseCancelOnNextConfirmation", []) end @@ -824,7 +824,7 @@ module Selenium # confirmation. # def choose_ok_on_next_confirmation() - do_command("chooseOkOnNextConfirmation", []) + remote_control_command("chooseOkOnNextConfirmation", []) end @@ -833,21 +833,21 @@ module Selenium # # 'answer' is the answer to give in response to the prompt pop-up def answer_on_next_prompt(answer) - do_command("answerOnNextPrompt", [answer,]) + remote_control_command("answerOnNextPrompt", [answer,]) end # Simulates the user clicking the "back" button on their browser. # def go_back() - do_command("goBack", []) + remote_control_command("goBack", []) end # Simulates the user clicking the "Refresh" button on their browser. # def refresh() - do_command("refresh", []) + remote_control_command("refresh", []) end @@ -855,7 +855,7 @@ module Selenium # window or tab. # def close() - do_command("close", []) + remote_control_command("close", []) end @@ -867,7 +867,7 @@ module Selenium # # def is_alert_present() - return get_boolean("isAlertPresent", []) + return boolean_command("isAlertPresent", []) end @@ -879,7 +879,7 @@ module Selenium # # def is_prompt_present() - return get_boolean("isPromptPresent", []) + return boolean_command("isPromptPresent", []) end @@ -891,7 +891,7 @@ module Selenium # # def is_confirmation_present() - return get_boolean("isConfirmationPresent", []) + return boolean_command("isConfirmationPresent", []) end @@ -1002,7 +1002,7 @@ module Selenium # # 'locator' is an element locator def highlight(locator) - do_command("highlight", [locator,]) + remote_control_command("highlight", [locator,]) end @@ -1027,7 +1027,7 @@ module Selenium # # 'locator' is an element locator pointing to a checkbox or radio button def is_checked(locator) - return get_boolean("isChecked", [locator,]) + return boolean_command("isChecked", [locator,]) end @@ -1044,7 +1044,7 @@ module Selenium # # 'selectLocator' is an element locator identifying a drop-down menu def get_selected_labels(selectLocator) - return get_string_array("getSelectedLabels", [selectLocator,]) + return string_array_command("getSelectedLabels", [selectLocator,]) end @@ -1060,7 +1060,7 @@ module Selenium # # 'selectLocator' is an element locator identifying a drop-down menu def get_selected_values(selectLocator) - return get_string_array("getSelectedValues", [selectLocator,]) + return string_array_command("getSelectedValues", [selectLocator,]) end @@ -1076,7 +1076,7 @@ module Selenium # # 'selectLocator' is an element locator identifying a drop-down menu def get_selected_indexes(selectLocator) - return get_string_array("getSelectedIndexes", [selectLocator,]) + return string_array_command("getSelectedIndexes", [selectLocator,]) end @@ -1092,7 +1092,7 @@ module Selenium # # 'selectLocator' is an element locator identifying a drop-down menu def get_selected_ids(selectLocator) - return get_string_array("getSelectedIds", [selectLocator,]) + return string_array_command("getSelectedIds", [selectLocator,]) end @@ -1108,7 +1108,7 @@ module Selenium # # 'selectLocator' is an element locator identifying a drop-down menu def is_something_selected(selectLocator) - return get_boolean("isSomethingSelected", [selectLocator,]) + return boolean_command("isSomethingSelected", [selectLocator,]) end @@ -1116,7 +1116,7 @@ module Selenium # # 'selectLocator' is an element locator identifying a drop-down menu def get_select_options(selectLocator) - return get_string_array("getSelectOptions", [selectLocator,]) + return string_array_command("getSelectOptions", [selectLocator,]) end @@ -1134,7 +1134,7 @@ module Selenium # # 'pattern' is a pattern to match with the text of the page def is_text_present(pattern) - return get_boolean("isTextPresent", [pattern,]) + return boolean_command("isTextPresent", [pattern,]) end @@ -1142,7 +1142,7 @@ module Selenium # # 'locator' is an element locator def is_element_present(locator) - return get_boolean("isElementPresent", [locator,]) + return boolean_command("isElementPresent", [locator,]) end @@ -1154,7 +1154,7 @@ module Selenium # # 'locator' is an element locator def is_visible(locator) - return get_boolean("isVisible", [locator,]) + return boolean_command("isVisible", [locator,]) end @@ -1163,7 +1163,7 @@ module Selenium # # 'locator' is an element locator def is_editable(locator) - return get_boolean("isEditable", [locator,]) + return boolean_command("isEditable", [locator,]) end @@ -1173,7 +1173,7 @@ module Selenium # # def get_all_buttons() - return get_string_array("getAllButtons", []) + return string_array_command("getAllButtons", []) end @@ -1183,7 +1183,7 @@ module Selenium # # def get_all_links() - return get_string_array("getAllLinks", []) + return string_array_command("getAllLinks", []) end @@ -1193,7 +1193,7 @@ module Selenium # # def get_all_fields() - return get_string_array("getAllFields", []) + return string_array_command("getAllFields", []) end @@ -1201,7 +1201,7 @@ module Selenium # # 'attributeName' is name of an attribute on the windows def get_attribute_from_all_windows(attributeName) - return get_string_array("getAttributeFromAllWindows", [attributeName,]) + return string_array_command("getAttributeFromAllWindows", [attributeName,]) end @@ -1210,7 +1210,7 @@ module Selenium # 'locator' is an element locator # 'movementsString' is offset in pixels from the current location to which the element should be moved, e.g., "+70,-300" def dragdrop(locator,movementsString) - do_command("dragdrop", [locator,movementsString,]) + remote_control_command("dragdrop", [locator,movementsString,]) end @@ -1224,14 +1224,14 @@ module Selenium # # 'pixels' is the number of pixels between "mousemove" events def set_mouse_speed(pixels) - do_command("setMouseSpeed", [pixels,]) + remote_control_command("setMouseSpeed", [pixels,]) end # Returns the number of pixels between "mousemove" events during dragAndDrop commands (default=10). # def get_mouse_speed() - return get_number("getMouseSpeed", []) + return number_command("getMouseSpeed", []) end @@ -1240,7 +1240,7 @@ module Selenium # 'locator' is an element locator # 'movementsString' is offset in pixels from the current location to which the element should be moved, e.g., "+70,-300" def drag_and_drop(locator,movementsString) - do_command("dragAndDrop", [locator,movementsString,]) + remote_control_command("dragAndDrop", [locator,movementsString,]) end @@ -1249,42 +1249,42 @@ module Selenium # 'locatorOfObjectToBeDragged' is an element to be dragged # 'locatorOfDragDestinationObject' is an element whose location (i.e., whose center-most pixel) will be the point where locatorOfObjectToBeDragged is dropped def drag_and_drop_to_object(locatorOfObjectToBeDragged,locatorOfDragDestinationObject) - do_command("dragAndDropToObject", [locatorOfObjectToBeDragged,locatorOfDragDestinationObject,]) + remote_control_command("dragAndDropToObject", [locatorOfObjectToBeDragged,locatorOfDragDestinationObject,]) end # Gives focus to the currently selected window # def window_focus() - do_command("windowFocus", []) + remote_control_command("windowFocus", []) end # Resize currently selected window to take up the entire screen # def window_maximize() - do_command("windowMaximize", []) + remote_control_command("windowMaximize", []) end # Returns the IDs of all windows that the browser knows about. # def get_all_window_ids() - return get_string_array("getAllWindowIds", []) + return string_array_command("getAllWindowIds", []) end # Returns the names of all windows that the browser knows about. # def get_all_window_names() - return get_string_array("getAllWindowNames", []) + return string_array_command("getAllWindowNames", []) end # Returns the titles of all windows that the browser knows about. # def get_all_window_titles() - return get_string_array("getAllWindowTitles", []) + return string_array_command("getAllWindowTitles", []) end @@ -1302,7 +1302,7 @@ module Selenium # 'locator' is an element locator pointing to an input element or textarea # 'position' is the numerical position of the cursor in the field; position should be 0 to move the position to the beginning of the field. You can also set the cursor to -1 to move it to the end of the field. def set_cursor_position(locator,position) - do_command("setCursorPosition", [locator,position,]) + remote_control_command("setCursorPosition", [locator,position,]) end @@ -1311,7 +1311,7 @@ module Selenium # # 'locator' is an element locator pointing to an element def get_element_index(locator) - return get_number("getElementIndex", [locator,]) + return number_command("getElementIndex", [locator,]) end @@ -1321,7 +1321,7 @@ module Selenium # 'locator1' is an element locator pointing to the first element # 'locator2' is an element locator pointing to the second element def is_ordered(locator1,locator2) - return get_boolean("isOrdered", [locator1,locator2,]) + return boolean_command("isOrdered", [locator1,locator2,]) end @@ -1329,7 +1329,7 @@ module Selenium # # 'locator' is an element locator pointing to an element OR an element itself def get_element_position_left(locator) - return get_number("getElementPositionLeft", [locator,]) + return number_command("getElementPositionLeft", [locator,]) end @@ -1337,7 +1337,7 @@ module Selenium # # 'locator' is an element locator pointing to an element OR an element itself def get_element_position_top(locator) - return get_number("getElementPositionTop", [locator,]) + return number_command("getElementPositionTop", [locator,]) end @@ -1345,7 +1345,7 @@ module Selenium # # 'locator' is an element locator pointing to an element def get_element_width(locator) - return get_number("getElementWidth", [locator,]) + return number_command("getElementWidth", [locator,]) end @@ -1353,7 +1353,7 @@ module Selenium # # 'locator' is an element locator pointing to an element def get_element_height(locator) - return get_number("getElementHeight", [locator,]) + return number_command("getElementHeight", [locator,]) end @@ -1366,7 +1366,7 @@ module Selenium # # 'locator' is an element locator pointing to an input element or textarea def get_cursor_position(locator) - return get_number("getCursorPosition", [locator,]) + return number_command("getCursorPosition", [locator,]) end @@ -1387,7 +1387,7 @@ module Selenium # # 'xpath' is the xpath expression to evaluate. do NOT wrap this expression in a 'count()' function; we will do that for you. def get_xpath_count(xpath) - return get_number("getXpathCount", [xpath,]) + return number_command("getXpathCount", [xpath,]) end @@ -1398,7 +1398,7 @@ module Selenium # 'locator' is an element locator pointing to an element # 'identifier' is a string to be used as the ID of the specified element def assign_id(locator,identifier) - do_command("assignId", [locator,identifier,]) + remote_control_command("assignId", [locator,identifier,]) end @@ -1411,7 +1411,7 @@ module Selenium # # 'allow' is boolean, true means we'll prefer to use native XPath; false means we'll only use JS XPath def allow_native_xpath(allow) - do_command("allowNativeXpath", [allow,]) + remote_control_command("allowNativeXpath", [allow,]) end @@ -1427,7 +1427,7 @@ module Selenium # # 'ignore' is boolean, true means we'll ignore attributes without value at the expense of xpath "correctness"; false means we'll sacrifice speed for correctness. def ignore_attributes_without_value(ignore) - do_command("ignoreAttributesWithoutValue", [ignore,]) + remote_control_command("ignoreAttributesWithoutValue", [ignore,]) end @@ -1444,7 +1444,7 @@ module Selenium # 'script' is the JavaScript snippet to run # 'timeout' is a timeout in milliseconds, after which this command will return with an error def wait_for_condition(script,timeout) - do_command("waitForCondition", [script,timeout,]) + remote_control_command("waitForCondition", [script,timeout,]) end @@ -1456,7 +1456,7 @@ module Selenium # # 'timeout' is a timeout in milliseconds, after which the action will return with an error def set_timeout(timeout) - do_command("setTimeout", [timeout,]) + remote_control_command("setTimeout", [timeout,]) end @@ -1472,7 +1472,7 @@ module Selenium # # 'timeout' is a timeout in milliseconds, after which this command will return with an error def wait_for_page_to_load(timeout) - do_command("waitForPageToLoad", [timeout,]) + remote_control_command("waitForPageToLoad", [timeout,]) end @@ -1487,7 +1487,7 @@ module Selenium # 'frameAddress' is FrameAddress from the server side # 'timeout' is a timeout in milliseconds, after which this command will return with an error def wait_for_frame_to_load(frameAddress,timeout) - do_command("waitForFrameToLoad", [frameAddress,timeout,]) + remote_control_command("waitForFrameToLoad", [frameAddress,timeout,]) end @@ -1510,7 +1510,7 @@ module Selenium # # 'name' is the name of the cookie def is_cookie_present(name) - return get_boolean("isCookiePresent", [name,]) + return boolean_command("isCookiePresent", [name,]) end @@ -1520,7 +1520,7 @@ module Selenium # 'nameValuePair' is name and value of the cookie in a format "name=value" # 'optionsString' is options for the cookie. Currently supported options include 'path', 'max_age' and 'domain'. the optionsString's format is "path=/path/, max_age=60, domain=.foo.com". The order of options are irrelevant, the unit of the value of 'max_age' is second. Note that specifying a domain that isn't a subset of the current domain will usually fail. def create_cookie(nameValuePair,optionsString) - do_command("createCookie", [nameValuePair,optionsString,]) + remote_control_command("createCookie", [nameValuePair,optionsString,]) end @@ -1538,7 +1538,7 @@ module Selenium # 'name' is the name of the cookie to be deleted # 'optionsString' is options for the cookie. Currently supported options include 'path', 'domain' and 'recurse.' The optionsString's format is "path=/path/, domain=.foo.com, recurse=true". The order of options are irrelevant. Note that specifying a domain that isn't a subset of the current domain will usually fail. def delete_cookie(name,optionsString) - do_command("deleteCookie", [name,optionsString,]) + remote_control_command("deleteCookie", [name,optionsString,]) end @@ -1547,7 +1547,7 @@ module Selenium # than simply deleting the cookies using a known domain/path. # def delete_all_visible_cookies() - do_command("deleteAllVisibleCookies", []) + remote_control_command("deleteAllVisibleCookies", []) end @@ -1558,7 +1558,7 @@ module Selenium # # 'logLevel' is one of the following: "debug", "info", "warn", "error" or "off" def set_browser_log_level(logLevel) - do_command("setBrowserLogLevel", [logLevel,]) + remote_control_command("setBrowserLogLevel", [logLevel,]) end @@ -1572,7 +1572,7 @@ module Selenium # # 'script' is the JavaScript snippet to run def run_script(script) - do_command("runScript", [script,]) + remote_control_command("runScript", [script,]) end @@ -1594,7 +1594,7 @@ module Selenium # 'strategyName' is the name of the strategy to define; this should use only letters [a-zA-Z] with no spaces or other punctuation. # 'functionDefinition' is a string defining the body of a function in JavaScript. For example: <tt>return inDocument.getElementById(locator);</tt> def add_location_strategy(strategyName,functionDefinition) - do_command("addLocationStrategy", [strategyName,functionDefinition,]) + remote_control_command("addLocationStrategy", [strategyName,functionDefinition,]) end @@ -1609,7 +1609,7 @@ module Selenium # 'filename' is the path to the file to persist the screenshot as. No filename extension will be appended by default. Directories will not be created if they do not exist, and an exception will be thrown, possibly by native code. # 'kwargs' is a kwargs string that modifies the way the screenshot is captured. Example: "background=#CCFFDD" . Currently valid options: * background:: the background CSS for the HTML document. This may be useful to set for capturing screenshots of less-than-ideal layouts, for example where absolute positioning causes the calculation of the canvas dimension to fail and a black background is exposed (possibly obscuring black text). def capture_entire_page_screenshot(filename,kwargs) - do_command("captureEntirePageScreenshot", [filename,kwargs,]) + remote_control_command("captureEntirePageScreenshot", [filename,kwargs,]) end @@ -1618,7 +1618,7 @@ module Selenium # # 'context' is the message to be sent to the browser def set_context(context) - do_command("setContext", [context,]) + remote_control_command("setContext", [context,]) end @@ -1627,7 +1627,7 @@ module Selenium # 'fieldLocator' is an element locator # 'fileLocator' is a URL pointing to the specified file. Before the file can be set in the input field (fieldLocator), Selenium RC may need to transfer the file to the local machine before attaching the file in a web page form. This is common in selenium grid configurations where the RC server driving the browser is not the same machine that started the test. Supported Browsers: Firefox ("*chrome") only. def attach_file(fieldLocator,fileLocator) - do_command("attachFile", [fieldLocator,fileLocator,]) + remote_control_command("attachFile", [fieldLocator,fileLocator,]) end @@ -1635,7 +1635,7 @@ module Selenium # # 'filename' is the absolute path to the file to be written, e.g. "c:\blah\screenshot.png" def capture_screenshot(filename) - do_command("captureScreenshot", [filename,]) + remote_control_command("captureScreenshot", [filename,]) end @@ -1645,7 +1645,7 @@ module Selenium # shutting down the entire server. # def shut_down_selenium_server() - do_command("shutDownSeleniumServer", []) + remote_control_command("shutDownSeleniumServer", []) end @@ -1657,7 +1657,7 @@ module Selenium # # 'keycode' is an integer keycode number corresponding to a java.awt.event.KeyEvent; note that Java keycodes are NOT the same thing as JavaScript keycodes! def key_down_native(keycode) - do_command("keyDownNative", [keycode,]) + remote_control_command("keyDownNative", [keycode,]) end @@ -1669,7 +1669,7 @@ module Selenium # # 'keycode' is an integer keycode number corresponding to a java.awt.event.KeyEvent; note that Java keycodes are NOT the same thing as JavaScript keycodes! def key_up_native(keycode) - do_command("keyUpNative", [keycode,]) + remote_control_command("keyUpNative", [keycode,]) end @@ -1681,7 +1681,7 @@ module Selenium # # 'keycode' is an integer keycode number corresponding to a java.awt.event.KeyEvent; note that Java keycodes are NOT the same thing as JavaScript keycodes! def key_press_native(keycode) - do_command("keyPressNative", [keycode,]) + remote_control_command("keyPressNative", [keycode,]) end lib/selenium.rb.reference @@ -37,13 +37,13 @@ module Selenium @extension_js = extension_js end - def start() - result = get_string("getNewBrowserSession", [@browser_string, @browser_url, @extension_js]) + def start + result = string_command "getNewBrowserSession", [@browser_string, @browser_url, @extension_js] @session_id = result end - def stop() - do_command("testComplete", []) + def stop + remote_control_command "testComplete" @session_id = nil end @@ -59,10 +59,6 @@ module Selenium not @session_id.nil? end - def default_timeout_in_seconds - @timeout - end - def chrome_backend? ["*chrome", "*firefox", "*firefox2", "*firefox3"].include?(@browser_string) end lib/selenium/client/base.rb @@ -18,17 +18,17 @@ module Selenium # # 'locator' is an Selenium element locator def text_content(locator) - get_string "getText", [locator,] + string_command"getText", [locator,] end # Return the title of the current HTML page. def title - get_string "getTitle" + string_command"getTitle" end # Returns the absolute URL of the current page. def location - get_string "getLocation" + string_command"getLocation" end # Waits for a new page to load. @@ -43,12 +43,12 @@ module Selenium # command will return with an error def wait_for_page(timeout_in_seconds=nil) actual_timeout = timeout_in_seconds || default_timeout_in_seconds - do_command "waitForPageToLoad", [actual_timeout * 1000,] + remote_control_command "waitForPageToLoad", [actual_timeout * 1000,] end # Gets the entire text of the page. def body_text - get_string "getBodyText" + string_command"getBodyText" end # Clicks on a link, button, checkbox or radio button. If the click action @@ -57,7 +57,7 @@ module Selenium # # 'locator' is an element locator def click(locator, options={}) - do_command("click", [locator,]) + remote_control_command("click", [locator,]) if options[:wait_for] == :page wait_for_page options[:timeout_in_seconds] end @@ -67,14 +67,14 @@ module Selenium # # 'pattern' is a pattern to match with the text of the page def text_present?(pattern) - get_boolean "isTextPresent", [pattern,] + boolean_command "isTextPresent", [pattern,] end # Verifies that the specified element is somewhere on the page. # # 'locator' is an element locator def element_present?(locator) - get_boolean "isElementPresent", [locator,] + boolean_command "isElementPresent", [locator,] end # Gets the (whitespace-trimmed) value of an input field @@ -84,12 +84,12 @@ module Selenium # # 'locator' is an element locator def value(locator) - get_string "getValue", [locator,] + string_command"getValue", [locator,] end # Whether an alert occurred def alert? - get_boolean "isAlertPresent" + boolean_command "isAlertPresent" end # Retrieves the message of a JavaScript alert generated during the previous action, @@ -105,12 +105,12 @@ module Selenium # generated and Selenium will hang until someone manually clicks OK. # def alert - get_string "getAlert" + string_command"getAlert" end # Whether a confirmation has been auto-acknoledged (i.e. confirm() been called) def confirmation? - get_boolean "isConfirmationPresent" + boolean_command "isConfirmationPresent" end # Retrieves the message of a JavaScript confirmation dialog generated during @@ -131,12 +131,12 @@ module Selenium # dialog WILL be generated and Selenium will hang until you manually click # OK. def confirmation - get_string "getConfirmation" + string_command"getConfirmation" end # Whether a prompt occurred def prompt? - get_boolean "isPromptPresent" + boolean_command "isPromptPresent" end # Retrieves the message of a JavaScript question prompt dialog generated during @@ -153,7 +153,7 @@ module Selenium # page's onload() event handler. In this case a visible dialog WILL be # generated and Selenium will hang until someone manually clicks OK. def prompt - get_string "getPrompt" + string_command"getPrompt" end # Returns the result of evaluating the specified JavaScript snippet whithin the browser. @@ -168,7 +168,7 @@ module Selenium # # 'script' is the JavaScript snippet to run def js_eval(script) - get_string "getEval", [script,] + string_command"getEval", [script,] end lib/selenium/client/idiomatic.rb @@ -6,7 +6,7 @@ module Selenium module SeleneseClient attr_reader :session_id - def do_command(verb, args) + def remote_control_command(verb, args=[]) timeout(default_timeout_in_seconds) do status, response = http_post(http_request_for(verb, args)) raise SeleniumCommandError, response unless status == "OK" @@ -14,12 +14,12 @@ module Selenium end end - def get_string(verb, args=[]) - do_command(verb, args) + def string_command(verb, args=[]) + remote_control_command(verb, args) end - def get_string_array(verb, args) - csv = get_string(verb, args) + def string_array_command(verb, args) + csv = string_command(verb, args) token = "" tokens = [] escape = false @@ -43,24 +43,26 @@ module Selenium return tokens end - def get_number(verb, args) - # Is there something I need to do here? - return get_string(verb, args) + def number_command(verb, args) + string_command verb, args end - def get_number_array(verb, args) - # Is there something I need to do here? - return get_string_array(verb, args) + def number_array_command(verb, args) + string_array_command verb, args end - def get_boolean(verb, args=[]) - parse_boolean_value get_string(verb, args) + def boolean_command(verb, args=[]) + parse_boolean_value string_command(verb, args) end - def get_boolean_array(verb, args) - get_string_array(verb, args).collect {|value| parse_boolean_value(value)} + def boolean_array_command(verb, args) + string_array_command(verb, args).collect {|value| parse_boolean_value(value)} end - + + def default_timeout_in_seconds + @timeout + end + protected def parse_boolean_value(value) @@ -88,7 +90,7 @@ module Selenium # puts "RESULT: #{response.inspect}\n" [ response.body[0..1], response.body[3..-1] ] end - + end end lib/selenium/client/selenese_client.rb @@ -19,15 +19,15 @@ unit_tests do test "session_started? returns true when session has been started" do client = Class.new { include Selenium::Client::Base }.new :host, :port, :browser, :url - client.stubs(:get_string).returns("A Session Id") + client.stubs(:string_command).returns("A Session Id") client.start assert_true client.session_started? end test "session_started? returns false when session has been stopped" do client = Class.new { include Selenium::Client::Base }.new :host, :port, :browser, :url - client.stubs(:get_string).returns("A Session Id") - client.stubs(:do_command) + client.stubs(:string_command).returns("A Session Id") + client.stubs(:remote_control_command) client.start client.stop assert_false client.session_started? test/unit/selenium/client/base_test.rb @@ -4,118 +4,118 @@ unit_tests do test "text_content is an alias for get_text" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:get_string).with("getText", [:the_locator,]).returns(:the_text) + client.expects(:string_command).with("getText", [:the_locator,]).returns(:the_text) assert_equal :the_text, client.text_content(:the_locator) end test "title returns the result of the getTitle command" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:get_string).with("getTitle").returns(:the_title) + client.expects(:string_command).with("getTitle").returns(:the_title) assert_equal :the_title, client.title end test "location returns the result of the getLocation command" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:get_string).with("getLocation").returns(:the_location) + client.expects(:string_command).with("getLocation").returns(:the_location) assert_equal :the_location, client.location end test "wait_for_page_to_load wait for a page to load, converting seconds timeout to milliseconds" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:do_command).with("waitForPageToLoad", [2000,]) + client.expects(:remote_control_command).with("waitForPageToLoad", [2000,]) client.wait_for_page 2 end test "wait_for_page_to_load wait for a page to load use default timeout when none is specified" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:do_command).with("waitForPageToLoad", [7000,]) + client.expects(:remote_control_command).with("waitForPageToLoad", [7000,]) client.stubs(:default_timeout_in_seconds).returns(7) client.wait_for_page end test "body_text returns the result of the getBodyText command" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:get_string).with("getBodyText").returns(:the_text) + client.expects(:string_command).with("getBodyText").returns(:the_text) assert_equal :the_text, client.body_text end test "click just clicks on an element when no options are given" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:do_command).with("click", [:the_locator,]) + client.expects(:remote_control_command).with("click", [:the_locator,]) client.click :the_locator end test "click waits for page to load when wait_for option is provided" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:do_command).with("click", [:the_locator,]) + client.expects(:remote_control_command).with("click", [:the_locator,]) client.expects(:wait_for_page).with(nil) client.click :the_locator, :wait_for => :page end test "click waits for pagewith explicit timeout when one is provided" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:do_command).with("click", [:the_locator,]) + client.expects(:remote_control_command).with("click", [:the_locator,]) client.expects(:wait_for_page).with(:the_timeout) client.click :the_locator, :wait_for => :page, :timeout_in_seconds => :the_timeout end test "value returns the result of the getValue command" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:get_string).with("getValue", [:the_locator,]).returns(:the_value) + client.expects(:string_command).with("getValue", [:the_locator,]).returns(:the_value) assert_equal :the_value, client.value(:the_locator) end test "text_present? returns the result of the isTextPresent command" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:get_boolean).with("isTextPresent", [:the_pattern,]).returns(:the_result) + client.expects(:boolean_command).with("isTextPresent", [:the_pattern,]).returns(:the_result) assert_equal :the_result, client.text_present?(:the_pattern) end test "element_present? returns the result of the isElementPresent command" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:get_boolean).with("isElementPresent", [:the_locator,]).returns(:the_result) + client.expects(:boolean_command).with("isElementPresent", [:the_locator,]).returns(:the_result) assert_equal :the_result, client.element_present?(:the_locator) end test "alert? returns the result of the isAlertPresent command" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:get_boolean).with("isAlertPresent").returns(:the_result) + client.expects(:boolean_command).with("isAlertPresent").returns(:the_result) assert_equal :the_result, client.alert? end test "alert returns the result of the getAlert command" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:get_string).with("getAlert").returns(:the_result) + client.expects(:string_command).with("getAlert").returns(:the_result) assert_equal :the_result, client.alert end test "confirmation? returns the result of the isConfirmationPresent command" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:get_boolean).with("isConfirmationPresent").returns(:the_result) + client.expects(:boolean_command).with("isConfirmationPresent").returns(:the_result) assert_equal :the_result, client.confirmation? end test "confirmation returns the result of the getConfirmation command" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:get_string).with("getConfirmation").returns(:the_result) + client.expects(:string_command).with("getConfirmation").returns(:the_result) assert_equal :the_result, client.confirmation end test "prompt? returns the result of the isPromptPresent command" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:get_boolean).with("isPromptPresent").returns(:the_result) + client.expects(:boolean_command).with("isPromptPresent").returns(:the_result) assert_equal :the_result, client.prompt? end test "prompt returns the result of the getPrompt command" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:get_string).with("getPrompt").returns(:the_result) + client.expects(:string_command).with("getPrompt").returns(:the_result) assert_equal :the_result, client.prompt end test "prompt returns the result of the getEval command" do client = Class.new { include Selenium::Client::Idiomatic }.new - client.expects(:get_string).with("getEval", [:the_script,]).returns(:the_result) + client.expects(:string_command).with("getEval", [:the_script,]).returns(:the_result) assert_equal :the_result, client.js_eval(:the_script) end test/unit/selenium/client/idiomatic_test.rb @@ -2,34 +2,55 @@ require File.expand_path(File.dirname(__FILE__) + '/../../unit_test_helper') unit_tests do - test "get_string returns the selenese command response" do + test "remote_control_command return the content of the HTTP response when the command succeeds" do client = Class.new { include Selenium::Client::SeleneseClient }.new - client.expects(:do_command).with(:a_verb, :some_args).returns("A String") - assert_equal "A String", client.get_string(:a_verb, :some_args) + client.stubs(:http_request_for).with(:a_verb, :some_args).returns(:the_request) + client.expects(:http_post).with(:the_request).returns(["OK", "the response"]) + assert_equal "the response", client.remote_control_command(:a_verb, :some_args) end - test "args are optionals for get_string (when there are none)" do + test "remote_control_command raises a SeleniumCommandError when the command fails" do client = Class.new { include Selenium::Client::SeleneseClient }.new - client.expects(:do_command).with(:a_verb, []) - client.get_string :a_verb + client.stubs(:http_request_for).with(:a_verb, :some_args).returns(:the_request) + client.expects(:http_post).with(:the_request).returns(["ERROR", "the error message"]) + assert_raises(SeleniumCommandError) { client.remote_control_command(:a_verb, :some_args) } + end + + test "the args are optional for remote_control_command" do + client = Class.new { include Selenium::Client::SeleneseClient }.new + client.expects(:http_request_for).with(:a_verb, []).returns(:the_request) + client.stubs(:http_post).with(:the_request).returns(["OK", "the response"]) + client.remote_control_command(:a_verb) + end + + test "string_commandreturns the selenese command response" do + client = Class.new { include Selenium::Client::SeleneseClient }.new + client.expects(:remote_control_command).with(:a_verb, :some_args).returns("A String") + assert_equal "A String", client.string_command(:a_verb, :some_args) + end + + test "args are optionals for string_command(when there are none)" do + client = Class.new { include Selenium::Client::SeleneseClient }.new + client.expects(:remote_control_command).with(:a_verb, []) + client.string_command:a_verb end test "get_string_parses the command response as a CSV row" do client = Class.new { include Selenium::Client::SeleneseClient }.new - client.expects(:do_command).with(:a_verb, :some_args).returns("One,Two,Three") - assert_equal ["One", "Two", "Three"], client.get_string_array(:a_verb, :some_args) + client.expects(:remote_control_command).with(:a_verb, :some_args).returns("One,Two,Three") + assert_equal ["One", "Two", "Three"], client.string_array_command(:a_verb, :some_args) end test "get_string_parses the command response preserve spaces" do client = Class.new { include Selenium::Client::SeleneseClient }.new - client.expects(:do_command).with(:a_verb, :some_args).returns(" One , Two & Three ") - assert_equal [" One ", " Two & Three "], client.get_string_array(:a_verb, :some_args) + client.expects(:remote_control_command).with(:a_verb, :some_args).returns(" One , Two & Three ") + assert_equal [" One ", " Two & Three "], client.string_array_command(:a_verb, :some_args) end test "get_string_parses ignore commas escaped with a backspace" do client = Class.new { include Selenium::Client::SeleneseClient }.new - client.expects(:do_command).with(:a_verb, :some_args).returns("One,Two\\,Three") - assert_equal ["One", "Two,Three"], client.get_string_array(:a_verb, :some_args) + client.expects(:remote_control_command).with(:a_verb, :some_args).returns("One,Two\\,Three") + assert_equal ["One", "Two,Three"], client.string_array_command(:a_verb, :some_args) end test "parse_boolean_value returns true when string is true" do @@ -52,29 +73,29 @@ unit_tests do end end - test "get_boolean returns true when get_string returns 'true'" do + test "boolean_command returns true when string_commandreturns 'true'" do client = Class.new { include Selenium::Client::SeleneseClient }.new - client.stubs(:get_string).with(:a_verb, :some_args).returns("true") - assert_equal true, client.get_boolean(:a_verb, :some_args) + client.stubs(:string_command).with(:a_verb, :some_args).returns("true") + assert_equal true, client.boolean_command(:a_verb, :some_args) end - test "args are optionals for get_boolean (when there are none)" do + test "args are optionals for boolean_command (when there are none)" do client = Class.new { include Selenium::Client::SeleneseClient }.new - client.expects(:get_string).with(:a_verb, []).returns("true") - client.get_boolean(:a_verb) + client.expects(:string_command).with(:a_verb, []).returns("true") + client.boolean_command(:a_verb) end - test "get_boolean returns false when get_string returns 'false'" do + test "boolean_command returns false when string_commandreturns 'false'" do client = Class.new { include Selenium::Client::SeleneseClient }.new - client.stubs(:get_string).with(:a_verb, :some_args).returns("false") - assert_equal false, client.get_boolean(:a_verb, :some_args) + client.stubs(:string_command).with(:a_verb, :some_args).returns("false") + assert_equal false, client.boolean_command(:a_verb, :some_args) end - test "get_boolean_array returns an array of evaluated boolean values" do + test "boolean_array_command returns an array of evaluated boolean values" do client = Class.new { include Selenium::Client::SeleneseClient }.new - client.stubs(:get_string_array).with(:a_verb, :some_args).returns( + client.stubs(:string_array_command).with(:a_verb, :some_args).returns( ["true", "false", "true", "true", "false"]) - assert_equal [true, false, true, true, false], client.get_boolean_array(:a_verb, :some_args) + assert_equal [true, false, true, true, false], client.boolean_array_command(:a_verb, :some_args) end test "http_request_for a verb is cmd=verb" do test/unit/selenium/client/selenese_client_test.rb lib/selenium/client/generated_driver.rb 27a0ddb4cebf5b1f2f1b911edc12f8573f8dc908 Philippe Hanrigou philippe.hanrigou@gmail.com http://github.com/ph7/selenium-client/commit/dd7b2895144e712d67aed5bebc4ad39247ff192a dd7b2895144e712d67aed5bebc4ad39247ff192a 2008-09-29T08:43:20-07:00 2008-09-29T08:43:20-07:00 Saner names for remote control client commands 54def7f622fadaa9e6d3844d5f9c2799b1e068cb Philippe Hanrigou philippe.hanrigou@gmail.com