sapphire 0.0.5 → 0.0.6

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

@@ -3,13 +3,11 @@ module Sapphire
     module Browser
       def Clear(item)
         if(item.is_a? Class)
-          x = item.new
+          x = item.new $browser
           x.Clear
           return
         end
-        @page.Reset
       end
     end
   end
-end
-
+end

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

@@ -0,0 +1,10 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Disable(args)
+        return Hide(args)
+      end
+    end
+  end
+end
+

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

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

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

@@ -0,0 +1,13 @@
+module Sapphire
+  module DSL
+    module Browser
+      class Popup
+        def Close
+          $browser.switch_to.window($browser.window_handles.last)
+          $browser.close
+          $browser.switch_to.window($browser.window_handles[0])
+        end
+      end
+    end
+  end
+end

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

@@ -2,16 +2,19 @@ module Sapphire
   module DSL
     module Browser
       def Show(item)
-        sleep(0.5)
         if(item.is_a? Hash)
           ExecuteHashAgainstControl(item) do |control, arg|
-            return control.Text == arg
+            wait = Selenium::WebDriver::Wait.new(:timeout => 10)
+            text = wait.until { x = control.Text
+              x unless x == ""
+            }
+
+            return text == arg
           end
         elsif(item.is_a? Symbol)
           return IsVisible(item) == true
         elsif(item.is_a? Class)
           temp, @page = @browser.ShouldNavigateTo item
-          sleep(1.5)
           @page.Init
           return temp
         else
@@ -19,7 +22,6 @@ module Sapphire
           @page.Init
           return true
         end
-
       end
     end
   end

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

@@ -0,0 +1,9 @@
+module Sapphire
+  module DSL
+    module Data
+      def Write(query)
+        query.Execute
+      end
+    end
+  end
+end

data/lib/sapphire/DataAbstractions/NonQuery.rb

@@ -0,0 +1,19 @@
+module Sapphire
+  module DataAbstractions
+    module NonQuery
+      def Execute
+          x = self.Database.new
+
+          x.Open $config[x.Connection]
+
+          path = File.expand_path(self.Script, __FILE__)
+          file = File.open(path)
+          contents = file.read
+          self.Tokenize(contents)
+
+          x.query(contents)
+          x.close
+        end
+      end
+  end
+end

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

@@ -30,11 +30,16 @@ module Sapphire
       end
 
       def CurrentUrl
-        self.current_url
+        wait = Selenium::WebDriver::Wait.new(:timeout => 10)
+        url = wait.until { x = self.current_url
+            x unless x == nil
+        }
+
+        url
       end
 
       def Reload
-        self.browser.get self.current_url
+        self.browser.get self.CurrentUrl
       end
 
       def ShouldNavigateTo(page)
@@ -44,7 +49,7 @@ module Sapphire
           nav = page
         end
 
-        temp = self.current_url.upcase.start_with?("HTTPS://" + nav.Url.upcase) == true
+        temp = self.CurrentUrl.upcase.start_with?("HTTPS://" + nav.Url.upcase) == true
 
         return temp, nav
       end
@@ -60,11 +65,11 @@ module Sapphire
 
       def ShouldTransitionTo(url)
         if(url.instance_of?(String))
-          temp = self.current_url.upcase.start_with?("HTTPS://" + url.upcase) == true
+          temp = self.CurrentUrl.upcase.start_with?("HTTPS://" + url.upcase) == true
           @rootUrl = url
         else
           x = url.new().Url
-          temp = self.current_url.upcase.start_with?("HTTPS://" + x.upcase) == true
+          temp = self.CurrentUrl.upcase.start_with?("HTTPS://" + x.upcase) == true
           @rootUrl = x
         end
 

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

@@ -1,15 +1,15 @@
 module Sapphire
   module WebAbstractions
     class FireFoxBrowser < DelegateClass(Selenium::WebDriver::Firefox::Bridge)
-    include WebBrowser
+      include WebBrowser
 
-    attr_reader :browser
+      attr_reader :browser
 
-    def initialize()
-      @browser = Selenium::WebDriver.for :firefox
-      super(@browser)
-      $browser = @browser
-    end
+      def initialize()
+        @browser = Selenium::WebDriver.for :firefox
+        super(@browser)
+        $browser = @browser
+      end
 
     end
 

data/lib/sapphire/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-12 00:00:00.000000000 -05:00
-default_executable: 
+date: 2011-07-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: albacore
-  requirement: &24316488 !ruby/object:Gem::Requirement
+  requirement: &9595572 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24316488
+  version_requirements: *9595572
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &24316044 !ruby/object:Gem::Requirement
+  requirement: &9595140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24316044
+  version_requirements: *9595140
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &24315720 !ruby/object:Gem::Requirement
+  requirement: &9594708 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24315720
+  version_requirements: *9594708
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email:
@@ -54,6 +53,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/sapphire/DataAbstractions/Database.rb
+- lib/sapphire/DataAbstractions/NonQuery.rb
 - lib/sapphire/DataAbstractions/Query.rb
 - lib/sapphire/DSL/Browser/Browser.rb
 - lib/sapphire/DSL/Browser/Check.rb
@@ -62,6 +62,7 @@ files:
 - lib/sapphire/DSL/Browser/Close.rb
 - lib/sapphire/DSL/Browser/Complete.rb
 - lib/sapphire/DSL/Browser/CurrentUrl.rb
+- lib/sapphire/DSL/Browser/Disable.rb
 - lib/sapphire/DSL/Browser/Error.rb
 - lib/sapphire/DSL/Browser/ExecuteAgainstControl.rb
 - lib/sapphire/DSL/Browser/Exists.rb
@@ -72,6 +73,7 @@ files:
 - lib/sapphire/DSL/Browser/MouseOver.rb
 - lib/sapphire/DSL/Browser/Navigate.rb
 - lib/sapphire/DSL/Browser/Not.rb
+- lib/sapphire/DSL/Browser/Popup.rb
 - lib/sapphire/DSL/Browser/Reload.rb
 - lib/sapphire/DSL/Browser/Set.rb
 - lib/sapphire/DSL/Browser/Should.rb
@@ -91,6 +93,7 @@ files:
 - lib/sapphire/DSL/Data/Underscore.rb
 - lib/sapphire/DSL/Data/Validate.rb
 - lib/sapphire/DSL/Data/Verify.rb
+- lib/sapphire/DSL/Data/Write.rb
 - lib/sapphire/DSL/Scenarios/and.rb
 - lib/sapphire/DSL/Scenarios/background.rb
 - lib/sapphire/DSL/Scenarios/dsl.rb
@@ -128,7 +131,6 @@ files:
 - lib/sapphire/WebAbstractions/Controls/TextBox.rb
 - lib/sapphire/WebAbstractions/Controls/Title.rb
 - lib/sapphire.rb
-has_rdoc: true
 homepage: http://github.com/MarcusTheBold/Sapphire/
 licenses: []
 post_install_message: 
@@ -149,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: An automated web acceptance test framework for non-technical resources