sapphire 0.8.3 → 0.8.4

data/lib/sapphire/WebAbstractions/Controls/Button.rb

@@ -1,7 +1,7 @@
-module Sapphire
-  module WebAbstractions
-    class Button < Control
-    end
-  end
-end
-
+module Sapphire
+  module WebAbstractions
+    class Button < Control
+    end
+  end
+end
+

data/lib/sapphire/WebAbstractions/Controls/Date.rb

@@ -1,12 +1,12 @@
-module Sapphire
-  module WebAbstractions
-    class Date < Control
-
-      def Text
-        control = self.Find
-        return DateTime.strptime(control.text, "%m/%d/%Y %H:%M:%S %p").to_date
-      end
-
-    end
-  end
+module Sapphire
+  module WebAbstractions
+    class Date < Control
+
+      def Text
+        control = self.Find
+        return DateTime.strptime(control.text, "%m/%d/%Y %H:%M:%S %p").to_date
+      end
+
+    end
+  end
 end

data/lib/sapphire/WebAbstractions/Controls/DropDown.rb

@@ -26,16 +26,16 @@ module Sapphire
         selection.click
       end
 
-      def Contain(value)
+      def Contain(expected_value)
         ddl = self.Find
         items = ddl.find_elements(:tag_name, "option")
         items.each do |item|
-          if item.text == value
-            return ControlEvaluation.new(item.text, value, self)
+          if item.text == expected_value
+            return ControlEvaluation.new(item.text, expected_value, self)
           end
         end
 
-        return ControlEvaluation.new("Value not found in list", value, self)
+        return ControlEvaluation.new("Value not found in list", expected_value, self)
       end
 
       def Count(value)

data/lib/sapphire/WebAbstractions/Controls/Hyperlink.rb

@@ -1,8 +1,8 @@
-module Sapphire
-  module WebAbstractions
-    class Hyperlink < Control
-
-    end
-  end
-end
-
+module Sapphire
+  module WebAbstractions
+    class Hyperlink < Control
+
+    end
+  end
+end
+

data/lib/sapphire/WebAbstractions/Controls/Label.rb

@@ -1,8 +1,8 @@
-module Sapphire
-  module WebAbstractions
-    class Label < Control
-
-    end
-  end
-end
-
+module Sapphire
+  module WebAbstractions
+    class Label < Control
+
+    end
+  end
+end
+

data/lib/sapphire/WebAbstractions/Controls/List.rb

@@ -43,27 +43,25 @@ module Sapphire
         return ControlEvaluation.new(values, alltext, self)
       end
 
-      def Contain(value)
-        x = self.FindAll
-        x.each do |item|
-          if item.Text.include? value
-            return ContainsComparison.new(ControlEvaluation.new(value, item.Text, item))
+      def Contain(expected_text)
+        text = self.Text
+        text.each do |t|
+          if t.include? expected_text
+            return ContainsComparison.new(ControlEvaluation.new(t, expected_text, nil))
           end
         end
 
-        return ControlEvaluation.new("Value not found in list", value, self)
+        return ControlEvaluation.new("Value not found in list", expected_text, self)
       end
 
       def Click
         wait = Selenium::WebDriver::Wait.new(:timeout => 20)
         begin
           clicked = wait.until { items = self.FindAll
-            if items.empty? == false
-              if items.first.Visible == true
-                items.first.Click
-                return true
-              end
-            end
+          if !items.empty? && items.first.Visible
+            items.first.Click
+            return true
+          end
           }
           return nil
         rescue
@@ -87,7 +85,7 @@ module Sapphire
         values = []
         x = self.FindAll
         x.each do |item|
-          values << item.Text
+          values << item.control.text
         end
 
         return values

data/lib/sapphire/WebAbstractions/Controls/Title.rb

@@ -1,12 +1,12 @@
-module Sapphire
-  module WebAbstractions
-    class Title < Control
-
-      def Text
-        $driver.Browser().title
-      end
-
-    end
-  end
-end
-
+module Sapphire
+  module WebAbstractions
+    class Title < Control
+
+      def Text
+        $driver.Browser().title
+      end
+
+    end
+  end
+end
+

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &25588344 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *25588344
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: &25588044 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: *25588044
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &25587792 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *25587792
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &25826892 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,12 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *25826892
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email:
@@ -268,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: An automated web acceptance test framework for non-technical resources