sapphire 0.8.3 → 0.8.4

data/lib/sapphire/Adapters/Selenium/RubySeleniumWebDriver.rb

@@ -128,7 +128,7 @@ module Sapphire
         $page ||= page
 
         timeout = GetValue(page, :wait)
-        timeout ||= 5
+        timeout ||= 20
 
         $page.Init
 
@@ -206,8 +206,8 @@ module Sapphire
 
         if array.is_a? Hash
           x = self.FindElement array.keys.first, array.fetch(array.keys.first)
-          by = item.keys.first
-          value = item.fetch(item.keys.first)
+          by = array.keys.first
+          value = array.fetch(array.keys.first)
         end
         return x, by, value if x != nil
         return x, by, value if comparator.Compare(x != nil, true) if comparator != nil
@@ -270,7 +270,7 @@ module Sapphire
 
           end if array.is_a? Array
 
-          x = self.FindElement array.keys.first, array.fetch(array.keys.first) if array.is_a? Hash
+          x = self.FindElements array.keys.first, array.fetch(array.keys.first) if array.is_a? Hash
           if !x.nil?
             by = item.keys.first
             value = item[item.keys.first]

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

@@ -1,10 +1,10 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Create(item, &block)
-        item.Create(item) do block.call end
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Create(item, &block)
+        item.Create(item) do block.call end
+      end
+    end
+  end
+end
+

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

@@ -1,20 +1,20 @@
-module Sapphire
-  module DSL
-    module Browser
-      def ExecuteHashAgainstControl(hash, &block)
-        hash.keys.each do |key|
-          return block.call($page.Get(key), hash[key]) if($page.Contains key)
-        end
-
-        raise "Cannot find control matching " + hash.to_s + " for page " + $page.to_s
-      end
-
-      def ExecuteAgainstControl(item, &block)
-        return block.call($page.Get(item), item) if($page.Contains item)
-
-        raise "Cannot find controls matching: " + item.to_s + "for page " + $page.to_s
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def ExecuteHashAgainstControl(hash, &block)
+        hash.keys.each do |key|
+          return block.call($page.Get(key), hash[key]) if($page.Contains key)
+        end
+
+        raise "Cannot find control matching " + hash.to_s + " for page " + $page.to_s
+      end
+
+      def ExecuteAgainstControl(item, &block)
+        return block.call($page.Get(item), item) if($page.Contains item)
+
+        raise "Cannot find controls matching: " + item.to_s + "for page " + $page.to_s
+      end
+    end
+  end
+end
+

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

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

data/lib/sapphire/DSL/Browser/Fluff/To.rb

@@ -1,10 +1,10 @@
-module Sapphire
-  module DSL
-    module Browser
-      def To(item)
-        item
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def To(item)
+        item
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/Fluff/With.rb

@@ -1,10 +1,10 @@
-module Sapphire
-  module DSL
-    module Browser
-      def With(item)
-        item
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def With(item)
+        item
+      end
+    end
+  end
+end
+

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

@@ -1,17 +1,17 @@
-module Sapphire
-  module DSL
-    module Browser
-      class Browser
-        def Close
-          sleep(2)
-          $driver.Close
-        end
-
-        def Switch
-          $driver.Switch
-        end
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      class Browser
+        def Close
+          sleep(2)
+          $driver.Close
+        end
+
+        def Switch
+          $driver.Switch
+        end
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/Nouns/Enter.rb

@@ -1,11 +1,11 @@
-module Sapphire
-  module DSL
-    module Browser
-      class Enter
-          def Press
-            $driver.Type("\n")
-          end
-      end
-    end
-  end
+module Sapphire
+  module DSL
+    module Browser
+      class Enter
+          def Press
+            $driver.Type("\n")
+          end
+      end
+    end
+  end
 end

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

@@ -1,15 +1,15 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Track(hash)
-        $tracker ||= {}
-        $tracker.merge! hash
-      end
-
-      def Tracker(item)
-        $tracker[item]
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Track(hash)
+        $tracker ||= {}
+        $tracker.merge! hash
+      end
+
+      def Tracker(item)
+        $tracker[item]
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/Verbs/Accept.rb

@@ -1,9 +1,9 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Accept(item)
-        item.Accept
-      end
-    end
-  end
+module Sapphire
+  module DSL
+    module Browser
+      def Accept(item)
+        item.Accept
+      end
+    end
+  end
 end

data/lib/sapphire/DSL/Browser/Verbs/Check.rb

@@ -1,10 +1,10 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Check(item)
-        item.Check
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Check(item)
+        item.Check
+      end
+    end
+  end
+end
+

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

@@ -1,9 +1,9 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Clear(item)
-        item.Clear(item)
-      end
-    end
-  end
+module Sapphire
+  module DSL
+    module Browser
+      def Clear(item)
+        item.Clear(item)
+      end
+    end
+  end
 end

data/lib/sapphire/DSL/Browser/Verbs/Click.rb

@@ -1,10 +1,10 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Click(item)
-        item.Click
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Click(item)
+        item.Click
+      end
+    end
+  end
+end
+

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

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

data/lib/sapphire/DSL/Browser/Verbs/Complete.rb

@@ -1,14 +1,14 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Complete(page)
-        if(page.is_a? Class)
-          temp = page.new
-          temp.Complete
-        else
-          page.Complete
-        end
-      end
-    end
-  end
+module Sapphire
+  module DSL
+    module Browser
+      def Complete(page)
+        if(page.is_a? Class)
+          temp = page.new
+          temp.Complete
+        else
+          page.Complete
+        end
+      end
+    end
+  end
 end

data/lib/sapphire/DSL/Browser/Verbs/Exists.rb

@@ -1,16 +1,16 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Exists(symbol)
-        if($page.Contains symbol)
-          begin
-            return $page.Get(symbol).Visible(false).Evaluate()
-          rescue
-            return false
-          end
-        end
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Exists(symbol)
+        if($page.Contains symbol)
+          begin
+            return $page.Get(symbol).Visible(false).Evaluate()
+          rescue
+            return false
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/Verbs/Exit.rb

@@ -1,11 +1,11 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Exit(item)
-        item.Close
-      end
-    end
-  end
-end
-
-
+module Sapphire
+  module DSL
+    module Browser
+      def Exit(item)
+        item.Close
+      end
+    end
+  end
+end
+
+