sapphire 0.6.7 → 0.7.0

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

@@ -3,11 +3,11 @@ module Sapphire
     module Browser
       class Popup
         def Close
-          $browser.ClosePopup
+          $driver.ClosePopup
         end
 
         def Switch
-          $browser.SwitchToPopup
+          $driver.SwitchToPopup
         end
       end
     end

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

@@ -0,0 +1,42 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Second(value)
+        second = Second.new(value, $compare1, $compare2)
+        $compare1 = nil
+        $compare2 = nil
+        return second
+      end
+
+      class Second
+
+        def initialize(value, compare1, compare2)
+          @value = value
+          if(compare1.is_a?(String))
+            @compare1 = Time.parse(compare1)
+          else
+            @compare1 = compare1
+          end
+
+          if(compare2.is_a?(String))
+            @compare2 = Time.parse(compare2)
+          else
+            @compare2 = compare2
+          end
+        end
+
+        def Differ(comparator)
+          return Fix(DifferComparison.new(Evaluation.new(@compare1.sec + @value, @compare2.sec)), comparator)
+        end
+
+        def Fix(evaluation, comparator)
+          comparator = comparator.Create(evaluation)
+
+          comparator
+        end
+
+      end
+    end
+  end
+end
+

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

@@ -3,52 +3,7 @@ module Sapphire
     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
-
-        if(results.is_a? ContainsEvaluation)
-          if(!results.left.include? results.right)
-            messages = []
-
-            messages << "expected to contain: (nil)" if results.left == nil
-            messages << "expected to contain: " + 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
+        results.Output()
       end
     end
   end

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

@@ -2,8 +2,7 @@ module Sapphire
   module DSL
     module Browser
       def Accept(item)
-        x = item.new
-        x.Accept
+        item.Accept
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Sapphire
   module DSL
     module Browser
       def Check(item)
-        item.With(:page => @page)
         item.Check
       end
     end

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

@@ -2,7 +2,6 @@ module Sapphire
   module DSL
     module Browser
       def Click(item)
-        item.With(:page => @page)
         item.Click
       end
     end

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

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

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

@@ -4,9 +4,9 @@ module Sapphire
       def Complete(page)
         if(page.is_a? Class)
           temp = page.new
-          @page = temp.Complete
+          temp.Complete
         else
-          @page = page.Complete
+          page.Complete
         end
       end
     end

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

@@ -2,7 +2,7 @@ module Sapphire
   module DSL
     module Browser
       def Disable(args)
-        return Hide(args)
+        return Not Show(args)
       end
     end
   end

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

@@ -2,19 +2,14 @@ module Sapphire
   module DSL
     module Browser
       def Exists(symbol)
-        @page.fields.each do |field|
-          field.keys.each do |field_key|
-            if(field_key == symbol)
-              begin
-                x = field[field_key].FindWithoutWait
-                return x.displayed?
-              rescue
-                return false
-              end
-            end
+        if($page.Contains symbol)
+          begin
+            x = $page.Get(symbol).FindWithoutWait
+            return x.displayed?
+          rescue
+            return false
           end
         end
-        false
       end
     end
   end

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

@@ -0,0 +1,9 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Has(page)
+        return !page.nil? && !page.empty?
+      end
+    end
+  end
+end

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

@@ -2,7 +2,6 @@ module Sapphire
   module DSL
     module Browser
       def MouseOver(item)
-        item.With(:page => @page)
         item.MouseOver
       end
     end

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

@@ -2,8 +2,7 @@ module Sapphire
   module DSL
     module Browser
       def Navigate(page)
-        @page = $browser.NavigateTo(page)
-        @page.Init
+        $driver.NavigateTo(page)
       end
     end
   end

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

@@ -0,0 +1,19 @@
+module Sapphire
+  module DSL
+    module Browser
+      def On(page)
+        page = page.new if page.is_a? Class
+        found = $driver.CurrentUrl.upcase.start_with?(page.Url.upcase)
+        if(found == false)
+          page.AlternateUrls.each do |url|
+            if( found == false)
+              found = $driver.CurrentUrl.upcase.start_with?(url.upcase)
+            end
+          end
+        end
+
+        return found
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ module Sapphire
   module DSL
     module Browser
       def Press(item)
-         item.Press
+        item.Press(item)
       end
     end
   end

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

@@ -2,7 +2,7 @@ module Sapphire
   module DSL
     module Browser
       def Reload(item)
-        $browser.Reload
+        $driver.Reload
         Should Show item
       end
     end

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

@@ -0,0 +1,22 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Remove(item)
+        ExecuteHashAgainstControl(item) do |control, arg|
+            wait = Selenium::WebDriver::Wait.new(:timeout => 5)
+            begin
+              evaluation = wait.until { x = control
+                val = x.Text
+                arr = item[item.keys.first]
+                arr.delete(val)
+                return nil
+              }
+            rescue
+              puts "Cant find item!"
+              return nil
+            end
+         end
+      end
+    end
+  end
+end

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

@@ -2,9 +2,9 @@ module Sapphire
   module DSL
     module Browser
       def Set(hash)
-        hash.With(:page => @page)
         hash.Set hash
       end
+      #alias :Set :Verb
     end
   end
 end

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

@@ -1,16 +1,14 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Start(browser)
-        if(browser == ConfigurationBrowser)
-          AppConfig.Current.Browser
-        else
-          browser.new
-        end
-
-        $browser.SetRootUrl(@rootUrl)
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Start(browser)
+        if(browser == ConfigurationBrowser)
+          return AppConfig.Current.Browser if AppConfig.Current
+          raise "No App Config defined!"
+        end
+        $driver.SetRootUrl(@rootUrl)
+      end
+    end
+  end
+end
+

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

@@ -2,7 +2,6 @@ module Sapphire
   module DSL
     module Browser
       def Uncheck(item)
-        item.With(:page => @page)
         item.Uncheck
       end
     end

data/lib/sapphire/DSL/Comparisons/CheckedComparison.rb

@@ -0,0 +1,17 @@
+module Sapphire
+  module DSL
+    class CheckedComparison < Comparison
+
+      def Compare(left, right)
+        return @comparator.Compare(left.Checked, true) if @comparator != nil
+        left.Checked
+      end
+
+      def Text
+        return @comparator.Text + " to be checked" if @comparator != nil
+        " to be checked"
+      end
+
+    end
+  end
+end

data/lib/sapphire/DSL/Comparisons/Comparison.rb

@@ -0,0 +1,34 @@
+module Sapphire
+  module DSL
+    class Comparison
+
+      attr_reader :item
+
+      def initialize(item)
+        @item = item
+        @item.CompareWith(self) if @item.is_a? Evaluation or @item.is_a? Evaluator or @item.is_a? Comparison
+      end
+
+      def CompareWith(item)
+        @comparator = item
+      end
+
+      def Create(item)
+        return self.class.new(item) if item.is_a? Comparison or item.is_a? Evaluation
+        item
+      end
+
+      def Output()
+        @item.Output
+      end
+
+      def Evaluate()
+        @item.Evaluate
+      end
+
+      def execute
+        @item.execute
+      end
+    end
+  end
+end

data/lib/sapphire/DSL/Comparisons/ContainsComparison.rb

@@ -0,0 +1,17 @@
+module Sapphire
+  module DSL
+    class ContainsComparison < Comparison
+
+      def Compare(left, right)
+        return @comparator.Compare((right.include? left), true) if @comparator != nil
+        right.include? left
+      end
+
+      def Text
+        return @comparator.Text + " to contain" if @comparator != nil
+        " to contain"
+      end
+
+    end
+  end
+end

data/lib/sapphire/DSL/Comparisons/DifferComparison.rb

@@ -0,0 +1,17 @@
+module Sapphire
+  module DSL
+    class DifferComparison < Comparison
+
+      def Compare(left, right)
+        return @comparator.Compare((right == left), true) if @comparator != nil
+        right == left
+      end
+
+      def Text
+        return @comparator.Text + "" if @comparator != nil
+        ""
+      end
+
+    end
+  end
+end