sapphire 0.6.7 → 0.7.0

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

@@ -1,27 +1,60 @@
-module Sapphire
-  module WebAbstractions
-    class DropDown < Control
-      def Selected= (value)
-        Set(value)
-      end
-
-      def Selected
-        text = self.Find
-        text.value
-      end
-
-      def Text
-        text = self.Find
-        text.attribute("value")
-      end
-
-      def Set(value)
-        text = self.Find
-        options = text.find_elements(:tag_name, "option")
-        selection = options.find{|o| o.text == value.to_s}
-        raise "could not find the value " + value.to_s if selection.nil?
-        selection.click
-      end
-    end
-  end
+module Sapphire
+  module WebAbstractions
+    class DropDown < Control
+      def Selected= (value)
+        Set(value)
+      end
+
+      def Selected
+        text = self.Find
+        text.value
+      end
+
+      def Text
+        text = self.Find
+        val = text.attribute("value")
+        options = text.find_elements(:tag_name, "option")
+        selection = options.find{|o| o.attribute("value") == val.to_s}
+        selection.text
+      end
+
+      def Set(value)
+        text = self.Find
+        options = text.find_elements(:tag_name, "option")
+        selection = options.find{|o| o.text == value.to_s}
+        raise "could not find the value " + value.to_s if selection.nil?
+        selection.click
+      end
+
+      def Contain(value)
+        ddl = self.Find
+        items = ddl.find_elements(:tag_name, "option")
+        items.each do |item|
+          if item.text == value
+            return Evaluation.new(item.text, value)
+          end
+        end
+
+        return Evaluation.new("Value not found in list", value)
+      end
+
+      def Count(value)
+        ddl = self.Find
+        items = ddl.find_elements(:tag_name, "option")
+        return Evaluation.new(items.count, value)
+      end
+
+      def Clear
+        @hash.each do |item|
+          if item.has_key? :default
+            self.Set(item[:default])
+            return
+          end
+        end
+
+        raise "no :default set for DropDown"
+      end
+
+    end
+  end
 end

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

@@ -1,7 +1,17 @@
 module Sapphire
   module WebAbstractions
     class Image < Control
+      def Source(value, comparator)
+        image = self.Find
+        evaluation = Evaluation.new(image.attribute("src"), value)
+        EqualsComparison.new(evaluation)
+      end
 
+      def AltText(value, comparator)
+        image = self.Find
+        evaluation = Evaluation.new(image.attribute("alt"), value)
+        EqualsComparison.new(evaluation)
+      end
     end
   end
 end

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

@@ -7,13 +7,43 @@ module Sapphire
         @retryAttempts = 0
       end
 
-      def Equals(value)
+      def Equals(value, comparator)
         x = self.FindAll
         x.each do |item|
-          if item.text == value
+          if comparator.Compare(item.text, value)
+            return  EqualsComparison.new(Evaluation.new(item.text, value))
+          end
+        end
+        return  EqualsComparison.new(Evaluation.new("Value not found in list", value))
+      end
+
+      def In(values, comparator)
+        x = self.FindAll
+        x.each do |item|
+          values.each do |value|
+            if comparator.Compare(item.text, value)
+              return Evaluation.new(item.text, value)
+            end
+          end
+        end
+
+        #if here then it couldnt make a match, build up the list of values
+        alltext = []
+        x.each do |item|
+          alltext << item.text
+        end
+
+        return Evaluation.new(values, alltext)
+      end
+
+      def Contain(value)
+        x = self.FindAll
+        x.each do |item|
+          if item.text.include? value
             return Evaluation.new(item.text, value)
           end
         end
+
         return Evaluation.new("Value not found in list", value)
       end
 
@@ -41,10 +71,21 @@ module Sapphire
         end
       end
 
-      def Count
+      def Count(value)
         items = self.FindAll
-        return items.count
+        return Evaluation.new(items.count, value)
+      end
+
+      def Text
+        values = []
+        x = self.FindAll
+        x.each do |item|
+          values << item.text
+        end
+
+        return values
       end
+
     end
   end
 end

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

@@ -1,18 +1,29 @@
-module Sapphire
-  module WebAbstractions
-    class RadioButton < Control
-
-      def Text
-        self.Find().text
-      end
-
-      def Check (value)
-
-        radio = self.Find
-        radio.click
-
-      end
-    end
-  end
-end
-
+module Sapphire
+  module WebAbstractions
+    class RadioButton < Control
+
+      def Text
+        self.Find().text
+      end
+
+      def Check (value)
+        radio = self.Find
+        radio.click
+      end
+
+      def Selected
+        radio = self.Find
+        val = radio.attribute("selected")
+        return val != nil
+      end
+
+      def Visible
+        radio = self.Find
+        x = radio.attribute("disabled")
+        return (x == "false")
+      end
+
+    end
+  end
+end
+

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

@@ -3,28 +3,29 @@ module Sapphire
     class TextBox < Control
 
       def Text= (value)
-        text = self.Find
-        text.send_keys value
+        textBox = self.Find
+        textBox.send_keys value
       end
 
       def Text
-        text = self.Find
-        text.attribute("value")
+        textBox = self.Find
+        textBox.attribute("value")
       end
 
       def Set(value)
         if(value == "")
           self.Clear
         else
-          text = self.Find
-          text.send_keys value
+          textBox = self.Find
+          textBox.send_keys value
         end
       end
 
       def Clear
-        text = self.Find
-        text.clear
+        textBox = self.Find
+        textBox.clear
       end
+
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Sapphire
     class Title < Control
 
       def Text
-        $browser.title
+        $driver.browser.title
       end
 
     end

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.6.7"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-02-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &10068828 !ruby/object:Gem::Requirement
+  requirement: &9901632 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10068828
+  version_requirements: *9901632
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &10068576 !ruby/object:Gem::Requirement
+  requirement: &9901380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10068576
+  version_requirements: *9901380
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &10068324 !ruby/object:Gem::Requirement
+  requirement: &9901128 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10068324
+  version_requirements: *9901128
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email:
@@ -58,7 +58,6 @@ files:
 - lib/sapphire/CommandLine.rb
 - lib/sapphire/Configuration/AppConfig.rb
 - lib/sapphire/Configuration/AttrMethods.rb
-- lib/sapphire/Configuration/SapphireConfig.rb
 - lib/sapphire/Configuration.rb
 - lib/sapphire/Data.rb
 - lib/sapphire/DataAbstractions/Database.rb
@@ -66,60 +65,77 @@ files:
 - 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
-- lib/sapphire/DSL/Browser/Extensions/Numeric.rb
-- lib/sapphire/DSL/Browser/Extensions/String.rb
-- lib/sapphire/DSL/Browser/Extensions/Symbol.rb
+- lib/sapphire/DSL/Browser/Fluff/Be.rb
 - lib/sapphire/DSL/Browser/Fluff/By.rb
+- lib/sapphire/DSL/Browser/Fluff/Have.rb
 - lib/sapphire/DSL/Browser/Fluff/To.rb
 - lib/sapphire/DSL/Browser/Fluff/With.rb
 - lib/sapphire/DSL/Browser/For.rb
-- lib/sapphire/DSL/Browser/Not.rb
-- lib/sapphire/DSL/Browser/Nouns/AlertBox.rb
 - lib/sapphire/DSL/Browser/Nouns/Browser.rb
 - lib/sapphire/DSL/Browser/Nouns/Day.rb
 - lib/sapphire/DSL/Browser/Nouns/Enter.rb
 - lib/sapphire/DSL/Browser/Nouns/Month.rb
 - lib/sapphire/DSL/Browser/Nouns/Popup.rb
+- lib/sapphire/DSL/Browser/Nouns/Second.rb
 - lib/sapphire/DSL/Browser/Should.rb
 - lib/sapphire/DSL/Browser/Tracker.rb
 - lib/sapphire/DSL/Browser/Verbs/Accept.rb
-- lib/sapphire/DSL/Browser/Verbs/Attempt.rb
 - lib/sapphire/DSL/Browser/Verbs/Check.rb
 - lib/sapphire/DSL/Browser/Verbs/Clear.rb
 - lib/sapphire/DSL/Browser/Verbs/Click.rb
-- lib/sapphire/DSL/Browser/Verbs/Close.rb
 - lib/sapphire/DSL/Browser/Verbs/Compare.rb
 - lib/sapphire/DSL/Browser/Verbs/Complete.rb
-- lib/sapphire/DSL/Browser/Verbs/Contain.rb
-- lib/sapphire/DSL/Browser/Verbs/Count.rb
-- lib/sapphire/DSL/Browser/Verbs/Differ.rb
 - lib/sapphire/DSL/Browser/Verbs/Disable.rb
-- lib/sapphire/DSL/Browser/Verbs/Error.rb
 - lib/sapphire/DSL/Browser/Verbs/Exists.rb
-- lib/sapphire/DSL/Browser/Verbs/Hide.rb
+- lib/sapphire/DSL/Browser/Verbs/Exit.rb
+- lib/sapphire/DSL/Browser/Verbs/Has.rb
 - lib/sapphire/DSL/Browser/Verbs/MouseOver.rb
 - lib/sapphire/DSL/Browser/Verbs/Navigate.rb
+- lib/sapphire/DSL/Browser/Verbs/On.rb
 - lib/sapphire/DSL/Browser/Verbs/Press.rb
 - lib/sapphire/DSL/Browser/Verbs/Reload.rb
+- lib/sapphire/DSL/Browser/Verbs/Remove.rb
 - lib/sapphire/DSL/Browser/Verbs/Set.rb
-- lib/sapphire/DSL/Browser/Verbs/Show.rb
 - lib/sapphire/DSL/Browser/Verbs/Start.rb
 - lib/sapphire/DSL/Browser/Verbs/Switch.rb
-- lib/sapphire/DSL/Browser/Verbs/Transition.rb
 - lib/sapphire/DSL/Browser/Verbs/Uncheck.rb
 - lib/sapphire/DSL/Browser/Verbs/Virtually.rb
 - lib/sapphire/DSL/Browser/Verbs/Wait.rb
+- lib/sapphire/DSL/Comparisons/CheckedComparison.rb
+- lib/sapphire/DSL/Comparisons/Comparison.rb
+- lib/sapphire/DSL/Comparisons/ContainsComparison.rb
+- lib/sapphire/DSL/Comparisons/DifferComparison.rb
+- lib/sapphire/DSL/Comparisons/EqualsComparison.rb
+- lib/sapphire/DSL/Comparisons/NotComparison.rb
+- lib/sapphire/DSL/Comparisons/SelectedComparison.rb
+- lib/sapphire/DSL/Comparisons/StartsWithComparison.rb
+- lib/sapphire/DSL/Comparisons/VisibleComparison.rb
 - lib/sapphire/DSL/Configuration/ConfiguredBrowser.rb
 - lib/sapphire/DSL/Configuration/ConfiguredUser.rb
 - lib/sapphire/DSL/Configuration/Use.rb
-- lib/sapphire/DSL/Data/Exist.rb
 - lib/sapphire/DSL/Data/Find.rb
 - lib/sapphire/DSL/Data/GetPageField.rb
-- lib/sapphire/DSL/Data/Validate.rb
 - lib/sapphire/DSL/Data/Verify.rb
 - lib/sapphire/DSL/Data/Write.rb
+- lib/sapphire/DSL/Evaluations/Evaluation.rb
+- lib/sapphire/DSL/Evaluations/FieldNotDefinedEvaluation.rb
+- lib/sapphire/DSL/Evaluations/FieldNotFoundEvaluation.rb
+- lib/sapphire/DSL/Evaluators/AltText.rb
+- lib/sapphire/DSL/Evaluators/Checked.rb
+- lib/sapphire/DSL/Evaluators/Contain.rb
+- lib/sapphire/DSL/Evaluators/Count.rb
+- lib/sapphire/DSL/Evaluators/Differ.rb
+- lib/sapphire/DSL/Evaluators/Evaluator.rb
+- lib/sapphire/DSL/Evaluators/Exist.rb
+- lib/sapphire/DSL/Evaluators/In.rb
+- lib/sapphire/DSL/Evaluators/Selected.rb
+- lib/sapphire/DSL/Evaluators/Show.rb
+- lib/sapphire/DSL/Evaluators/Source.rb
+- lib/sapphire/DSL/Evaluators/Transition.rb
+- lib/sapphire/DSL/Evaluators/Validate.rb
+- lib/sapphire/DSL/Events/Causes.rb
+- lib/sapphire/DSL/Events/Event.rb
+- lib/sapphire/DSL/Events/Expect.rb
 - lib/sapphire/DSL/Scenarios/and.rb
 - lib/sapphire/DSL/Scenarios/background.rb
 - lib/sapphire/DSL/Scenarios/dsl.rb
@@ -139,17 +155,16 @@ files:
 - lib/sapphire/DSL/TestPlans/Run.rb
 - lib/sapphire/DSL/TestPlans/TestPlan.rb
 - lib/sapphire/DSL.rb
+- lib/sapphire/Extensions/Class.rb
+- lib/sapphire/Extensions/Hash.rb
+- lib/sapphire/Extensions/Numeric.rb
+- lib/sapphire/Extensions/Object.rb
+- lib/sapphire/Extensions/String.rb
+- lib/sapphire/Extensions/Symbol.rb
+- lib/sapphire/Extensions.rb
 - lib/sapphire/JobAbstractions/Job.rb
-- lib/sapphire/Strategies/ClassStrategy.rb
-- lib/sapphire/Strategies/ContainsEvaluation.rb
-- lib/sapphire/Strategies/ContainsNullModifier.rb
-- lib/sapphire/Strategies/DefaultStrategy.rb
-- lib/sapphire/Strategies/Evaluation.rb
-- lib/sapphire/Strategies/HashStrategy.rb
-- lib/sapphire/Strategies/NullModifier.rb
-- lib/sapphire/Strategies/Strategy.rb
-- lib/sapphire/Strategies/SymbolStrategy.rb
-- lib/sapphire/Strategies.rb
+- lib/sapphire/Sessions/Parameter.rb
+- lib/sapphire/Sessions/Storage.rb
 - lib/sapphire/TeamCity/TeamCityReporter.rb
 - lib/sapphire/TeamCity.rb
 - lib/sapphire/Testing/ConsoleReporter.rb
@@ -169,6 +184,7 @@ files:
 - lib/sapphire/Testing/TestRunnerAdapter.rb
 - lib/sapphire/Testing.rb
 - lib/sapphire/UI/Functions.rb
+- lib/sapphire/UI/ProcessBuilder.rb
 - lib/sapphire/UI/VirtualUI.rb
 - lib/sapphire/version.rb
 - lib/sapphire/Virtualization.rb
@@ -176,6 +192,7 @@ files:
 - lib/sapphire/WebAbstractions/Browsers/Chrome.rb
 - lib/sapphire/WebAbstractions/Browsers/FireFox.rb
 - lib/sapphire/WebAbstractions/Browsers/InternetExplorer.rb
+- lib/sapphire/WebAbstractions/Controls/AlertBox.rb
 - lib/sapphire/WebAbstractions/Controls/Base/Control.rb
 - lib/sapphire/WebAbstractions/Controls/Base/Page.rb
 - lib/sapphire/WebAbstractions/Controls/Button.rb
@@ -187,7 +204,6 @@ files:
 - lib/sapphire/WebAbstractions/Controls/Label.rb
 - lib/sapphire/WebAbstractions/Controls/List.rb
 - lib/sapphire/WebAbstractions/Controls/RadioButton.rb
-- lib/sapphire/WebAbstractions/Controls/TableCell.rb
 - lib/sapphire/WebAbstractions/Controls/TextBox.rb
 - lib/sapphire/WebAbstractions/Controls/Title.rb
 - lib/sapphire.rb
@@ -212,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: An automated web acceptance test framework for non-technical resources