sapphire 0.5.2 → 0.5.3

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

@@ -1,10 +1,10 @@
-module Sapphire
-  module DSL
-    module Browser
-      def IsHidden(args)
-
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def IsHidden(args)
+
+      end
+    end
+  end
+end
+

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

@@ -1,33 +1,33 @@
-module Sapphire
-  module DSL
-    module Browser
-      def IsVisible(args)
-        @page.fields.each do |field|
-          field.keys.each do |field_key|
-            if(field_key == args)
-              begin
-                x = field[field_key].Find
-                if(x)
-                  begin
-                    wait = Selenium::WebDriver::Wait.new(:timeout => 30)
-                    result = wait.until { y = x.displayed?
-                      y unless y == false
-                    }
-                    return result
-                  rescue
-                    return false
-                  end
-                end
-              rescue
-               return false
-              end
-            end
-          end
-        end
-
-        raise "cannot find control matching " + args.to_s + " for page " + @page.to_s
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def IsVisible(args)
+        @page.fields.each do |field|
+          field.keys.each do |field_key|
+            if(field_key == args)
+              begin
+                x = field[field_key].Find
+                if(x)
+                  begin
+                    wait = Selenium::WebDriver::Wait.new(:timeout => 30)
+                    result = wait.until { y = x.displayed?
+                      y unless y == false
+                    }
+                    return result
+                  rescue
+                    return false
+                  end
+                end
+              rescue
+               return false
+              end
+            end
+          end
+        end
+
+        raise "cannot find control matching " + args.to_s + " for page " + @page.to_s
+      end
+    end
+  end
+end
+

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

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

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

@@ -1,24 +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
-
+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/MouseOver.rb

@@ -1,12 +1,12 @@
-module Sapphire
-  module DSL
-    module Browser
-      def MouseOver(*args)
-        ExecuteAgainstControl(args) do |control, arg|
-          control.MouseOver
-        end
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def MouseOver(*args)
+        ExecuteAgainstControl(args) do |control, arg|
+          control.MouseOver
+        end
+      end
+    end
+  end
+end
+

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

@@ -1,11 +1,11 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Navigate(page)
-        @page = @browser.NavigateTo(page)
-        @page.Init
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Navigate(page)
+        @page = @browser.NavigateTo(page)
+        @page.Init
+      end
+    end
+  end
+end
+

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

@@ -3,13 +3,11 @@ module Sapphire
     module Browser
       class Popup
         def Close
-          $browser.switch_to.window($browser.window_handles.last)
-          $browser.close
-          $browser.switch_to.window($browser.window_handles[0])
+          $browser.ClosePopup
         end
 
         def Switch
-          $browser.switch_to.window($browser.window_handles.last)
+          $browser.SwitchToPopup
         end
       end
     end

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

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

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

@@ -1,11 +1,11 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Reload(item)
-        @browser.Reload
-        Should Show item
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Reload(item)
+        @browser.Reload
+        Should Show item
+      end
+    end
+  end
+end
+

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

@@ -1,18 +1,18 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Set(hash)
-        if(hash.keys.first == AlertBox)
-          text = hash[item.keys.first]
-          klass = hash.keys.first.new
-          klass.Set text
-        else
-          ExecuteHashAgainstControl(hash, @page) do |control, arg|
-            control.Set arg
-          end
-        end
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Set(hash)
+        if(hash.keys.first == AlertBox)
+          text = hash[item.keys.first]
+          klass = hash.keys.first.new
+          klass.Set text
+        else
+          ExecuteHashAgainstControl(hash, @page) do |control, arg|
+            control.Set arg
+          end
+        end
+      end
+    end
+  end
+end
+

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

@@ -1,42 +1,42 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Should(item)
-        results = item.execute()
-
-        if results.is_a? Hash
-          @page = results[:page] if results[:page] != nil
-          value = results[:value]
-          modifier = results[:modifier]
-
-          if value.is_a? Hash
-            @page = value[:page] if value[:page] != nil
-            sub_value = value[:value]
-            modifier.Evaluate(sub_value)
-            return
-          end
-          modifier.Evaluate(value)
-
-          return
-        end
-
-        if(results.is_a? Evaluation)
-          if(results.left != results.right)
-            messages = []
-
-            messages << "expected: (nil)" if results.left == nil
-            messages << "expected: " + results.left.to_s if results.left != nil
-            messages << "got: (nil)" if results.right == nil
-            messages << "got: " + results.right.to_s if results.right != nil
-
-            raise ExpectationException.new(messages)
-          end
-          return
-        end
-
-        raise "Cannot act upon result " + results.to_s + " for page " + @page.to_s
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Should(item)
+        results = item.execute()
+
+        if results.is_a? Hash
+          @page = results[:page] if results[:page] != nil
+          value = results[:value]
+          modifier = results[:modifier]
+
+          if value.is_a? Hash
+            @page = value[:page] if value[:page] != nil
+            sub_value = value[:value]
+            modifier.Evaluate(sub_value)
+            return
+          end
+          modifier.Evaluate(value)
+
+          return
+        end
+
+        if(results.is_a? Evaluation)
+          if(results.left != results.right)
+            messages = []
+
+            messages << "expected: (nil)" if results.left == nil
+            messages << "expected: " + results.left.to_s if results.left != nil
+            messages << "got: (nil)" if results.right == nil
+            messages << "got: " + results.right.to_s if results.right != nil
+
+            raise ExpectationException.new(messages)
+          end
+          return
+        end
+
+        raise "Cannot act upon result " + results.to_s + " for page " + @page.to_s
+      end
+    end
+  end
+end
+

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

@@ -1,26 +1,26 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Show(item)
-        NullModifier.new(Show.new(item, @page, @browser))
-      end
-
-      class Show
-        def initialize(item, page, browser)
-          @item = item
-          @page = page
-          @browser = browser
-        end
-
-        def ModifyWith(item)
-          @modifier = item
-        end
-
-        def execute
-          return { :value => SapphireConfig.Current.GetBy(@item.class).new(@page, @browser).Show(@item, @modifier), :modifier => @modifier }
-        end
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Show(item)
+        NullModifier.new(Show.new(item, @page, @browser))
+      end
+
+      class Show
+        def initialize(item, page, browser)
+          @item = item
+          @page = page
+          @browser = browser
+        end
+
+        def ModifyWith(item)
+          @modifier = item
+        end
+
+        def execute
+          return { :value => SapphireConfig.Current.GetBy(@item.class).new(@page, @browser).Show(@item, @modifier), :modifier => @modifier }
+        end
+      end
+    end
+  end
+end
+