sapphire 0.0.6 → 0.0.7

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

@@ -3,7 +3,7 @@ module Sapphire
     module Browser
       def Error(hash)
        ExecuteHashAgainstControl(hash) do |control, arg|
-          return control.Text == arg
+          return control.Equals(arg)
         end
       end
     end

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

@@ -2,7 +2,7 @@ module Sapphire
   module DSL
     module Browser
       def Hide(args)
-        return IsHidden(args) == true
+        IsHidden(args) == true
       end
     end
   end

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

@@ -0,0 +1,14 @@
+module Sapphire
+  module WebAbstractions
+    class List < Control
+
+      def Equals(value)
+        x = self.FindAll
+        x.each do |item|
+          return true if item.text == value
+        end
+      end
+
+    end
+  end
+end

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

@@ -5,11 +5,11 @@ module Sapphire
         if(item.is_a? Hash)
           ExecuteHashAgainstControl(item) do |control, arg|
             wait = Selenium::WebDriver::Wait.new(:timeout => 10)
-            text = wait.until { x = control.Text
-              x unless x == ""
+            text = wait.until { x = control
+              x unless (!x.Equals(arg) && x.Equals(""))
             }
 
-            return text == arg
+            return text.Equals(arg)
           end
         elsif(item.is_a? Symbol)
           return IsVisible(item) == true

data/lib/sapphire/DSL/Data/Validate.rb

@@ -4,7 +4,7 @@ module Sapphire
       def Validate(hash)
         hash.keys.each do |key|
           if(hash[key].is_a? Symbol)
-            return key.to_s == GetPageField(hash[key]).Text
+            return GetPageField(hash[key]).Equals(key.to_s)
           else
             return key.to_s == hash[key].to_s
           end

data/lib/sapphire/WebAbstractions/Controls/Base/Control.rb

@@ -16,6 +16,16 @@ module Sapphire
         end
       end
 
+      def FindAll
+        if(@hash.has_key?(:id))
+          FindAllBy :id
+        elsif (@hash.has_key?(:name))
+          FindAllBy :name
+        elsif (@hash.has_key?(:xpath))
+          FindAllBy :xpath
+        end
+      end
+
       def FindWithoutWait
         if(@hash.has_key?(:id))
           FindWithoutWaitBy :id
@@ -37,6 +47,13 @@ module Sapphire
         }
       end
 
+      def FindAllBy(symbol)
+        wait = Selenium::WebDriver::Wait.new(:timeout => 10)
+        element = wait.until { x = @browser.find_elements symbol, @hash.fetch(symbol)
+            x
+        }
+      end
+
       def FindParent(hash)
         if(hash.has_key?(:id))
           @browser.find_element :id, hash.fetch(:id)
@@ -67,6 +84,10 @@ module Sapphire
         end
         sleep(1)
       end
+
+      def Equals(value)
+         self.Text == value
+      end
     end
   end
 end

data/lib/sapphire/WebAbstractions/Controls/Base/Page.rb

@@ -41,6 +41,10 @@ module Sapphire
         @fields << { args.first => Hyperlink.new(@browser, args[1]) }
       end
 
+      def List(*args)
+        @fields << { args.first => List.new(@browser, args[1]) }
+      end
+
     end
   end
 end

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-29 00:00:00.000000000Z
+date: 2011-08-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: albacore
-  requirement: &9595572 !ruby/object:Gem::Requirement
+  requirement: &9555948 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9595572
+  version_requirements: *9555948
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &9595140 !ruby/object:Gem::Requirement
+  requirement: &9555528 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9595140
+  version_requirements: *9555528
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &9594708 !ruby/object:Gem::Requirement
+  requirement: &9555084 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9594708
+  version_requirements: *9555084
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email:
@@ -70,6 +70,7 @@ files:
 - lib/sapphire/DSL/Browser/Hide.rb
 - lib/sapphire/DSL/Browser/IsHidden.rb
 - lib/sapphire/DSL/Browser/IsVisible.rb
+- lib/sapphire/DSL/Browser/List.rb
 - lib/sapphire/DSL/Browser/MouseOver.rb
 - lib/sapphire/DSL/Browser/Navigate.rb
 - lib/sapphire/DSL/Browser/Not.rb