sapphire 0.7.2 → 0.7.3

data/lib/sapphire.rb

@@ -27,7 +27,6 @@ module Sapphire
     include DSL::Data
     include DSL::TestPlans
     include DSL::Events
-    include Configuration::AttrMethods
     include Configuration
     include DataAbstractions
     include JobAbstractions

data/lib/sapphire/Configuration/AppConfig.rb

@@ -1,4 +1,3 @@
-require File.expand_path('attrmethods', File.dirname(__FILE__))
 require 'ostruct'
 
 module Sapphire

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

@@ -26,7 +26,7 @@ module Sapphire
         end
 
         def Differ(comparator)
-          return Fix(DifferComparison.new(Evaluation.new(@compare1.sec + @value, @compare2.sec)), comparator)
+          return Fix(DifferComparison.new(Evaluation.new(@compare1 + @value, @compare2)), comparator)
         end
 
         def Fix(evaluation, comparator)

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

@@ -4,15 +4,17 @@ module Sapphire
 
       attr_reader :field
 
-      def initialize(field, page)
+      def initialize(field, page, message)
         @field = field
         @page = page
+        @message = message
       end
 
       def Output()
           messages = []
 
           messages << "Cannot find control matching " + @field.to_s + " for page " + @page.to_s
+          messages << "Reason: " + @message
 
           raise ExpectationException.new(messages)
       end

data/lib/sapphire/Extensions/Hash.rb

@@ -16,7 +16,7 @@ class Hash < Object
     return FieldNotDefinedEvaluation.new(key, $page) if !$page.Contains key
 
     begin
-      return FieldNotFoundEvaluation.new(key, $page) if field == nil
+      return FieldNotFoundEvaluation.new(key, $page, "selenium could not find the field") if field == nil
 
       begin
         wait = Selenium::WebDriver::Wait.new(:timeout => 5)
@@ -28,12 +28,12 @@ class Hash < Object
           }
 
         return Fix(result, comparator)
-      rescue
-        return FieldNotFoundEvaluation.new(key, $page)
+      rescue => e
+        return FieldNotFoundEvaluation.new(key, $page, e.to_s)
       end
 
-    rescue
-      return FieldNotFoundEvaluation.new(key, $page)
+    rescue => e
+      return FieldNotFoundEvaluation.new(key, $page, e.to_s)
     end
   end
 

data/lib/sapphire/Extensions/Symbol.rb

@@ -68,7 +68,7 @@ class Symbol
     return FieldNotDefinedEvaluation.new(key, $page) if !$page.Contains key
 
     begin
-      return FieldNotFoundEvaluation.new(key, $page) if field == nil
+      return FieldNotFoundEvaluation.new(key, $page, "selenium could not find the field") if field == nil
 
       begin
         wait = Selenium::WebDriver::Wait.new(:timeout => 5)
@@ -79,12 +79,12 @@ class Symbol
 
 
         return Fix(Evaluation.new(block.call(field), true), comparator)
-      rescue
-        return FieldNotFoundEvaluation.new(key, $page)
+      rescue => e
+        return FieldNotFoundEvaluation.new(key, $page, e.to_s)
       end
 
-    rescue
-      return FieldNotFoundEvaluation.new(key, $page)
+    rescue => e
+      return FieldNotFoundEvaluation.new(key, $page, e.to_s)
     end
   end
 

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

@@ -25,6 +25,10 @@ module Sapphire
         @fields = @fields.merge! args.first => TextBox.new(args[1..args.length])
       end
 
+      def TextArea(*args)
+        @fields = @fields.merge! args.first => TextArea.new(args[1..args.length])
+      end
+
       def RadioButton(*args)
         @fields = @fields.merge! args.first => RadioButton.new(args[1..args.length])
       end

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

@@ -0,0 +1,27 @@
+module Sapphire
+  module WebAbstractions
+    class TextArea < Control
+
+      def Text
+        textarea = self.Find
+        textarea.attribute("value")
+      end
+
+      def Set(value)
+        if(value == "")
+          self.Clear
+        else
+          textarea = self.Find
+          textarea.send_keys value
+        end
+      end
+
+      def Clear
+        textarea = self.Find
+        textarea .clear
+      end
+
+    end
+  end
+end
+

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000Z
+date: 2012-02-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &9963168 !ruby/object:Gem::Requirement
+  requirement: &9907608 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9963168
+  version_requirements: *9907608
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &9962916 !ruby/object:Gem::Requirement
+  requirement: &9907356 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9962916
+  version_requirements: *9907356
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &9962664 !ruby/object:Gem::Requirement
+  requirement: &9907104 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9962664
+  version_requirements: *9907104
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email:
@@ -57,7 +57,6 @@ files:
 - lib/sapphire/Adapters.rb
 - lib/sapphire/CommandLine.rb
 - lib/sapphire/Configuration/AppConfig.rb
-- lib/sapphire/Configuration/AttrMethods.rb
 - lib/sapphire/Configuration.rb
 - lib/sapphire/Data.rb
 - lib/sapphire/DataAbstractions/Database.rb
@@ -202,6 +201,7 @@ files:
 - lib/sapphire/WebAbstractions/Controls/Label.rb
 - lib/sapphire/WebAbstractions/Controls/List.rb
 - lib/sapphire/WebAbstractions/Controls/RadioButton.rb
+- lib/sapphire/WebAbstractions/Controls/TextArea.rb
 - lib/sapphire/WebAbstractions/Controls/TextBox.rb
 - lib/sapphire/WebAbstractions/Controls/Title.rb
 - lib/sapphire.rb

data/lib/sapphire/Configuration/AttrMethods.rb

@@ -1,39 +0,0 @@
-# Taken this class from Albacore
-
-module Sapphire
-  module Configuration
-    module AttrMethods
-      def attr_array(*names)
-        names.each do |n|
-          self.send :define_method, n do |*value|
-            if value.nil? || value.empty?
-              return instance_variable_get("@#{n}")
-            else
-              self.send "#{n}=".to_sym, value.to_ary.flatten
-            end
-          end
-          self.send :define_method, "#{n}=" do |value|
-            instance_variable_set("@#{n}", value)
-          end
-        end
-      end
-
-      def attr_hash(*names)
-        names.each do |n|
-          self.class_eval(<<-EOF, __FILE__, __LINE__)
-            def #{n}(*value)
-              if value.nil? || value.empty?
-                instance_variable_get("@#{n}")
-              else
-                instance_variable_set("@#{n}", value[0])
-              end
-            end
-          EOF
-         self.send :define_method, "#{n}=" do |value|
-            instance_variable_set("@#{n}", value)
-          end
-        end
-      end
-    end
-  end
-end