sapphire 0.4.2 → 0.4.3

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

@@ -21,14 +21,13 @@ module Sapphire
           if(evaluation.left == evaluation.right)
             messages = []
 
-            messages << "expected NOT: (nil)" if evaluation.left == nil
-            messages << "expected NOT: " + evaluation.left.to_s if evaluation.left != nil
-            messages << "got: (nil)" if evaluation.right == nil
-            messages << "got: " + evaluation.right.to_s if evaluation.right != nil
+            messages << "expected NOT: (nil)" if evaluation.right == nil
+            messages << "expected NOT: " + evaluation.right.to_s if evaluation.right != nil
+            messages << "got: (nil)" if evaluation.left == nil
+            messages << "got: " + evaluation.left.to_s if evaluation.left != nil
 
             raise ExpectationException.new(messages)
           end
-          #evaluation.left.should_not == evaluation.right
         end
 
         def execute

data/lib/sapphire/DSL/TestPlans/Run.rb

@@ -2,9 +2,11 @@ module Sapphire
   module DSL
     module TestPlans
       def Run(item)
-        if(item.is_a? Class)
-          if(item.new.is_a? Job)
-            job = item.new
+        if(item.is_a? Job)
+          job = item
+          if(job.Arg)
+            system(job.PsExecPath + " " + job.Server + " -u " + job.User + " -p " + job.Password + " " + job.Path + " " + job.Arg.to_s)
+          else
             system(job.PsExecPath + " " + job.Server + " -u " + job.User + " -p " + job.Password + " " + job.Path)
           end
         else
@@ -13,4 +15,4 @@ module Sapphire
       end
     end
   end
-end
+end

data/lib/sapphire/JobAbstractions/Job.rb

@@ -22,6 +22,10 @@ module Sapphire
         return ""
       end
 
+      def Arg
+        return nil
+      end
+
     end
   end
 end

data/lib/sapphire/Strategies/NullModifier.rb

@@ -19,14 +19,13 @@ class NullModifier
     if(evaluation.left != evaluation.right)
       messages = []
 
-      messages << "expected: (nil)" if evaluation.left == nil
-      messages << "expected: " + evaluation.left.to_s if evaluation.left != nil
-      messages << "got: (nil)" if evaluation.right == nil
-      messages << "got: " + evaluation.right.to_s if evaluation.right != nil
+      messages << "expected: (nil)" if evaluation.right == nil
+      messages << "expected: " + evaluation.right.to_s if evaluation.right != nil
+      messages << "got: (nil)" if evaluation.left == nil
+      messages << "got: " + evaluation.left.to_s if evaluation.left != nil
 
       raise ExpectationException.new(messages)
     end
-    #evaluation.left.should == evaluation.right if @modifier == nil
   end
 
   def execute

data/lib/sapphire/TeamCity/TeamCityReporter.rb

@@ -124,30 +124,33 @@ module Sapphire
           log(@message_factory.create_test_started(test.text))
         end
 
-        def TestCompleted(test)
-          if test.type == "pending"
-            log(@message_factory.create_test_ignored(test.text, "Pending: Not Yet Implemented"))
-          elsif test.type == "pass"
-            log(@message_factory.create_test_finished(test.text, test.time))
-          elsif test.type == "fail"
-
-            if test.messages.is_a? Array
-              messages = test.messages.join("\n")
-            else
-              messages = test.messages
-            end
-            stack = ""
-            test.stack.each do |line|
-            if (!line.include? "sapphire")
-              stack += line + "\n"
-            end
+        def TestPassed(test)
+          log(@message_factory.create_test_finished(test.text, test.time))
+          log(@message_factory.create_suite_finished("Finally")) if test.item.is_a? Finally
+        end
+
+        def TestFailed(test)
+          if test.messages.is_a? Array
+            messages = test.messages.join("\n")
+          else
+            messages = test.messages
           end
-            log(@message_factory.create_test_failed(test.text, messages, stack))
+          stack = ""
+          test.stack.each do |line|
+            #if (!line.include? "sapphire")
+              stack += line + "\n"
+            #end
           end
+          log(@message_factory.create_test_failed(test.text, messages, stack))
+          log(@message_factory.create_suite_finished("Finally")) if test.item.is_a? Finally
+        end
 
-          if test.item.is_a? Finally
-            log(@message_factory.create_suite_finished("Finally"))
-          end
+        def TestPending(test)
+          log(@message_factory.create_test_ignored(test.text, "Pending: Not Yet Implemented"))
+          log(@message_factory.create_suite_finished("Finally")) if test.item.is_a? Finally
+        end
+
+        def TestingComplete()
 
         end
 

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

@@ -49,19 +49,17 @@ module Sapphire
           nav = page
         end
 
-        temp = self.CurrentUrl.upcase.start_with?("HTTP://" + nav.Url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + nav.Url.upcase)
-
-        #if you aren't on the expected page, check the alternate urls
-        if(temp == false)
-          nav.AlternateUrls.each do |url|
-            temp = self.CurrentUrl.upcase.start_with?("HTTP://" + url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + url.upcase)
-            if(temp)
-              temp = Evaluation.new(self.CurrentUrl.upcase.start_with?("HTTP://" + url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + url.upcase), true)
-              return temp, nav
+        wait = Selenium::WebDriver::Wait.new(:timeout => 10)
+        found = wait.until {
+          x = self.CurrentUrl.upcase.start_with?("HTTP://" + nav.Url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + nav.Url.upcase)
+          if(x == false)
+            nav.AlternateUrls.each do |url|
+              x = self.CurrentUrl.upcase.start_with?("HTTP://" + url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + url.upcase)
             end
           end
-        end
-        temp = Evaluation.new(self.CurrentUrl.upcase.start_with?("HTTP://" + nav.Url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + nav.Url.upcase), true)
+          x
+        }
+        temp = Evaluation.new(found, true)
         return temp, nav
       end
 

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

@@ -19,7 +19,7 @@ module Sapphire
       def IsChecked
 
         radio = self.Find
-        radio.attribute("checked");
+        radio.attribute("checked")
 
       end
     end

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/sapphire.rb

@@ -39,7 +39,7 @@ module Sapphire
     include JobAbstractions
     include WebAbstractions
     include Testing
-    #include Testing::TeamCity
+#    include Testing::TeamCity
     include UI
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-06 00:00:00.000000000Z
+date: 2011-10-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &10006188 !ruby/object:Gem::Requirement
+  requirement: &9953184 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10006188
+  version_requirements: *9953184
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &10005936 !ruby/object:Gem::Requirement
+  requirement: &9952932 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10005936
+  version_requirements: *9952932
 - !ruby/object:Gem::Dependency
   name: win32console
-  requirement: &10005684 !ruby/object:Gem::Requirement
+  requirement: &9952680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10005684
+  version_requirements: *9952680
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email: