Merge pull request baijum#14 from Sowrabha8/minor_fix

Baiju Muthukadan · Baiju Muthukadan · commit d38f4a3ff6a6 · 2013-11-11T11:24:00.000-08:00
Modified the Selenium python doc.
diff --git a/source/getting-started.rst b/source/getting-started.rst
@@ -66,7 +66,7 @@ in it::
 WebDriver offers a number of ways to find elements using one of the
 `find_element_by_*` methods.  For example, the input text element can
 be located by its `name` attribute using `find_element_by_name`
-method.  Detailed explanation of findind elements is available in the
+method.  Detailed explanation of finding elements is available in the
 :ref:`locating-elements` chapter::
 
   elem = driver.find_element_by_name("q")
@@ -223,8 +223,8 @@ site.  You can confirm it by asserting "Google" in the title::
 The `tearDown` method will get called after every test method.  This
 is a place to do all cleanup actions.  In the current method, the
 browser window is closed.  You can also call `quit` method instead of
-`close`.  The `quit` will exit all entire browser where as `close`
-will close one tab, but if it just one tab, by default most browser
+`close`.  The `quit` will exit entire browser, where as `close`
+will close a tab, but if it is just one tab, by default most browser
 will exit entirely.::
 
       def tearDown(self):
diff --git a/source/navigating.rst b/source/navigating.rst
@@ -74,11 +74,11 @@ Filling in forms
 
 We've already seen how to enter text into a textarea or text field,
 but what about the other elements? You can "toggle" the state of
-checkboxes, and you can use "setSelected" to set something like an
+drop down, and you can use "setSelected" to set something like an
 `OPTION` tag selected.  Dealing with `SELECT` tags isn't too bad::
 
-    select = driver.find_element_by_xpath("//select")
-    all_options = select.find_elements_by_tag_name("option")
+    element = driver.find_element_by_xpath("//select[@name='name']")
+    all_options = element.find_elements_by_tag_name("option")
     for option in all_options:
         print "Value is: %s" % option.get_attribute("value")
         option.click()
@@ -87,19 +87,31 @@ This will find the first "SELECT" element on the page, and cycle
 through each of it's OPTIONs in turn, printing out their values, and
 selecting each in turn.
 
-.. As you can see, this isn't the most efficient
-.. way of dealing with SELECT elements . WebDriver's support classes
-.. include one called "Select", which provides useful methods for
-.. interacting with these.
+As you can see, this isn't the most efficient
+way of dealing with SELECT elements . WebDriver's support classes
+include one called "Select", which provides useful methods for
+interacting with these.
 
-.. ::
+::
+
+    select = Select(driver.find_element_by_name('name'))
+    select.select_by_index(index)
+    select.select_by_visible_text("text")
+    select.select_by_value(value)
+
+
+WebDriver also provides features for deselecting all the selected options::
 
-..     select = driver.find_element_by_xpath("//select").select()  #<- FIXME: API
-..     select.deselectAll() #<- FIXME: API
-..     select.selectByVisibleText("Edam") #<- FIXME: API
+    select = Select(driver.find_element_by_id('id'))
+    select.deselect_all()
 
-.. This will deselect all OPTIONs from the first SELECT on the page, and
-.. then select the OPTION with the displayed text of "Edam".
+This will deselect all OPTIONs from the first SELECT on the page.
+
+Suppose in a test, we need the list of all default selected options, Select
+class provides a method that returns a list::
+
+	select = Select(driver.find_element_by_xpath("xpath"))
+    all_options = select.all_selected_options()
 
 Once you've finished filling out the form, you probably want to submit
 it. One way to do this would be to find the "submit" button and click
@@ -165,6 +177,10 @@ and you can specify the frame by its index too.  That is::
 would go to the frame named "child" of the first subframe of the frame
 called "frameName".  **All frames are evaluated as if from *top*.**
 
+Once we are done with working on frames, we will have to come back
+to the parent frame which can be done using::
+
+  driver.switch_to_default_content()
 
 Popup dialogs
 ~~~~~~~~~~~~~
