sapphire 0.5.3 → 0.5.4

data/lib/sapphire/DSL/Scenarios/when.rb

@@ -1,48 +1,48 @@
-class When
-  include Sapphire::Testing::Executable
-
-  attr_reader :value
-  attr_accessor :text
-  attr_reader :block
-  attr_reader :then
-  attr_reader :and
-  attr_reader :parent
-  attr_reader :results
-
-  def initialize(parent, pre, text, &block)
-    @block = block
-    @value = text
-    @text = pre + text.to_s
-    @then = []
-    @and = []
-    @parent = parent
-    @results = []
-  end
-
-  def add_then(pre, text, &block)
-    if(self.value.is_a? Pending)
-      @then << Then.new(self, pre, Pending.new(text), &block)
-    else
-      @then << Then.new(self, pre, text, &block)
-    end
-  end
-
-  def add_and(pre, text, &block)
-    if(self.value.is_a? Pending)
-      self.and << And.new(self, Pending.new(pre + text), &block)
-    else
-      self.and << And.new(self, pre + text, &block)
-    end
-  end
-
-  def last_then
-    @then.last
-  end
-
-  def AddResult(result)
-    result.item = self
-    @results << result
-    self.parent.results.last.AddChild(result)
-  end
-
+class When
+  include Sapphire::Testing::Executable
+
+  attr_reader :value
+  attr_accessor :text
+  attr_reader :block
+  attr_reader :then
+  attr_reader :and
+  attr_reader :parent
+  attr_reader :results
+
+  def initialize(parent, pre, text, &block)
+    @block = block
+    @value = text
+    @text = pre + text.to_s
+    @then = []
+    @and = []
+    @parent = parent
+    @results = []
+  end
+
+  def add_then(pre, text, &block)
+    if(self.value.is_a? Pending)
+      @then << Then.new(self, pre, Pending.new(text), &block)
+    else
+      @then << Then.new(self, pre, text, &block)
+    end
+  end
+
+  def add_and(pre, text, &block)
+    if(self.value.is_a? Pending)
+      self.and << And.new(self, Pending.new(pre + text), &block)
+    else
+      self.and << And.new(self, pre + text, &block)
+    end
+  end
+
+  def last_then
+    @then.last
+  end
+
+  def AddResult(result)
+    result.item = self
+    @results << result
+    self.parent.results.last.AddChild(result)
+  end
+
 end

data/lib/sapphire/DSL.rb

@@ -1,6 +1,10 @@
-Dir[File.dirname(__FILE__) + '/DSL/Browser/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/Browser/Keys/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/Configuration/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/Data/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/Scenarios/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/TestPlans/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Browser/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Browser/Fluff/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Browser/Extensions/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Browser/Nouns/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Browser/Verbs/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Browser/Keys/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Configuration/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Data/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Scenarios/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/TestPlans/*.rb'].each {|file| require file }

data/lib/sapphire/Data.rb

@@ -1,2 +1,2 @@
-require 'win32ole' if Platform::OS == :win32
+require 'win32ole' if Platform::OS == :win32
 Dir[File.dirname(__FILE__) + '/DataAbstractions/*.rb'].each {|file| require file }

data/lib/sapphire/DataAbstractions/Database.rb

@@ -1,57 +1,57 @@
-
-
-module Sapphire
-  module DataAbstractions
-    class Database
-
-      def Open(connection_string)
-        @connection = WIN32OLE.new('ADODB.Connection')
-        @connection.Open(connection_string)
-      end
-
-      def query(sql)
-        recordset = WIN32OLE.new('ADODB.Recordset')
-        recordset.Open(sql, @connection, 0 , 1)
-
-        fields = []
-
-        recordset.Fields.each do |field|
-            fields << field.Name
-        end
-        begin
-            recordset.MoveFirst
-            data = recordset.GetRows
-        rescue
-            data = []
-        end
-
-        if(recordset.State != 0)
-          recordset.Close
-        end
-
-        data = data.transpose
-        records = []
-
-        data.each do |row|
-          y = 0
-          record = Hash.new
-          row.each do |column|
-            if(column != nil)
-              record.store fields[y].underscore.intern, column.to_s
-            else
-              record.store fields[y].underscore.intern, column
-            end
-            y += 1
-          end
-          records << record
-        end
-        records
-      end
-
-      def close
-        @connection.Close
-      end
-    end
-  end
-end
-
+
+
+module Sapphire
+  module DataAbstractions
+    class Database
+
+      def Open(connection_string)
+        @connection = WIN32OLE.new('ADODB.Connection')
+        @connection.Open(connection_string)
+      end
+
+      def query(sql)
+        recordset = WIN32OLE.new('ADODB.Recordset')
+        recordset.Open(sql, @connection, 0 , 1)
+
+        fields = []
+
+        recordset.Fields.each do |field|
+            fields << field.Name
+        end
+        begin
+            recordset.MoveFirst
+            data = recordset.GetRows
+        rescue
+            data = []
+        end
+
+        if(recordset.State != 0)
+          recordset.Close
+        end
+
+        data = data.transpose
+        records = []
+
+        data.each do |row|
+          y = 0
+          record = Hash.new
+          row.each do |column|
+            if(column != nil)
+              record.store fields[y].underscore.intern, column.to_s
+            else
+              record.store fields[y].underscore.intern, column
+            end
+            y += 1
+          end
+          records << record
+        end
+        records
+      end
+
+      def close
+        @connection.Close
+      end
+    end
+  end
+end
+

data/lib/sapphire/DataAbstractions/Query.rb

@@ -1,20 +1,20 @@
-module Sapphire
-  module DataAbstractions
-    module Query
-      def Execute(block)
-          x = self.Database.new
-
-          x.Open $config[x.Connection]
-          y = AppConfig.Current.SqlPath || ""
-          path = File.expand_path(y + self.Script, __FILE__)
-          file = File.open(path)
-          contents = file.read
-          self.Tokenize(contents)
-
-          results = x.query(contents)
-          block.call results
-          x.close
-        end
-      end
-  end
+module Sapphire
+  module DataAbstractions
+    module Query
+      def Execute(block)
+          x = self.Database.new
+
+          x.Open $config[x.Connection]
+          y = AppConfig.Current.SqlPath || ""
+          path = File.expand_path(y + self.Script, __FILE__)
+          file = File.open(path)
+          contents = file.read
+          self.Tokenize(contents)
+
+          results = x.query(contents)
+          block.call results
+          x.close
+        end
+      end
+  end
 end

data/lib/sapphire/JobAbstractions/Job.rb

@@ -1,32 +1,32 @@
-module Sapphire
-  module JobAbstractions
-    class Job
-
-      def Server
-        return ""
-      end
-
-      def User
-        return ""
-      end
-
-      def Password
-        return ""
-      end
-
-      def Path
-        return ""
-      end
-
-      def PsExecPath
-        return ""
-      end
-
-      def Arg
-        return nil
-      end
-
-    end
-  end
-end
-
+module Sapphire
+  module JobAbstractions
+    class Job
+
+      def Server
+        return ""
+      end
+
+      def User
+        return ""
+      end
+
+      def Password
+        return ""
+      end
+
+      def Path
+        return ""
+      end
+
+      def PsExecPath
+        return ""
+      end
+
+      def Arg
+        return nil
+      end
+
+    end
+  end
+end
+

data/lib/sapphire/Strategies/ClassStrategy.rb

@@ -3,7 +3,7 @@ module Sapphire
     module Strategies
       class ClassStrategy < Strategy
         def Show(item, modifier)
-          evaluation, @page = @browser.ShouldNavigateTo item
+          evaluation, @page = $browser.ShouldNavigateTo item
           @page.Init
           {:page => @page, :value => evaluation }
         end

data/lib/sapphire/Strategies/Strategy.rb

@@ -2,9 +2,8 @@ module Sapphire
   module DSL
     module Strategies
       class Strategy
-        def initialize(page, browser)
+        def initialize(page)
           @page = page
-          @browser = browser
         end
       end
     end

data/lib/sapphire/Strategies.rb

@@ -1,2 +1,2 @@
-require File.expand_path(File.dirname(__FILE__) +'/Strategies/Strategy.rb', __FILE__)
+require File.expand_path(File.dirname(__FILE__) +'/Strategies/Strategy.rb', __FILE__)
 Dir[File.dirname(__FILE__) + '/Strategies/*.rb'].each {|file| require file }

data/lib/sapphire/TeamCity.rb

@@ -1,9 +1,9 @@
-Dir[File.dirname(__FILE__) + '/TeamCity/*.rb'].each {|file| require file } if ENV["TeamCity"] == 1
-
-module Sapphire
-  module Testing
-    module TeamCity
-
-    end
-  end
+Dir[File.dirname(__FILE__) + '/TeamCity/*.rb'].each {|file| require file } if ENV["TeamCity"] == 1
+
+module Sapphire
+  module Testing
+    module TeamCity
+
+    end
+  end
 end

data/lib/sapphire/Testing/Executable.rb

@@ -1,30 +1,30 @@
-module Sapphire
-  module Testing
-    module Executable
-      def execute(reporter)
-        start = Time.now
-        reporter.TestStarted(self)
-        begin
-          if(self.value.is_a? Pending)
-            result = ResultTree.new(self.text, TestResult.new("pending", self, "Pending", "", Time.now - start))
-            self.AddResult(result)
-            reporter.TestPending result
-            return
-          end
-          self.block.call
-          result = ResultTree.new(self.text, TestResult.new("pass", self, "Success", "", Time.now - start))
-          self.AddResult(result)
-          reporter.TestPassed result
-        rescue => msg
-          stack = msg.backtrace
-          message = msg.messages if (msg.is_a? ExpectationException)
-          message ||= msg.message
-          result = ResultTree.new(self.text, TestResult.new("fail", self, message, stack, Time.now - start))
-          self.AddResult(result)
-          reporter.TestFailed result
-        end
-      end
-    end
-  end
-end
-
+module Sapphire
+  module Testing
+    module Executable
+      def execute(reporter)
+        start = Time.now
+        reporter.TestStarted(self)
+        begin
+          if(self.value.is_a? Pending)
+            result = ResultTree.new(self.text, TestResult.new("pending", self, "Pending", "", Time.now - start))
+            self.AddResult(result)
+            reporter.TestPending result
+            return
+          end
+          self.block.call
+          result = ResultTree.new(self.text, TestResult.new("pass", self, "Success", "", Time.now - start))
+          self.AddResult(result)
+          reporter.TestPassed result
+        rescue => msg
+          stack = msg.backtrace
+          message = msg.messages if (msg.is_a? ExpectationException)
+          message ||= msg.message
+          result = ResultTree.new(self.text, TestResult.new("fail", self, message, stack, Time.now - start))
+          self.AddResult(result)
+          reporter.TestFailed result
+        end
+      end
+    end
+  end
+end
+

data/lib/sapphire/Testing/RakeTask.rb

@@ -1,109 +1,109 @@
-require 'rake'
-require 'json'
-
-module Sapphire
-  module Testing
-    class RakeTask
-      attr_accessor :pattern
-      attr_accessor :verbose
-      attr_accessor :fail_on_error
-      attr_accessor :name
-
-
-      def test_outcome(result)
-
-        result.results.each do |r|
-
-          if(r.type == 'fail')
-            return 'fail'
-          end
-
-          if(r.type == 'pending')
-            return 'pending'
-          end
-
-          if(!r.results.empty?)
-            return test_outcome(r)
-          end
-
-        end
-
-        return 'pass'
-
-      end
-
-      def initialize(*args)
-
-        @name = args.shift || :spec
-        @pattern = nil
-        @verbose, @fail_on_error = true, true
-
-        yield self if block_given?
-
-        Rake::Task.define_task name do
-          RakeFileUtils.send(:verbose, verbose) do
-            files_to_run = FileList[ pattern ].map { |f|
-              y = nil
-              x = nil
-              x = f.gsub(/"/, '\"') if f != nil
-              y = x.gsub(/'/, "\\\\'") if x != nil
-              y
-            }
-            if files_to_run.empty?
-              puts "No examples matching #{pattern} could be found"
-            else
-              begin
-
-                files_to_run.each do |f|
-                  next unless f != nil
-                  require File.expand_path("../../" + f.to_s, __FILE__) unless File.directory? f
-                end
-
-                success_array = []
-                pending_array = []
-                failure_array = []
-
-                i = 3
-
-                Runner.instance.scenarios.each do |scenario|
-                  i += 1
-                  scenario.execute i
-                  scenario.result.set_id i
-                  scenario.result.set_type test_outcome(scenario.result)
-
-                  success_array << scenario.result if scenario.result.type == "pass"
-                  pending_array << scenario.result if scenario.result.type == "pending"
-                  failure_array << scenario.result if scenario.result.type == "fail"
-                end
-
-                item_array = []
-                item_array << ResultsList.new("Passing", success_array, 1)
-                item_array << ResultsList.new("Pending", pending_array, 2)
-                item_array << ResultsList.new("Failing", failure_array, 3)
-
-
-                File.open(File.dirname(__FILE__) + "/../ReportGenerator/output.json", "w") do |file|
-                  file.puts ActiveSupport::JSON.encode item_array
-                end
-
-                Runner.instance.scenarios.each do |scenario|
-                    File.open(File.dirname(__FILE__) + "/../ReportGenerator/" + scenario.result.myId.to_s + ".json", "w") do |file|
-                      file.puts ActiveSupport::JSON.encode scenario.result
-                  end
-                end
-
-              rescue => e
-                stack = ""
-                e.backtrace.each do |line|
-                  stack += "\r\n" + line
-                end
-
-                raise("Some tests have failed: " + e.message + " : " +  stack) if fail_on_error
-              end
-            end
-          end
-        end
-      end
-    end
-  end
+require 'rake'
+require 'json'
+
+module Sapphire
+  module Testing
+    class RakeTask
+      attr_accessor :pattern
+      attr_accessor :verbose
+      attr_accessor :fail_on_error
+      attr_accessor :name
+
+
+      def test_outcome(result)
+
+        result.results.each do |r|
+
+          if(r.type == 'fail')
+            return 'fail'
+          end
+
+          if(r.type == 'pending')
+            return 'pending'
+          end
+
+          if(!r.results.empty?)
+            return test_outcome(r)
+          end
+
+        end
+
+        return 'pass'
+
+      end
+
+      def initialize(*args)
+
+        @name = args.shift || :spec
+        @pattern = nil
+        @verbose, @fail_on_error = true, true
+
+        yield self if block_given?
+
+        Rake::Task.define_task name do
+          RakeFileUtils.send(:verbose, verbose) do
+            files_to_run = FileList[ pattern ].map { |f|
+              y = nil
+              x = nil
+              x = f.gsub(/"/, '\"') if f != nil
+              y = x.gsub(/'/, "\\\\'") if x != nil
+              y
+            }
+            if files_to_run.empty?
+              puts "No examples matching #{pattern} could be found"
+            else
+              begin
+
+                files_to_run.each do |f|
+                  next unless f != nil
+                  require File.expand_path("../../" + f.to_s, __FILE__) unless File.directory? f
+                end
+
+                success_array = []
+                pending_array = []
+                failure_array = []
+
+                i = 3
+
+                Runner.instance.scenarios.each do |scenario|
+                  i += 1
+                  scenario.execute i
+                  scenario.result.set_id i
+                  scenario.result.set_type test_outcome(scenario.result)
+
+                  success_array << scenario.result if scenario.result.type == "pass"
+                  pending_array << scenario.result if scenario.result.type == "pending"
+                  failure_array << scenario.result if scenario.result.type == "fail"
+                end
+
+                item_array = []
+                item_array << ResultsList.new("Passing", success_array, 1)
+                item_array << ResultsList.new("Pending", pending_array, 2)
+                item_array << ResultsList.new("Failing", failure_array, 3)
+
+
+                File.open(File.dirname(__FILE__) + "/../ReportGenerator/output.json", "w") do |file|
+                  file.puts ActiveSupport::JSON.encode item_array
+                end
+
+                Runner.instance.scenarios.each do |scenario|
+                    File.open(File.dirname(__FILE__) + "/../ReportGenerator/" + scenario.result.myId.to_s + ".json", "w") do |file|
+                      file.puts ActiveSupport::JSON.encode scenario.result
+                  end
+                end
+
+              rescue => e
+                stack = ""
+                e.backtrace.each do |line|
+                  stack += "\r\n" + line
+                end
+
+                raise("Some tests have failed: " + e.message + " : " +  stack) if fail_on_error
+              end
+            end
+          end
+        end
+      end
+    end
+  end
 end