sapphire 0.5.0 → 0.5.2

data/lib/sapphire/Configuration/SapphireConfig.rb

@@ -2,6 +2,8 @@ module Sapphire
   module Configuration
     class SapphireConfig
 
+      attr_reader :wait_time
+
       def initialize
         @@config = {}
 
@@ -25,6 +27,7 @@ module Sapphire
 
         return DefaultStrategy
       end
+
     end
   end
 end

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

@@ -0,0 +1,10 @@
+module Sapphire
+  module DSL
+    module Browser
+      def By(value, compare1, compare2)
+        return value, compare1, compare2
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,19 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Compare(control1, control2, &block)
+        if(control1.is_a? Symbol)
+          control1text = GetPageField(control1).Text
+        else
+          control1text = control1
+        end
+        if(control2.is_a? Symbol)
+          control2text = GetPageField(control2).Text
+        else
+          control2text = control2
+        end
+        block.call(control1text, control2text)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Day(value, compare1, compare2)
+        Day.new(value, compare1, compare2)
+      end
+
+      class Day
+
+        def initialize(value, compare1, compare2)
+          @value = value
+          @compare1 = compare1
+          @compare2 = compare2
+        end
+
+        def Differ()
+          return (@compare1 + @value) == @compare2
+        end
+
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,19 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Differ(arg)
+        return Differ.new(arg)
+      end
+
+      class Differ
+        def initialize(arg)
+          @arg = arg
+        end
+
+        def execute
+          return Evaluation.new(true, @arg.Differ) #args[0] is the value that should be the difference
+        end
+      end
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ module Sapphire
                 x = field[field_key].Find
                 if(x)
                   begin
-                    wait = Selenium::WebDriver::Wait.new(:timeout => 10)
+                    wait = Selenium::WebDriver::Wait.new(:timeout => 30)
                     result = wait.until { y = x.displayed?
                       y unless y == false
                     }

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

@@ -0,0 +1,24 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Month(value, compare1, compare2)
+        Month.new(value, compare1, compare2)
+      end
+
+      class Month
+
+        def initialize(value, compare1, compare2)
+          @value = value
+          @compare1 = compare1
+          @compare2 = compare2
+        end
+
+        def Differ()
+          return (@compare1 >> @value) == @compare2
+        end
+
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,9 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Wait(seconds)
+        sleep(seconds)
+      end
+    end
+  end
+end

data/lib/sapphire/DSL/Scenarios/then.rb

@@ -19,7 +19,7 @@ class Then
 
   def add_and(pre, text, &block)
     if(!self.value.instance_of? Pending)
-      x = And.new(self, pre + text, &block)
+      x = And.new(self, text, &block)
       self.and << x
     else
       self.and << And.new(self, Pending.new(pre + text), &block)

data/lib/sapphire/Strategies/HashStrategy.rb

@@ -4,9 +4,12 @@ module Sapphire
       class HashStrategy < Strategy
         def Show(item, modifier)
            ExecuteHashAgainstControl(item, @page) do |control, arg|
-              wait = Selenium::WebDriver::Wait.new(:timeout => 10)
+              wait = Selenium::WebDriver::Wait.new(:timeout => 30)
               text = wait.until { x = control
-                x unless (!x.Equals(arg) && x.Equals(""))
+                val = x.Equals(arg)
+                if (val.left == val.right)
+                  x
+                end
               }
 
               return text.Equals(arg)

data/lib/sapphire/Strategies/SymbolStrategy.rb

@@ -10,7 +10,7 @@ module Sapphire
                 x = field[field_key].Find
                 if(x)
                   begin
-                    wait = Selenium::WebDriver::Wait.new(:timeout => 10)
+                    wait = Selenium::WebDriver::Wait.new(:timeout => 30)
                     result = wait.until { y = modifier.Modify(x.displayed?)
                       y unless y == false
                     }
@@ -34,7 +34,7 @@ module Sapphire
             field.keys.each do |field_key|
               if(field_key == item)
                 begin
-                  wait = Selenium::WebDriver::Wait.new(:timeout => 10)
+                  wait = Selenium::WebDriver::Wait.new(:timeout => 30)
                   element = wait.until { x = field[field_key].Find
                       x and modifier.Modify(!x.displayed?)
                   }

data/lib/sapphire/Testing/ConsoleReporter.rb

@@ -47,10 +47,10 @@ module Sapphire
           end
           $stdout.puts ""
           result.stack.each do |line|
-            if (!line.include? "sapphire")
+            #if (!line.include? "sapphire")
               Indent(depth+1)
               $stdout.puts line
-            end
+            #end
           end
 
         end

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

@@ -7,61 +7,55 @@ module Sapphire
       end
 
       def Find
-        if(@hash.has_key?(:id))
-          FindBy :id
-        elsif (@hash.has_key?(:name))
-          FindBy :name
-        elsif (@hash.has_key?(:xpath))
-          FindBy :xpath
-        end
-      end
+        masterWait = Selenium::WebDriver::Wait.new(:timeout => 30)
 
-      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
+        element = masterWait.until {
+          @hash.each do |item|
+            wait = Selenium::WebDriver::Wait.new(:timeout => 1)
+            begin
+              y = wait.until {
+                x = @browser.find_element item.keys.first, item.fetch(item.keys.first) if item.is_a? Hash
+                x = @browser.find_element item[0], item[1] if item.is_a? Array
+                return x if x != nil
+              }
+              return y if y != nil
+            rescue
+            end
+          end if @hash.is_a? Array
 
-      def FindWithoutWait
-        if(@hash.has_key?(:id))
-          FindWithoutWaitBy :id
-        elsif (@hash.has_key?(:name))
-          FindWithoutWaitBy :name
-        elsif (@hash.has_key?(:xpath))
-          FindWithoutWaitBy :xpath
-        end
+          x = @browser.find_element @hash.keys.first, @hash.fetch(@hash.keys.first) if @hash.is_a? Hash
+          return x if x != nil
+          }
+        return element if element != nil
+        raise "Could not find control for symbol: " + @hash.to_s
       end
 
-      def FindWithoutWaitBy(symbol)
-        @browser.find_element symbol, @hash.fetch(symbol)
-      end
+      def FindAll
+        masterWait = Selenium::WebDriver::Wait.new(:timeout => 30)
 
-      def FindBy(symbol)
-        wait = Selenium::WebDriver::Wait.new(:timeout => 10)
-        element = wait.until { x = @browser.find_element symbol, @hash.fetch(symbol)
-            x
-        }
-      end
+        element = masterWait.until {
+          @hash.each do |item|
+            wait = Selenium::WebDriver::Wait.new(:timeout => 1)
+            begin
+              y = wait.until {
+                x = @browser.find_elements item.keys.first, item.fetch(item.keys.first) if item.is_a? Hash
+                x = @browser.find_elements item[0], item[1] if item.is_a? Array
+                return x if x != nil
+              }
+              return y if y != nil
+            rescue
+            end
+          end if @hash.is_a? Array
 
-      def FindAllBy(symbol)
-        wait = Selenium::WebDriver::Wait.new(:timeout => 10)
-        element = wait.until { x = @browser.find_elements symbol, @hash.fetch(symbol)
-            x unless x.count == 0
-        }
+          x = @browser.find_elements @hash.keys.first, @hash.fetch(@hash.keys.first) if @hash.is_a? Hash
+          return x if x != nil
+          }
+        return element if element != nil
+        raise "Could not find control for symbol: " + @hash.to_s
       end
 
-      def FindParent(hash)
-        if(hash.has_key?(:id))
-          @browser.find_element :id, hash.fetch(:id)
-        elsif (hash.has_key?(:name))
-          @browser.find_element :name, hash.fetch(:name)
-        elsif (hash.has_key?(:xpath))
-          @browser.find_element :xpath, hash.fetch(:xpath)
-        end
+      def FindWithoutWait
+        @browser.find_element @hash[0].keys.first, @hash[0].fetch(@hash[0].keys.first)
       end
 
       def Text
@@ -75,13 +69,24 @@ module Sapphire
       end
 
       def MouseOver
-        if(@hash.has_key?(:id))
-          @browser.execute_script("document.getElementById('"+ @hash.fetch(:id) +"').style.visibility = 'visible'; ")
-        elsif (@hash.has_key?(:name))
-          @browser.execute_script("document.getElementById('"+ @hash.fetch(:name) +"').style.visibility = 'visible'; ")
-        elsif (@hash.has_key?(:xpath))
-          @browser.execute_script("document.evaluate( '" + @hash.fetch(:xpath) + "', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.visibility = 'visible'; ")
+        if @hash.is_a? Hash
+          if(@hash.has_key?(:id))
+            @browser.execute_script("document.getElementById('"+ @hash.fetch(:id) +"').style.visibility = 'visible'; ")
+          elsif (@hash.has_key?(:name))
+            @browser.execute_script("document.getElementByName('"+ @hash.fetch(:name) +"').style.visibility = 'visible'; ")
+          elsif (@hash.has_key?(:xpath))
+            @browser.execute_script("document.evaluate( '" + @hash.fetch(:xpath) + "', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.visibility = 'visible'; ")
+          end
+        elsif @hash.is_a? Array
+          if(@hash[0].has_key?(:id))
+            @browser.execute_script("document.getElementById('"+ @hash[0].fetch(:id) +"').style.visibility = 'visible'; ")
+          elsif (@hash[0].has_key?(:name))
+            @browser.execute_script("document.getElementByName('"+ @hash[0].fetch(:name) +"').style.visibility = 'visible'; ")
+          elsif (@hash[0].has_key?(:xpath))
+            @browser.execute_script("document.evaluate( '" + @hash[0].fetch(:xpath) + "', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.visibility = 'visible'; ")
+          end
         end
+
         sleep(1)
       end
 
@@ -92,4 +97,3 @@ module Sapphire
   end
 end
 
-

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

@@ -14,42 +14,49 @@ module Sapphire
       end
 
       def DropDown(*args)
-        @fields << { args.first => DropDown.new(@browser, args[1]) }
+        @fields << { args.first => DropDown.new(@browser, args[1..args.length]) }
       end
 
       def TextBox(*args)
-        @fields << { args.first => TextBox.new(@browser, args[1]) }
+        @fields << { args.first => TextBox.new(@browser, args[1..args.length]) }
       end
 
       def RadioButton(*args)
-        @fields << { args.first => RadioButton.new(@browser, args[1]) }
+        @fields << { args.first => RadioButton.new(@browser, args[1..args.length]) }
       end
 
       def CheckBox(*args)
-        @fields << { args.first => CheckBox.new(@browser, args[1]) }
+        @fields << { args.first => CheckBox.new(@browser, args[1..args.length]) }
       end
 
       def Button(*args)
-        @fields << { args.first => Button.new(@browser, args[1]) }
+        @fields << { args.first => Button.new(@browser, args[1..args.length]) }
       end
 
       def Label(*args)
-        @fields << { args.first => Label.new(@browser, args[1]) }
+        @fields << { args.first => Label.new(@browser, args[1..args.length]) }
       end
 
       def Image(*args)
-        @fields << { args.first => Image.new(@browser, args[1]) }
+        @fields << { args.first => Image.new(@browser, args[1..args.length]) }
       end
 
       def Hyperlink(*args)
-        @fields << { args.first => Hyperlink.new(@browser, args[1]) }
+        @fields << { args.first => Hyperlink.new(@browser, args[1..args.length]) }
       end
 
       def List(*args)
-        @fields << { args.first => List.new(@browser, args[1]) }
+        @fields << { args.first => List.new(@browser, args[1..args.length]) }
+      end
+
+      def Date(*args)
+        @fields << { args.first => Date.new(@browser, args[1..args.length]) }
+      end
+
+      def Date(*args)
+        @fields << { args.first => Date.new(@browser, args[1]) }
       end
 
     end
   end
 end
-

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

@@ -30,7 +30,7 @@ module Sapphire
       end
 
       def CurrentUrl
-        wait = Selenium::WebDriver::Wait.new(:timeout => 10)
+        wait = Selenium::WebDriver::Wait.new(:timeout => 30)
         url = wait.until { x = self.current_url
             x unless x == nil
         }
@@ -49,7 +49,7 @@ module Sapphire
           nav = page
         end
 
-        wait = Selenium::WebDriver::Wait.new(:timeout => 10)
+        wait = Selenium::WebDriver::Wait.new(:timeout => 30)
         found = wait.until {
           x = self.CurrentUrl.upcase.start_with?("HTTP://" + nav.Url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + nav.Url.upcase)
           if(x == false)

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

@@ -0,0 +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
+end

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

@@ -18,8 +18,8 @@ module Sapphire
       def Set(value)
         text = self.Find
         options = text.find_elements(:tag_name, "option")
-        selection = options.find{|o| o.text == value}
-        raise "could not find the value " + value if selection.nil?
+        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

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

@@ -2,7 +2,7 @@ module Sapphire
   module WebAbstractions
     class Hyperlink < Control
 
-      end
+    end
   end
 end
 

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.5.0"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,68 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sapphire
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
+version: !ruby/object:Gem::Version
+  version: 0.5.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Marcus Bratton
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-08 00:00:00 -05:00
-default_executable: sapphire
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-24 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: &10052256 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: colorize
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *10052256
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: &10052004 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: Platform
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *10052004
+- !ruby/object:Gem::Dependency
+  name: Platform
+  requirement: &10051752 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-description: An automated web acceptance test framework for non-technical resources using selenium-wedriver.
-email: 
+  prerelease: false
+  version_requirements: *10051752
+description: An automated web acceptance test framework for non-technical resources
+  using selenium-wedriver.
+email:
 - marcus.bratton@gmail.com
-executables: 
+executables:
 - sapphire
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/sapphire/CommandLine.rb
 - lib/sapphire/Configuration/AppConfig.rb
 - lib/sapphire/Configuration/AttrMethods.rb
@@ -75,12 +65,16 @@ files:
 - lib/sapphire/DSL/Browser/Accept.rb
 - lib/sapphire/DSL/Browser/AlertBox.rb
 - lib/sapphire/DSL/Browser/Browser.rb
+- lib/sapphire/DSL/Browser/By.rb
 - lib/sapphire/DSL/Browser/Check.rb
 - lib/sapphire/DSL/Browser/Clear.rb
 - lib/sapphire/DSL/Browser/Click.rb
 - lib/sapphire/DSL/Browser/Close.rb
+- lib/sapphire/DSL/Browser/Compare.rb
 - lib/sapphire/DSL/Browser/Complete.rb
 - lib/sapphire/DSL/Browser/CurrentUrl.rb
+- lib/sapphire/DSL/Browser/Day.rb
+- lib/sapphire/DSL/Browser/Differ.rb
 - lib/sapphire/DSL/Browser/Disable.rb
 - lib/sapphire/DSL/Browser/Error.rb
 - lib/sapphire/DSL/Browser/ExecuteAgainstControl.rb
@@ -90,7 +84,7 @@ files:
 - lib/sapphire/DSL/Browser/IsHidden.rb
 - lib/sapphire/DSL/Browser/IsVisible.rb
 - lib/sapphire/DSL/Browser/Keys/Enter.rb
-- lib/sapphire/DSL/Browser/List.rb
+- lib/sapphire/DSL/Browser/Month.rb
 - lib/sapphire/DSL/Browser/MouseOver.rb
 - lib/sapphire/DSL/Browser/Navigate.rb
 - lib/sapphire/DSL/Browser/Not.rb
@@ -107,6 +101,7 @@ files:
 - lib/sapphire/DSL/Browser/Transition.rb
 - lib/sapphire/DSL/Browser/Uncheck.rb
 - lib/sapphire/DSL/Browser/Virtually.rb
+- lib/sapphire/DSL/Browser/Wait.rb
 - lib/sapphire/DSL/Browser/With.rb
 - lib/sapphire/DSL/Configuration/ConfiguredBrowser.rb
 - lib/sapphire/DSL/Configuration/ConfiguredUser.rb
@@ -171,44 +166,40 @@ files:
 - lib/sapphire/WebAbstractions/Controls/Browsers/InternetExplorer.rb
 - lib/sapphire/WebAbstractions/Controls/Button.rb
 - lib/sapphire/WebAbstractions/Controls/CheckBox.rb
+- lib/sapphire/WebAbstractions/Controls/Date.rb
 - lib/sapphire/WebAbstractions/Controls/DropDown.rb
 - lib/sapphire/WebAbstractions/Controls/Hyperlink.rb
 - lib/sapphire/WebAbstractions/Controls/Image.rb
 - 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
-has_rdoc: true
+- bin/sapphire
 homepage: http://github.com/MarcusTheBold/Sapphire/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: An automated web acceptance test framework for non-technical resources
 test_files: []
-