sapphire 0.7.26 → 0.8.0

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

@@ -1,17 +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
+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

@@ -1,17 +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
+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

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

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

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

@@ -1,21 +1,21 @@
-module Sapphire
-  module DSL
-    def Not(item)
-      NotComparison.new(item)
-    end
-
-    class NotComparison < Comparison
-
-      def Compare(left, right)
-        return @comparator.Compare(left != right, true) if @comparator != nil
-        left != right
-      end
-
-      def Text
-        return @comparator.Text + " NOT" if @comparator != nil
-        " NOT"
-      end
-
-    end
-  end
+module Sapphire
+  module DSL
+    def Not(item)
+      NotComparison.new(item)
+    end
+
+    class NotComparison < Comparison
+
+      def Compare(left, right)
+        return @comparator.Compare(left != right, true) if @comparator != nil
+        left != right
+      end
+
+      def Text
+        return @comparator.Text + " NOT" if @comparator != nil
+        " NOT"
+      end
+
+    end
+  end
 end

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

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

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

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

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

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

data/lib/sapphire/DSL/Configuration/ConfiguredBrowser.rb

@@ -1,13 +1,13 @@
-module Sapphire
-  module DSL
-    module Configuration
-      def ConfiguredBrowser(url)
-        @rootUrl = url
-        ConfigurationBrowser
-      end
-
-      class ConfigurationBrowser
-      end
-    end
-  end
+module Sapphire
+  module DSL
+    module Configuration
+      def ConfiguredBrowser(url)
+        @rootUrl = url
+        ConfigurationBrowser
+      end
+
+      class ConfigurationBrowser
+      end
+    end
+  end
 end

data/lib/sapphire/DSL/Configuration/ConfiguredUser.rb

@@ -1,11 +1,11 @@
-module Sapphire
-  module DSL
-    module Configuration
-      def configured_user
-        $user
-      end
-      class ConfiguredUser
-      end
-    end
-  end
+module Sapphire
+  module DSL
+    module Configuration
+      def configured_user
+        $user
+      end
+      class ConfiguredUser
+      end
+    end
+  end
 end

data/lib/sapphire/DSL/Configuration/Use.rb

@@ -1,18 +1,18 @@
-module Sapphire
-  module DSL
-    module Configuration
-      def Use(user)
-        if(user == ConfiguredUser)
-          if AppConfig.Current.nil?
-            raise "No App Config defined!"
-          end
-          $user = AppConfig.new().User
-        else
-          $user = user.new
-        end
-      end
-    end
-  end
-end
-
-
+module Sapphire
+  module DSL
+    module Configuration
+      def Use(user)
+        if(user == ConfiguredUser)
+          if AppConfig.Current.nil?
+            raise "No App Config defined!"
+          end
+          $user = AppConfig.new().User
+        else
+          $user = user.new
+        end
+      end
+    end
+  end
+end
+
+

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

@@ -1,10 +1,10 @@
-module Sapphire
-  module DSL
-    module Data
-      def Find(query, &block)
-        query.Execute block
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Data
+      def Find(query, &block)
+        query.Execute block
+      end
+    end
+  end
+end
+

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

@@ -1,13 +1,13 @@
-module Sapphire
-  module DSL
-    module Data
-      def GetPageField(key)
-
-        return $page.Get(key) if $page.Contains key
-
-        raise "Could not find control for: " + key + " for page " + $page.to_s
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Data
+      def GetPageField(key)
+
+        return $page.Get(key) if $page.Contains key
+
+        raise "Could not find control for: " + key + " for page " + $page.to_s
+      end
+    end
+  end
+end
+

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

@@ -1,10 +1,10 @@
-module Sapphire
-  module DSL
-    module Data
-      def Verify(instance)
-        instance.Verify
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Data
+      def Verify(instance)
+        instance.Verify
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Evaluations/ControlEvaluation.rb

@@ -0,0 +1,13 @@
+module Sapphire
+  module DSL
+    class ControlEvaluation < Evaluation
+
+      attr_reader :control
+
+      def initialize(left, right, control)
+        @control = control
+        super left, right
+      end
+    end
+  end
+end

data/lib/sapphire/DSL/Evaluations/Evaluation.rb

@@ -1,46 +1,56 @@
-module Sapphire
-  module DSL
-    class Evaluation
-
-      attr_accessor :left
-      attr_accessor :right
-
-      def initialize(left, right)
-        @left = left
-        @right = right
-      end
-
-      def Compare(left, right)
-        return @comparator.Compare(left, right) if @comparator != nil
-        EqualsComparison.new(self).Compare(left, right) if @comparator == nil
-      end
-
-      def CompareWith(item)
-        @comparator = item
-      end
-
-      def execute()
-        self.Output()
-      end
-
-      def Evaluate()
-        Compare(@left, @right)
-      end
-
-      def Output()
-
-        if(!Compare(@left, @right))
-          messages = []
-
-          messages << "expected" + @comparator.Text + ": (nil)" if @right == nil
-          messages << "expected" + @comparator.Text + ": " + @right.to_s if @right != nil
-          messages << "got: (nil)" if @left == nil
-          messages << "got: " + @left.to_s if @left != nil
-
-          raise ExpectationException.new(messages)
-        end
-
-      end
-    end
-  end
+module Sapphire
+  module DSL
+    class Evaluation
+
+      attr_accessor :left
+      attr_accessor :right
+
+      def initialize(left, right)
+        @left = left
+        @right = right
+      end
+
+      def Compare(left, right)
+        return @comparator.Compare(left, right) if @comparator != nil
+        EqualsComparison.new(self).Compare(left, right) if @comparator == nil
+      end
+
+      def CompareWith(item)
+        @comparator = item
+      end
+
+      def execute()
+        self.Output()
+      end
+
+      def Evaluate()
+        Compare(@left, @right)
+      end
+
+      def Output()
+
+      if(!Compare(@left, @right))
+        self.Failed(@control)
+      else
+        self.Passed(@control)
+      end
+
+      end
+
+      def Failed(control)
+        messages = []
+
+        messages << "expected" + @comparator.Text + ": (nil)" if @right == nil
+        messages << "expected" + @comparator.Text + ": " + @right.to_s if @right != nil
+        messages << "got: (nil)" if @left == nil
+        messages << "got: " + @left.to_s if @left != nil
+
+        raise ExpectationException.new(messages)
+      end
+
+      def Passed(control)
+
+      end
+    end
+  end
 end