symbiont 0.1.9 → 0.2.0

data/Gemfile.lock

@@ -1,23 +1,36 @@
 PATH
   remote: .
   specs:
-    symbiont (0.1.9)
-      selenium-webdriver (= 2.29.0)
+    symbiont (0.2.0)
+      selenium-webdriver (= 2.31.0)
       watir-webdriver (= 0.6.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    childprocess (0.3.7)
-      ffi (~> 1.0, >= 1.0.6)
-    ffi (1.3.1-x86-mingw32)
-    multi_json (1.5.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    diff-lcs (1.2.1)
+    ffi (1.5.0-x86-mingw32)
+    multi_json (1.7.1)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.29.0)
+    selenium-webdriver (2.31.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip
       websocket (~> 1.0.4)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     watir-webdriver (0.6.2)
       selenium-webdriver (>= 2.18.0)
     websocket (1.0.7)
@@ -26,4 +39,6 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
+  rspec
+  simplecov
   symbiont!

data/HISTORY.md

@@ -1,6 +1,12 @@
 Change Log and History
 ======================
 
+Version 0.2.0 / 2013-03-28
+--------------------------
+
+This release adds in more web objects, like labels, headings, and lists. I have also begun putting the unit tests back in place. An initial start has been made at recognizing multiple elements of a given type.
+
+
 Version 0.1.9 / 2013-02-06
 --------------------------
 

data/app/public/css/site.css

@@ -428,3 +428,19 @@ div.expanded {
 	background-color: rgb(110,138,195);
 }
 /* End: Login Form */
+
+#pub-grid {
+    border: 1px solid black;
+    color: white;
+    background-color: green;
+}
+
+#pub-grid thead {
+    border-bottom: 1px solid black;
+    vertical-align: center;
+}
+
+#pub-grid td {
+    vertical-align: bottom;
+    padding: 20px;
+}

data/app/public/js/site.js

@@ -1,5 +1,7 @@
 $(document).ready(function() {
-  
+
+  $('#name').focus();
+
   // Position the areas panel
   $('#areas').show().delay(500).animate({left:'-48em'},250).animate({left:'-51em'},250);
   

data/app/views/comics.erb

@@ -1,6 +1,6 @@
 <section>
   
-  <table id="comic-grid" class="display">
+  <table id="comic-grid" name="comic-grid" class="display">
     <thead>
       <tr>
         <th>Name</th>
@@ -319,4 +319,26 @@
     </tbody>
   </table>
 
+  <p>Basic Data:</p>
+  <table id="pub-grid">
+    <thead>
+      <tr>
+        <th>Publisher</th>
+        <th>Founded</th>
+        <th>Original Name</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>DC</td>
+        <td id="dc_founded" name="dc_founded" class="pub">1934</td>
+        <td>National Allied Publications</td>
+      </tr>
+      <tr>
+        <td>Marvel</td>
+        <td id="marvel_founded" name="marvel_founded" class="pub">1939</td>
+        <td>Timely Publications</td>
+      </tr>
+    </tbody>
+  </table>
 </section>

data/app/views/webobject.erb

@@ -30,7 +30,7 @@
   </div>
   <div>
     <label for="dob" class="label">Date of Birth</label>
-    <input name="dob" type="text" id="dob" class="date" title="Please type your date of birth using this format: 01/19/2000"></input>
+    <input name="dob" type="text" id="dob" class="date" title="Please type your date of birth using this format: 01/19/2000">
   </div>
   <div>
     <label for="password" class="label">Password</label>

data/lib/symbiont/data_setter.rb

@@ -21,12 +21,15 @@ module Symbiont
 		end
 		
     def use_check_data_with(key, value)
-      return self.send "check_#{key}" if value
-      return self.send "uncheck_#{key}"
+      if value
+        self.send "check_#{key}"
+      else
+        self.send "uncheck_#{key}"
+      end
     end
     
     def use_select_data_with(key, value)
-      return self.send "select_#{key}" if value
+      self.send "select_#{key}" if value
     end
     
     def text_settable_for(key)
@@ -42,6 +45,7 @@ module Symbiont
     end
     
     def object_enabled_for(key)
+      return true if (self.send "#{key}_object").tag_name == "textarea"
       self.send("#{key}_object").enabled?
     end
     

data/lib/symbiont/enclosers.rb

@@ -1,5 +1,21 @@
 module Symbiont
   module Enclosers
+    # Provides a context for an action that must succeed within a given time period.
+    # The logic here is simply that the result of the action will be true (meaning
+    # the action was carried out) or false, which means the action did not succeed
+    # in the time allotted.
+    #
+    # @param [Integer] timeout the amount of time in seconds to wait
+    # @param [String] message the text to return if the action did not occur in time
+    # @param [Proc] block the code that calls the desired action
+    #
+    # @example
+    #   @page.wait_for(5, 'page with expected title not found') do
+    #     @page.title.should == "Test App"
+    #   end
+    def wait_for(timeout=Symbiont.page_level_wait, message=nil, &block)
+      platform.wait_for(timeout, message, &block)
+    end
 
     # Used to identify a web object or action on a web object as existing
     # within an enclosing window object. The window can be referenced using
@@ -33,9 +49,7 @@ module Symbiont
     #     button :login, id: "btnSubmit", frame: encloser
     #   end
     def within_frame(locator, encloser=nil, &block)
-      encloser = [] if encloser.nil?
-      encloser << locator
-      block.call(encloser)
+      platform.within_frame(locator, encloser, &block)
     end
 
     # Used to identify a web object as existing within an enclosing object
@@ -54,23 +68,6 @@ module Symbiont
       yield if block_given?
     end
 
-    # Provides a context for an action that must succeed within a given time period.
-    # The logic here is simply that the result of the action will be true (meaning
-    # the action was carried out) or false, which means the action did not succeed
-    # in the time allotted.
-    #
-    # @param [Integer] timeout the amount of time in seconds to wait
-    # @param [String] message the text to return if the action did not occur in time
-    # @param [Proc] block the code that calls the desired action
-    #
-    # @example
-    #   @page.wait_for(5, 'page with expected title not found') do
-    #     @page.title.should == "Test App"
-    #   end
-    def wait_for(timeout=Symbiont.page_level_wait, message=nil, &block)
-      platform.wait_for(timeout, message, &block)
-    end
-    
     # Provides a context for an action that will generate a JavaScript alert
     # message box. The alert invocation will be overridden by the platform.
     #
@@ -81,15 +78,15 @@ module Symbiont
     #   response = @page.will_alert do
     #     @page.submitForm
     #   end
-    def will_alert(&block)
-      platform.will_alert(&block)
+    def will_alert(encloser=nil, &block)
+      platform.will_alert(encloser, &block)
     end
     
     # Provides a context for an action that will generate a JavaScript
     # confirmation message box. The confirmation invocation will be
     # overridden by the platform.
     #
-    # @param [bool] true to accept the confirmation, false to cancel it
+    # @param [bool] response true to accept the confirmation, false to cancel it
     # @param [Proc] block the code that generates the confirmation
     # @return [String] the message contained in the confirmation message box
     #
@@ -97,8 +94,8 @@ module Symbiont
     #   response = @page.will_confirm(true) do
     #     @page.areYouSure
     #   end
-    def will_confirm(response, &block)
-      platform.will_confirm(response, &block)
+    def will_confirm(response, encloser=nil, &block)
+      platform.will_confirm(response, encloser, &block)
     end
     
     # Provides a context for an action that will generate a JavaScript prompt
@@ -113,8 +110,8 @@ module Symbiont
     #   response = @page.will_prompt("use this") do
     #     @page.useValue
     #   end
-    def will_prompt(response, &block)
-      platform.will_prompt(response, &block)
+    def will_prompt(response, encloser=nil, &block)
+      platform.will_prompt(response, encloser, &block)
     end
     
   end # module: Enclosers

data/lib/symbiont/evaluators.rb

@@ -1,52 +1,81 @@
 module Symbiont
   module Evaluators
-    
+
+    ## Browser-Level Actions ##
+
     def visit(url)
       platform.visit(url)
     end
-    
-    def text
-      platform.text
-    end
-    
-    def markup
-      platform.markup
-    end
-    
-    alias_method :html, :markup
-    
-    def title
-      platform.title
-    end
-    
+
+    alias_method :navigate_to, :visit
+
     def url
       platform.url
     end
-    
+
+    alias_method :current_url, :url
+
     # Save a snapshot of the current screen to a provided file location.
     # The file will be saved as a PNG file in the path specified or in the
     # location where the tests are being run from.
     def screenshot(file)
       platform.screenshot file
-    end    
-    
-    def focus
-      platform.focus
     end
 
-    alias_method :what_has_focus?, :focus
+    alias_method :save_screenshot, :screenshot
 
     # Executes JavaScript against the browser instance.
     def run_script(script)
       platform.run_script(script)
     end
-    
+
     alias_method :execute_script, :run_script
 
     def back
       platform.back
     end
 
+    def forward
+      platform.forward
+    end
+
+    def refresh
+      platform.refresh
+    end
+
+    def remove_cookies
+      platform.remove_cookies
+    end
+
+    alias_method :clear_cookies, :remove_cookies
+
+    ## Page-Level Actions ##
+
+    def text
+      platform.text
+    end
+    
+    def markup
+      platform.markup
+    end
+    
+    alias_method :html, :markup
+    
+    def title
+      platform.title
+    end
+
+    # Returns the element on a page that has the focus.
+    def focus
+      platform.focus
+    end
+
+    alias_method :what_has_focus?, :focus
+
+    def wait_for_app(value=1)
+      sleep value
+    end
+
     # Provides an evaluator that attempts to wait for any pending AJAX
     # requests from the jQuery library.
     def wait_for_pending_requests(time_limit=30, message_if_timeout=nil)

data/lib/symbiont/factory.rb

@@ -7,9 +7,9 @@ module Symbiont
     # @param [optional] block Logic to execute within the context of the
     # definition
     # @return [Object] instance of the definition
-    def on(definition, &block)
-      return @active if @active.class == definition
-      @active = definition.new(@browser)
+    def on(definition, visit=false, &block)
+      definition = get_object_for(definition) if definition.is_a? String
+      @active = definition.new(@browser, visit)
       block.call @active if block
       @active
     end
@@ -22,81 +22,25 @@ module Symbiont
     # definition
     # @return [Object] instance of the definition
     def on_view(definition, &block)
-      @active = definition.new(@browser, true)
-      block.call @active if block
-      @active
-    end
-    
-    alias :during :on
-    alias :start_activity :on_view
-    
-    # Starts a workflow, which is a set of predefined actions. You can use
-    # this to navigate through a set of actions (and thus a set of
-    # definitions). This is done by calling an action that is specified as
-    # part of the workflow path. This action will be called on the relevant
-    # definition at each point of the workflow.
-    #
-    # @param [Class] definition an instance of the definition; note this
-    # instance must have the workflow action defined on it.
-    # @param [Hash] elements a hash that contains an element with the
-    # key :using. This is used to lookup the actions for the workflow.
-    # @param [optional] block Logic to execute within the context of the
-    # workflow.
-    # @return [Object] the definition being used at that point of the
-    # workflow.
-    def start_workflow(definition, elements = {:using => :default}, &block)
-      path = workflow_path_for(elements)
-      to_element = find_element_for(path, definition) - 1
-      go_through_definitions(path[0..to_element])
-      on(definition, &block)
-    end    
-    
-    # This provides a way to start a workflow from somewhere other than the
-    # start of the workflow. Specifically, the workflow will start from whatever
-    # the active definition is.
-    #
-    # @param [Class] definition an instance of the definition; note this
-    # instance must have the workflow action defined on it.
-    # @param [Hash] elements a hash that contains an element with the
-    # key :using. This is used to lookup the actions for the workflow.
-    # @param [optional] block Logic to execute within the context of the
-    # workflow.
-    # @return [Object] the definition being used at that point of the
-    # workflow.
-    def continue_workflow(definition, elements = {:using => :default}, &block)
-      path = workflow_path_for(elements)
-      from_element = find_element_for(path, @active.class) + 1
-      to_element = find_element_for(path, definition) - 1
-      go_through_definitions(path[from_element..to_element])
-      on(definition, &block)
+      on(definition, true, &block)
     end
-    
-    def workflow_path_for(elements)
-      path = Symbiont::Factory.symbiont_workflow[elements[:using]]
-      fail("Factory workflow :#{elements[:using].to_s} does not exist.") if path.nil?
-      path
+
+    def if_on(definition, &block)
+      definition = get_object_for(definition) if definition.is_a? String
+      return @active unless @active.class == definition
+      on(definition, false, &block)
     end
-    
-    def find_element_for(path, definition)
-      path.each_with_index { |each, index| return index if each[0] == definition }
-    end
-    
-    def go_through_definitions(elements)
-      elements.each do |definition, action|
-        element = on(definition)
-        fail("Action called #{action} not specified on #{definition}.") unless element.respond_to? action
-        element.send action
+
+    alias_method :during, :on
+    alias_method :start_activity, :on_view
+    alias_method :start_on, :on_view
+
+  private
+
+    def get_object_for(definition)
+      definition.split('::').inject(Object) do |obj, name|
+        obj.const_get(name)
       end
     end
-    
-    class << self
-      attr_accessor :symbiont_workflow
-      
-      def workflow=(path)
-        raise("A default workflow path for a Factory workflow must exist.") unless path[:default]
-        @symbiont_workflow = path
-      end
-    end
-    
   end # module: Factory
 end # module: Symbiont