sapphire 0.5.4 → 0.5.5

data/lib/sapphire/Adapters/Selenium/RubySeleniumWebDriver.rb

@@ -120,52 +120,60 @@ module Sapphire
         return temp
       end
 
-      def FindItem(hash)
+      def FindItem(array)
         masterWait = Selenium::WebDriver::Wait.new(:timeout => 30)
 
         element = masterWait.until {
-          hash.each do |item|
-            wait = Selenium::WebDriver::Wait.new(:timeout => 1)
-            begin
-              y = wait.until {
-                x = self.FindElement item.keys.first, item.fetch(item.keys.first) if item.is_a? Hash
-                x = self.FindElement item[0], item[1] if item.is_a? Array
-                return x if x != nil
-              }
-              return y if y != nil
-            rescue
+          x = nil
+          array.each do |item|
+
+            if item.is_a? Hash
+                begin
+                  x = self.FindElement item.keys.first, item.fetch(item.keys.first)
+                rescue
+                  #do nothing, let it keep looping
+                end
             end
-          end if hash.is_a? Array
 
-          x = self.FindElement hash.keys.first, hash.fetch(hash.keys.first) if hash.is_a? Hash
+            x = self.FindElement item[0], item[1] if item.is_a? Array
+
+            return x if x != nil
+
+          end if array.is_a? Array
+
+          x = self.FindElement array.keys.first, array.fetch(hash.keys.first) if array.is_a? Hash
           return x if x != nil
-          }
+        }
         return element if element != nil
-        raise "Could not find control for symbol: " + @hash.to_s
+        raise "Could not find control for array: " + array.to_s
       end
 
-      def FindAllItems(hash)
+      def FindAllItems(array)
         masterWait = Selenium::WebDriver::Wait.new(:timeout => 30)
 
         element = masterWait.until {
-          hash.each do |item|
-            wait = Selenium::WebDriver::Wait.new(:timeout => 1)
-            begin
-              y = wait.until {
-                x = self.FindElements item.keys.first, item.fetch(item.keys.first) if item.is_a? Hash
-                x = self.FindElements item[0], item[1] if item.is_a? Array
-                return x if x != nil
-              }
-              return y if y != nil
-            rescue
+          x = nil
+          array.each do |item|
+
+            if item.is_a? Hash
+                begin
+                  x = self.FindElements item.keys.first, item.fetch(item.keys.first)
+                rescue
+                  #do nothing, let it keep looping
+                end
             end
-          end if hash.is_a? Array
 
-          x = self.FindElements hash.keys.first, hash.fetch(hash.keys.first) if hash.is_a? Hash
+            x = self.FindElements item[0], item[1] if item.is_a? Array
+
+            return x if x != nil
+
+          end if array.is_a? Array
+
+          x = self.FindElement array.keys.first, array.fetch(hash.keys.first) if array.is_a? Hash
           return x if x != nil
-          }
+        }
         return element if element != nil
-        raise "Could not find control for symbol: " + @hash.to_s
+        raise "Could not find control for array: " + array.to_s
       end
 
       def FindElement(discriminator, selector)

data/lib/sapphire/DSL/Browser/Create.rb

@@ -0,0 +1,10 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Create(item)
+        item.Create
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/Extensions/Class.rb

@@ -15,6 +15,11 @@ class Class < Module
     x.Complete
   end
 
+  def Fail(item)
+    x = item.new
+    x.Fail
+  end
+
   def Press(item)
     x = item.new
     x.Press
@@ -26,4 +31,9 @@ class Class < Module
     klass.Set text
   end
 
+  def Close
+    x = self.new
+    x.Close
+  end
+
 end

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000Z
+date: 2011-11-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &10127556 !ruby/object:Gem::Requirement
+  requirement: &10131612 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10127556
+  version_requirements: *10131612
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &10127304 !ruby/object:Gem::Requirement
+  requirement: &10131360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10127304
+  version_requirements: *10131360
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &10127052 !ruby/object:Gem::Requirement
+  requirement: &10131108 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10127052
+  version_requirements: *10131108
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email:
@@ -64,6 +64,7 @@ files:
 - lib/sapphire/DataAbstractions/Database.rb
 - lib/sapphire/DataAbstractions/NonQuery.rb
 - lib/sapphire/DataAbstractions/Query.rb
+- lib/sapphire/DSL/Browser/Create.rb
 - lib/sapphire/DSL/Browser/ExecuteAgainstControl.rb
 - lib/sapphire/DSL/Browser/Extensions/Class.rb
 - lib/sapphire/DSL/Browser/Extensions/Hash.rb