watirsplash 0.2.3 → 0.2.4

data/History.rdoc

@@ -1,3 +1,10 @@
+=== Version 0.2.4 / 2010-07-30
+
+ * timestamp is now inserted into example names
+
+Bug fixes:
+ * fixed project template generated with "watirsplash generate" command
+
 === Version 0.2.3 / 2010-07-23
 
 Bug fixes:

data/README.rdoc

@@ -132,11 +132,11 @@ After that the directory structure will be something like this:
         └───spec
     
 The contents of that ui-test directory will be:
-    ui-test\application_helper.rb
     ui-test\config.rb
     ui-test\environment.rb
     
     ui-test\spec
+    ui-test\spec\application_helper.rb
     ui-test\spec\dummy_spec.rb
     ui-test\spec\spec.opts
     

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/click_no_wait.txt

@@ -0,0 +1 @@
+ruby -e "temp = Array.new(['c:/ruby/lib/ruby/gems/1.8/gems/watir-1.6.5/lib/watir/win32ole', 'c:/ruby/lib/ruby/gems/1.8/gems/json_pure-1.2.2/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/json_pure-1.2.2/lib', 'c:/ruby/lib/ruby/gems/1.8/gems/gemcutter-0.5.0/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/gemcutter-0.5.0/lib', 'c:/ruby/lib/ruby/gems/1.8/gems/xml-simple-1.0.12/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/xml-simple-1.0.12/lib', 'c:/ruby/lib/ruby/gems/1.8/gems/rubyforge-2.0.4/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/rubyforge-2.0.4/lib', 'c:/ruby/lib/ruby/gems/1.8/gems/rake-0.8.7/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/rake-0.8.7/lib', 'c:/ruby/lib/ruby/gems/1.8/gems/hoe-2.5.0/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/hoe-2.5.0/lib', 'c:/ruby/lib/ruby/gems/1.8/gems/s4t-utils-1.0.4/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/s4t-utils-1.0.4/lib', 'c:/ruby/lib/ruby/gems/1.8/gems/builder-2.1.2/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/builder-2.1.2/lib', 'c:/ruby/lib/ruby/gems/1.8/gems/user-choices-1.1.6.1/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/user-choices-1.1.6.1/lib', 'c:/ruby/lib/ruby/gems/1.8/gems/commonwatir-1.6.5/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/commonwatir-1.6.5/lib', 'c:/ruby/lib/ruby/gems/1.8/gems/win32-api-1.4.6-x86-mingw32/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/win32-api-1.4.6-x86-mingw32/lib', 'c:/ruby/lib/ruby/gems/1.8/gems/windows-api-0.4.0/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/windows-api-0.4.0/lib', 'c:/ruby/lib/ruby/gems/1.8/gems/windows-pr-1.0.9/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/windows-pr-1.0.9/lib', 'c:/ruby/lib/ruby/gems/1.8/gems/win32-process-0.6.2/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/win32-process-0.6.2/lib', 'c:/ruby/lib/ruby/gems/1.8/gems/activesupport-2.3.5/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/activesupport-2.3.5/lib', 'c:/ruby/lib/ruby/gems/1.8/gems/firewatir-1.6.5/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/firewatir-1.6.5/lib', 'c:/ruby/lib/ruby/gems/1.8/gems/nokogiri-1.4.1-x86-mingw32/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/nokogiri-1.4.1-x86-mingw32/lib', 'c:/ruby/lib/ruby/gems/1.8/gems/nokogiri-1.4.1-x86-mingw32/ext', 'c:/ruby/lib/ruby/gems/1.8/gems/watir-1.6.5/bin', 'c:/ruby/lib/ruby/gems/1.8/gems/watir-1.6.5/lib', 'c:/ruby/lib/ruby/site_ruby/1.8', 'c:/ruby/lib/ruby/site_ruby/1.8/i386-msvcrt', 'c:/ruby/lib/ruby/site_ruby', 'c:/ruby/lib/ruby/1.8', 'c:/ruby/lib/ruby/1.8/i386-mingw32', '.']); $LOAD_PATH.clear; temp.each {|element| $LOAD_PATH << element}; require 'watir/ie'; pc = Watir::IE.attach(:hwnd, 1247126); pc.instance_eval('Watir::Button.new(self, :unique_number, 1).click!')"

data/lib/watirsplash.rb

@@ -7,7 +7,7 @@ require_rel "watirsplash/waiter"
 require_rel "watirsplash/spec_helper"
 require_rel "watirsplash/spec"
 require_rel "watirsplash/watir"
-require_rel "watirsplash/autoit"
+require_rel "watirsplash/autoit_helper"
 require_rel "watirsplash/util"
 WatirSplash::Util.load_environment
 

data/lib/watirsplash/autoit_helper.rb

@@ -0,0 +1,56 @@
+module WatirSplash
+# Helper class for AutoIt
+  class AutoItHelper
+    extend WatirSplash::Waiter
+
+    @@autoit = Watir.autoit
+
+    class << self
+      # clicks save button on window with specified title,
+      # activates window automatically and makes sure that the click
+      # was successful
+      def click_save(window_title="File Download")
+        click_button(window_title, "&Save")
+      end
+
+      # sets edit field value to field_value on window with specified title,
+      # activates window automatically and makes sure that the field's
+      # value got changed
+      def set_edit(field_value, window_title="Save As")
+        set_field(window_title, "Edit1", field_value)
+      end
+
+      # sets specified field's value on window with specified title,
+      # activates window automatically and makes sure that the field's
+      # value got changed
+      def set_field(window_title, field_name, field_value)
+        wait_until do
+          activate_window(window_title) &&
+                  @@autoit.ControlFocus(window_title, "", field_name) == 1 &&
+                  @@autoit.ControlSetText(window_title, "", field_name, field_value) == 1 &&
+                  @@autoit.ControlGetText(window_title, "", field_name) == field_value
+        end
+      end
+
+      # clicks specified button on window with specified title,
+      # activates window automatically and makes sure that the click
+      # was successful
+      def click_button(window_title, button_name)
+        wait_until do
+          activate_window(window_title) &&
+                  @@autoit.ControlFocus(window_title, "", button_name) == 1 &&
+                  @@autoit.ControlClick(window_title, "", button_name) == 1 &&
+                  wait_until?(3) {@@autoit.WinExists(window_title) == 0}
+        end
+      end
+
+      # makes window active with specified title
+      # * returns true if activation was successful and false otherwise
+      def activate_window(window_title)
+        @@autoit.WinWait(window_title, "", 1) == 1 &&
+                @@autoit.WinActivate(window_title) != 0 &&
+                @@autoit.WinActive(window_title) != 0
+      end
+    end
+  end
+end

data/lib/watirsplash/html_formatter.rb

@@ -28,15 +28,23 @@ module WatirSplash
       super
     end
 
+    def example_group_started(example_group) # :nodoc:
+      @files_saved_during_example.clear
+      super
+    end
+
     def example_started(example) # :nodoc:
       @files_saved_during_example.clear
+      example.description << " (#{Time.now.strftime("%H:%M %d.%m")})"
       super
     end
 
     def extra_failure_content(failure) # :nodoc:
-      save_javascript_error
-      save_html
-      save_screenshot
+      if @browser.exists?
+        save_javascript_error
+        save_html
+        save_screenshot
+      end
 
       content = []
       content << "<span>"
@@ -60,7 +68,6 @@ module WatirSplash
         File.open(file_name, 'w') {|f| f.puts html}
       rescue => e
         $stderr.puts "saving of html failed: #{e.message}"
-        $stderr.puts e.backtrace
       end
       file_name
     end
@@ -77,7 +84,6 @@ module WatirSplash
         end
       rescue => e
         $stderr.puts "saving of screenshot failed: #{e.message}"
-        $stderr.puts e.backtrace
       end
       file_name
     end
@@ -96,7 +102,6 @@ module WatirSplash
         end
       rescue => e
         $stderr.puts "saving of javascript error failed: #{e.message}"
-        $stderr.puts e.backtrace
       end
       file_name
     end

data/lib/watirsplash/spec.rb

@@ -14,6 +14,12 @@ module Spec #:nodoc:all
   class ExampleGroup
     subject {self}
   end
+
+  module Example
+    class ExampleProxy
+      attr_accessor :description
+    end
+  end
 end
 
 # match_array is useful for matching arrays where some elements are regular expressions.

data/templates/project/environment.rb

@@ -7,9 +7,8 @@
 # By default everything, which is not a spec file, will be loaded from spec directory
 # and it's subdirectories
 spec_dir = File.join(File.dirname(__FILE__), "spec/**/*.rb")
-filtered_spec_files = Dir.glob(spec_dir).delete_if do |file|
-  File.directory?(file) || File.basename(file) =~ /.*spec\.rb$/
+filtered_ruby_files = Dir.glob(spec_dir).delete_if do |file|
+  File.basename(file) =~ /.*_spec\.rb$/
 end
-require_all filtered_spec_files
-require_rel "config.rb"
-require_rel "application_helper.rb"
+require_all filtered_ruby_files unless filtered_ruby_files.empty?
+require_rel "config.rb"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 +03:00
+date: 2010-07-30 00:00:00 +03:00
 default_executable: watirsplash
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -136,8 +136,9 @@ files:
 - Rakefile
 - VERSION
 - bin/watirsplash
+- click_no_wait.txt
 - lib/watirsplash.rb
-- lib/watirsplash/autoit.rb
+- lib/watirsplash/autoit_helper.rb
 - lib/watirsplash/generator.rb
 - lib/watirsplash/html_formatter.rb
 - lib/watirsplash/spec.rb
@@ -155,9 +156,9 @@ files:
 - templates/common/config.rb
 - templates/common/environment.rb
 - templates/common/lib/common_application_helper.rb
-- templates/project/application_helper.rb
 - templates/project/config.rb
 - templates/project/environment.rb
+- templates/project/spec/application_helper.rb
 - templates/project/spec/dummy_spec.rb
 - templates/project/spec/spec.opts
 has_rdoc: true
@@ -167,7 +168,7 @@ licenses: []
 post_install_message: |-
   *************************
   
-  Thank you for installing WatirSplash 0.2.3! Don't forget to take a look at README and History files!
+  Thank you for installing WatirSplash 0.2.4! Don't forget to take a look at README and History files!
   
   Execute "watirsplash generate" under your project's directory to generate default project structure.
   
@@ -202,7 +203,7 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: watirsplash 0.2.3
+summary: watirsplash 0.2.4
 test_files: 
 - spec/spec_helper_spec.rb
 - spec/spec_match_array_spec.rb

data/lib/watirsplash/autoit.rb

@@ -1,54 +0,0 @@
-# Helper class for AutoIt
-class AutoItHelper
-  extend WatirSplash::Waiter
-  
-  @@autoit = Watir.autoit
-
-  class << self
-    # clicks save button on window with specified title,
-    # activates window automatically and makes sure that the click
-    # was successful
-    def click_save(window_title="File Download")
-      click_button(window_title, "&Save")
-    end
-
-    # sets edit field value to field_value on window with specified title,
-    # activates window automatically and makes sure that the field's
-    # value got changed
-    def set_edit(field_value, window_title="Save As")
-      set_field(window_title, "Edit1", field_value)
-    end
-
-    # sets specified field's value on window with specified title,
-    # activates window automatically and makes sure that the field's
-    # value got changed
-    def set_field(window_title, field_name, field_value)
-      wait_until do
-        activate_window(window_title) &&
-                @@autoit.ControlFocus(window_title, "", field_name) == 1 &&
-                @@autoit.ControlSetText(window_title, "", field_name, field_value) == 1 &&
-                @@autoit.ControlGetText(window_title, "", field_name) == field_value
-      end
-    end
-
-    # clicks specified button on window with specified title,
-    # activates window automatically and makes sure that the click
-    # was successful
-    def click_button(window_title, button_name)
-      wait_until do
-        activate_window(window_title) &&
-                @@autoit.ControlFocus(window_title, "", button_name) == 1 &&
-                @@autoit.ControlClick(window_title, "", button_name) == 1 &&
-                wait_until?(3) {@@autoit.WinExists(window_title) == 0}
-      end
-    end
-
-    # makes window active with specified title
-    # * returns true if activation was successful and false otherwise
-    def activate_window(window_title)
-      @@autoit.WinWait(window_title, "", 1) == 1 &&
-              @@autoit.WinActivate(window_title) != 0 &&
-              @@autoit.WinActive(window_title) != 0
-    end
-  end
-end