watirsplash 0.1.9 → 0.2.0

data/History.rdoc

@@ -1,3 +1,14 @@
+=== Version 0.2.0 / 2010-05-03
+
+ PS! This version has some backwards incompatible changes!
+ 
+ * added max_depth parameter to Watir::Table#to_a and Watir::TableRow#to_a methods for avoiding too complex arrays if wanted
+ * watirsplash is not used to launch tests anymore - use regular RSpec's 'spec' command instead
+ * tests need to be inside of 'spec' directory, because spec.opts is responsible for loading every library
+ * you can launch tests with IDE by using -O spec.opts as a spec runner parameter
+ * Watir::Element#style returns current CSS style for element
+ * ui-test and ui-test-common project templates got changed
+
 === Version 0.1.9 / 2010-05-01
 
  * Changed name of the library to WatirSplash due to name conflict

data/README.rdoc

@@ -5,8 +5,8 @@
 
 == DESCRIPTION:
 
-WatirSplash is a small library for easier browser-based functional testing in Ruby.
-It combines Watir (http://www.watir.com) for controlling the browser (currently mainly IE) and
+WatirSplash makes browser-based testing in Ruby splashin' easy.
+It combines Watir (http://www.watir.com) for controlling the browser and
 RSpec (http://rspec.info) for testing framework. This powerful combination gives you
 the ability to write easily well-maintained and easy-to-read specs (specifications in RSpec) so
 you don't need to have any extra documentation for your applications.
@@ -17,23 +17,56 @@ testing right away!
 
 == FEATURES:
 
-* generate command for generating default project structure
-* generate_common command for generating common ui-tests directory
+* generate command for generating default tests project structure
+* generate_common command for generating a project structure for common functionality in your tests
 * Browser will be opened and closed for each example group automatically
 * You can use Watir method names directly without having to specify a browser object:
     text_field(:name => "locator") # instead of @browser.text_field(:name => "locator")
 * All needed libraries will be loaded and helper modules will be included automatically
-* All JavaScript errors will be detected automatically
+* All JavaScript errors will be detected and saved automatically
 * Some additional methods to help using Watir (download_file, wait_until, wait_until! etc.)
+* Some patches for different libraries which haven't made yet to the libraries themselves
 
 * Custom html formatter for RSpec:
-* Saves screenshot of the browser window
-* Saves html of the page
-* Saves all the files created/downloaded during the example and shows them on the report
-* Automatically archives test results for later reviewing
+  - saves screenshot of the browser window
+  - saves html of the page
+  - saves all the files created/downloaded during the example and shows them on the report
+  - automatically archives test results for later reviewing
 
 == SYNOPSIS:
 
+  Without WatirSplash:
+    require 'watir'
+    require 'spec'
+
+    describe "Google" do
+        before :all do
+            @browser = Watir::Browser.new
+            @browser.maximize
+            @browser.goto "http://google.com"
+            @browser.url.should =~ /google/
+        end
+
+        it "has search field" do
+            @browser.text_field = text_field(:name => "q")
+            @browser.text_field.should exist
+            @browser.text_field.should be_visible
+        end
+
+        it "performs search" do
+            @browser.text_field(:name => "q").set "Bing"
+            @browser.button(:name => "btnG").click
+            @browser.text.should include("Bing")
+        end
+
+        after :all do
+            @browser.close
+        end
+    end
+
+
+
+  With WatirSplash:
     describe "Google" do
         before :all do
             goto "http://google.com"
@@ -53,7 +86,7 @@ testing right away!
         end
     end
     
-    C:\project\ui-test>watirsplash spec\google_spec.rb
+    C:\project\ui-test>spec spec\google_spec.rb
     Results will be saved into the directory C:/project/ui-test/results
     Google
       has search field
@@ -68,11 +101,8 @@ testing right away!
 * install Ruby 1.8.6:
     http://rubyinstaller.org/
     
-* install ImageMagick with rmagick-win32 for making the screenshots:
+* install ImageMagick with rmagick-win32 for saving the screenshots in PNG format:
     http://rubyforge.org/frs/?group_id=12&release_id=42049
-    
-* update RubyGems:
-    gem update --system
 
 * install WatirSplash:
     gem install watirsplash
@@ -105,17 +135,18 @@ The contents of that ui-test directory will be:
     ui-test\application_helper.rb
     ui-test\config.rb
     ui-test\environment.rb
-    ui-test\ide_runner.rb
     
     ui-test\spec
     ui-test\spec\dummy_spec.rb
+    ui-test\spec\spec.opts
     
 Just check out all the files to see some example code and comments in it and execute dummy_spec.rb
 to verify that everything works correctly:
-    watirsplash spec\dummy_spec.rb
-    
-You can have whatever directory structure for your tests just make sure that all test files have _spec.rb in
-the end of their filename (if using default RSpec options).
+    spec spec\dummy_spec.rb
+
+You have to create your tests under spec directory so RSpec would load spec.opts automatically.
+You can have whatever directory structure under this directory just make sure that
+all test files have _spec.rb in the end of their filename (if using default RSpec options).
     
 == USAGE FOR MULTIPLE PROJECTS:
 
@@ -138,7 +169,7 @@ to generate ui-test-common directory:
     Done
 
 It has a structure of:
-    C:\UI-TEST-COMMON
+    C:\ui-test-common
     └───lib
     
     ui-test-common\config.rb
@@ -147,12 +178,12 @@ It has a structure of:
     ui-test-common\lib\common_application_helper.rb
     
 In environment.rb under project/ui-test you shall add common functionality to your project.
-Add the following line before any other require statements to do that:
+Uncomment the following line:
     WatirSplash::Util.load_common
     
 This gives you by default the access to every method in ui-test-common/lib/common_application_helper.rb
     
-Now, in ui-test-common/config.rb change the URL to your hostname and in config.rb under project/ui-test:
+Now, in ui-test-common/config.rb change the URL to your hostname and in project's config.rb:
     URL = Config.full_url("/relative_path")
     
 This gives you the ability to have host and port written only in one place.
@@ -168,4 +199,5 @@ If you see the following error message when running watirsplash:
     R6034. An application has made an attempt to load the C runtime library incorrectly.
  
 Solution:
-    Install Microsoft Visual C++ 2008 SP1 Redistributable Package
+    This is caused by ImageMagick.
+    Install Microsoft Visual C++ 2008 SP1 Redistributable Package to solve the problem.

data/Rakefile

@@ -1,16 +1,66 @@
+require 'rubygems'
 require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    version = File.read("VERSION").strip
+    gem.name = "watirsplash"
+    gem.summary = %Q{watirsplash #{version}}
+    gem.description = %q{WatirSplash makes testing of web applications splashin' easy by combining best features of Watir, RSpec and Ruby!}
+    gem.email = "jarmo.p@gmail.com"
+    gem.homepage = "http://github.com/jarmo/WatirSplash"
+    gem.authors = ["Jarmo Pertman"]
+    gem.executables = ["watirsplash"]
+    gem.extra_rdoc_files = ["README.rdoc", "History.rdoc", "License.txt"]
+    gem.rdoc_options << "--main" << "README.rdoc" <<
+            "--template" << "hanna" <<
+            "--inline-source" << "--format=html"
+    ignored_files = File.readlines(".gitignore").map {|l| l.strip.gsub("*", "")}
+    ignored_files << ".gitignore" << ".gemspec"
+    gem.files = Dir.glob("**/*").delete_if {|f| f =~ Regexp.union(*ignored_files)}
+    gem.post_install_message = %Q{#{"*"*25}
+
+Thank you for installing WatirSplash #{version}! 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.
+
+#{"*"*25}}
+
+    gem.add_dependency("watir", ">=1.6.5")
+    gem.add_dependency("rspec", ">=1.3.0")
+    gem.add_dependency("diff-lcs")
+    gem.add_dependency("require_all")
+    gem.add_dependency("rmagick")
+    gem.add_dependency("syntax")
+    gem.add_dependency("win32console")
+    gem.add_dependency("win32screenshot")
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
 require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
 
-Spec::Rake::SpecTask.new(:rcov) do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.rcov = true
-  t.rcov_dir = 'coverage'
-  t.rcov_opts << '--sort coverage --text-summary --aggregate coverage.data'
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts << "--options" << "lib/spec.opts" <<
-          "--require" << "lib/watirsplash/html_formatter" <<
-          "--format" << "WatirSplash::HtmlFormatter:results/index.html"
-end
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "my-testing-library #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.2.0

data/bin/watirsplash

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-watirsplash_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+watirsplash_dir = File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
 $LOAD_PATH.unshift(watirsplash_dir) unless $LOAD_PATH.include?(watirsplash_dir)
-require 'watirsplash/runner'
+require 'watirsplash/generator'
 
-if ARGV.size == 1 && ::WatirSplash::Runner.respond_to?(ARGV[0])
-  exit ::WatirSplash::Runner.send(ARGV[0])
+if ARGV.size == 1 && ::WatirSplash::Generator.respond_to?(ARGV[0])
+  exit ::WatirSplash::Generator.send(ARGV[0])
 else
-  exit ::WatirSplash::Runner.run
-end
+  exit ::WatirSplash::Generator.help
+end

data/lib/watirsplash.rb

@@ -2,10 +2,13 @@ require "rubygems"
 require "require_all"
 require "spec"
 require "watir"
-require "watirsplash/util"
-require "watirsplash/waiter"
-require "watirsplash/spec_helper"
-require "watirsplash/spec"
-require "watirsplash/watir"
-require "watirsplash/autoit"
+require "win32screenshot"
+require_rel "watirsplash/win32screenshot"
+require_rel "watirsplash/waiter"
+require_rel "watirsplash/spec_helper"
+require_rel "watirsplash/spec"
+require_rel "watirsplash/watir"
+require_rel "watirsplash/autoit"
+require_rel "watirsplash/util"
+WatirSplash::Util.load_environment
 

data/lib/watirsplash/generator.rb

@@ -0,0 +1,55 @@
+module WatirSplash
+
+  # WatirSplash Generator class is responsible for:
+  # * generating directory structures for projects
+  class Generator
+    @@template_directory = File.join(File.dirname(__FILE__), "../../templates/")
+
+    class << self
+
+      # Generates ui-test directory structure for project
+      def generate
+        ui_test_dir = File.join(Dir.pwd, "ui-test")
+        puts "Creating WatirSplash directory structure to #{ui_test_dir}..."
+        require "fileutils"
+        FileUtils.cp_r File.join(@@template_directory, "project/."), ui_test_dir
+        puts "Done"
+        return 0
+      rescue => e
+        puts "Failed:"
+        puts e.message
+        return -1
+      end
+
+      # Generates ui-test-common directory structure
+      def generate_common
+        common_dir = File.join(Dir.pwd, "ui-test-common")
+        puts "Creating WatirSplash ui-test-common directory structure to #{common_dir}..."
+        require "fileutils"
+        FileUtils.cp_r File.join(@@template_directory, "common/."), common_dir
+        puts "Done"
+        return 0
+      rescue => e
+        puts "Failed:"
+        puts e.message
+        return -1
+      end
+
+      # Shows help
+      def help
+        puts %Q{WatirSplash:
+Usage: watirsplash (COMMAND|FILE(:LINE)?|DIRECTORY|GLOB)+ [options]
+Commands:
+          * generate - generate default directory structure for new project
+          * generate_common - generate common project directory structure
+          * help - show this help
+          * --help - show RSpec's help
+
+All other commands/options will be passed to RSpec directly.}
+
+        return 1
+      end
+
+    end
+  end
+end

data/lib/watirsplash/spec_helper.rb

@@ -46,11 +46,6 @@ module WatirSplash
     # be shown on the report upon test failure.
     def file_path(file_name, description=nil)
       formatter.file_path(file_name, description)
-    rescue
-      extension = File.extname(file_name)
-      basename = File.basename(file_name, extension)
-      file_path = File.join(Dir.pwd, "#{basename}_#{Time.now.strftime("%H%M%S")}#{extension}")
-      file_path
     end
 
     # returns native file path

data/lib/watirsplash/util.rb

@@ -15,6 +15,17 @@ module WatirSplash
         require File.join(dir, "environment.rb")
       end
 
+      def load_environment
+        env_file = File.join(Dir.pwd, "environment.rb")
+        if File.exists?(env_file)
+          require env_file
+        else
+          Dir.chdir("..") do
+            load_environment if Dir.entries(Dir.pwd).include?("..")
+          end
+        end
+      end
+
       private
 
       def common_dir

data/lib/watirsplash/watir.rb

@@ -82,6 +82,16 @@ module Watir
     end
   end
 
+  class Element #:nodoc:all
+    def_wrap_guard :currentstyle
+
+    # returns current style instead of inline style
+    # http://msdn.microsoft.com/en-us/library/ms535231(VS.85).aspx
+    def style
+      currentstyle
+    end
+  end
+
   module PageContainer #:nodoc:all
     # patch for .click_no_wait
     def eval_in_spawned_process(command)
@@ -97,14 +107,15 @@ module Watir
 
   class Table < Element
 
-    # This method returns multi-dimensional array of the text's in table.
+    # This method returns multi-dimensional array of the cell texts in table.
     #
-    # It works with tr, th, td elements, colspan, rowspan and nested tables.
-    def to_a
+    # Works with tr, th, td elements, colspan, rowspan and nested tables.
+    # Takes an optional parameter *max_depth*, which is by default 1
+    def to_a(max_depth=1)
       assert_exists
       y = []
       @o.rows.each do |row|
-        y << TableRow.new(@container, :ole_object, row).to_a
+        y << TableRow.new(@container, :ole_object, row).to_a(max_depth)
       end
       y
     end
@@ -112,10 +123,11 @@ module Watir
 
   class TableRow < Element
 
-    # This method returns (multi-dimensional) array of the text's in table's row.
+    # This method returns (multi-dimensional) array of the cell texts in table's row.
     #
-    # It works with th, td elements, colspan, rowspan and nested tables.
-    def to_a
+    # Works with th, td elements, colspan, rowspan and nested tables.
+    # Takes an optional parameter *max_depth*, which is by default 1
+    def to_a(max_depth=1)
       assert_exists
       y = []
       @o.cells.each do |cell|
@@ -123,7 +135,8 @@ module Watir
         inner_tables.each do |inner_table|
           # make sure that the inner table is directly child for this cell
           if inner_table?(cell, inner_table)
-            y << Table.new(@container, :ole_object, inner_table).to_a
+            max_depth -= 1
+            y << Table.new(@container, :ole_object, inner_table).to_a(max_depth) if max_depth >= 1
           end
         end
 

data/lib/watirsplash/win32screenshot.rb

@@ -0,0 +1,52 @@
+module Win32
+  module Screenshot
+
+    # added patches by Tony Popiel for fixing the problem
+    # of failing to take a screenshot of every size of the window
+    # http://rubyforge.org/tracker/index.php?func=detail&aid=26216&group_id=2683&atid=10359
+    module_function
+
+    def capture(hScreenDC, x1, y1, x2, y2)
+      w = x2-x1
+      h = y2-y1
+
+      # Reserve some memory
+      hmemDC = createCompatibleDC(hScreenDC)
+      hmemBM = createCompatibleBitmap(hScreenDC, w, h)
+      selectObject(hmemDC, hmemBM)
+      bitBlt(hmemDC, 0, 0, w, h, hScreenDC, 0, 0, SRCCOPY)
+      # changed line
+      # hpxldata = globalAlloc(GMEM_FIXED, w * h * 3)
+      hpxldata = globalAlloc(GMEM_FIXED, ((w*h*3)+(w%4)*h))
+      lpvpxldata = globalLock(hpxldata)
+
+      # Bitmap header
+      # http://www.fortunecity.com/skyscraper/windows/364/bmpffrmt.html
+      bmInfo = [40, w, h, 1, 24, 0, 0, 0, 0, 0, 0, 0].pack('LLLSSLLLLLL').to_ptr
+
+      getDIBits(hmemDC, hmemBM, 0, h, lpvpxldata, bmInfo, DIB_RGB_COLORS)
+
+      bmFileHeader = [
+              19778,
+              # changed line
+              # (w * h * 3) + 40 + 14,
+              (w * h * 3) + (w%4)*h + 40 + 14,
+              0,
+              0,
+              54
+      ].pack('SLSSL').to_ptr
+
+      # changed line
+      # data = bmFileHeader.to_s(14) + bmInfo.to_s(40) + lpvpxldata.to_s(w * h * 3)
+      data = bmFileHeader.to_s(14) + bmInfo.to_s(40) + lpvpxldata.to_s((w*h*3)+(w%4)*h)
+
+      globalUnlock(hpxldata)
+      globalFree(hpxldata)
+      deleteObject(hmemBM)
+      deleteDC(hmemDC)
+      releaseDC(0, hScreenDC)
+
+      return [w, h, data]
+    end
+  end
+end

data/spec/spec.opts

@@ -0,0 +1,11 @@
+--require
+lib\watirsplash
+--require
+lib\watirsplash\html_formatter
+--format
+WatirSplash::HtmlFormatter:results/index.html
+--color
+--format
+nested
+--diff
+u

data/spec/spec_helper_spec.rb

@@ -1,5 +1,4 @@
-require "watirsplash"
-require "spec/autorun"
+require "spec"
 
 describe WatirSplash::SpecHelper do
 
@@ -31,15 +30,15 @@ describe WatirSplash::SpecHelper do
     lambda {wait_until!(0.5) {sleep 0.1; false}}.should raise_exception(Watir::Exception::TimeOutException)
   end
 
-  it "has file_path methods without using formatter" do
+  it "has file_path methods formatter" do
     file_name = "blah.temp"
     ext = File.extname(file_name)
     base = File.basename(file_name, ext)
-    expected_path = File.join(Dir.pwd, "#{base}_\\d{6}#{ext}")
+    expected_path = File.join(Dir.pwd, "results/files/#{base}_.*#{ext}")
 
     file_path(file_name).should =~ Regexp.new(expected_path)
     expected_path = expected_path.gsub("/", "\\")
-    native_file_path(file_path(file_name)).should =~ Regexp.new(Regexp.escape(expected_path).gsub("\\\\d\\{6\\}", "\\d{6}"))
+    native_file_path(file_path(file_name)).should =~ Regexp.new(Regexp.escape(expected_path).gsub("\\.\\*", ".*"))
   end
 
   it "has download_file method" do

data/spec/spec_match_array_spec.rb

@@ -1,5 +1,4 @@
-require "spec/autorun"
-require "watirsplash"
+require "spec"
 
 describe "Array match_array matcher" do
 

data/spec/util_spec.rb

@@ -1,5 +1,4 @@
-require "watirsplash"
-require "spec/autorun"
+require "spec"
 
 describe WatirSplash::Util do
 

data/spec/watir_ie_spec.rb

@@ -1,8 +1,19 @@
-require "watirsplash"
-require "spec/autorun"
+require "spec"
 
 describe Watir::IE do
 
+  it "uses currentStyle method to show computed style" do
+    goto "http://dl.dropbox.com/u/2731643/misc/tables.html"
+    t = table(:id => "normal")
+    normal_cell = t[1][1]
+    normal_cell.text.should == "1"
+    normal_cell.style.color.should == "#000000"
+
+    red_cell = t.cell(:class => "reddish")
+    red_cell.text.should == "9"
+    red_cell.style.color.should == "red"
+  end
+
   it "closes the browser even when Watir::IE#run_error_checks throws an exception" do
     @browser.add_checker lambda {raise "let's fail IE#wait in IE#close"}
     @browser.should exist

data/spec/watir_table_row_spec.rb

@@ -1,5 +1,4 @@
-require "watirsplash"
-require "spec/autorun"
+require "spec"
 
 describe Watir::TableRow do
   include WatirSplash::SpecHelper
@@ -20,12 +19,12 @@ describe Watir::TableRow do
 
   it "#to_a works with nested tables" do
     second_row = table(:id => "nested")[2]
-    second_row.to_a.should == [[["11", "12"], ["13","14"]], "3"]
+    second_row.to_a(2).should == [[["11", "12"], ["13","14"]], "3"]
   end
 
   it "#to_a works with deep-nested tables" do
     second_row = table(:id => "deepnested")[2]
-    second_row.to_a.should == [[["11", "12"],
+    second_row.to_a(3).should == [[["11", "12"],
                                 [[["404", "405"], ["406", "407"]], "14"]], "3"]
   end
 

data/spec/watir_table_spec.rb

@@ -1,5 +1,4 @@
-require "watirsplash"
-require "spec/autorun"
+require "spec"
 
 describe Watir::Table do
   include WatirSplash::SpecHelper
@@ -33,7 +32,7 @@ describe Watir::Table do
                     [[["11", "12"],
                       ["13", "14"]], "3"]
             ]
-    table(:id => "nested").to_a.should == expected_table
+    table(:id => "nested").to_a(2).should == expected_table
   end
 
   it "#to_a works with nested table with non-direct child" do
@@ -44,7 +43,7 @@ describe Watir::Table do
                       ["13", "14"]], "3"]
             ]
 
-    table(:id => "nestednondirectchild").to_a.should == expected_table
+    table(:id => "nestednondirectchild").to_a(2).should == expected_table
   end
 
   it "#to_a works with deep-nested tables" do
@@ -55,7 +54,7 @@ describe Watir::Table do
                       [[["404", "405"],
                         ["406", "407"]], "14"]], "3"]
             ]
-    table(:id => "deepnested").to_a.should == expected_table
+    table(:id => "deepnested").to_a(3).should == expected_table
   end
 
   it "#to_a works with colspan" do

data/templates/common/config.rb

@@ -1,8 +1,6 @@
 =begin
   Global configuration constants
-  For example, you can use the URL constant below from your projects like this:
-
-  In your projects' config.rb:
+  For example, you can use the URL constant below from your projects' config.rb like this:
 
   module Config
     module Application
@@ -25,4 +23,4 @@ end
 
 Spec::Runner.configure do |config|
   config.include(CommonApplicationHelper)
-end
+end

data/templates/common/environment.rb

@@ -1,17 +1,15 @@
 =begin
-  you have to load this file from your projects' environment.rb, which
-  will use common functionality:
+  You have to load this file from your projects' environment.rb, which
+  would like to use common functionality.
+
+  Use the following code to do it automatically:
   WatirSplash::Util.load_common
 
-  add all your require statements into this file to avoid unnecessary
+  Add all your require statements into this file to avoid unnecessary
   code in your other projects' files
 
-  by default everything, which is not a spec file, will be loaded
+  By default everything in lib directory will be loaded
 =end
 
-local_dir = File.join(File.dirname(__FILE__), "**/*.rb")
-filtered_ruby_files = Dir.glob(local_dir).delete_if do |file|
-  File.directory?(file) || File.basename(file) =~ /(config|_spec)\.rb$/
-end
-require_all filtered_ruby_files
+require_rel "lib/"
 require_rel "config.rb"

data/templates/common/lib/common_application_helper.rb

@@ -1,9 +1,9 @@
-# you can create under this directory common libraries/helpers/methods which you could
-# use within your specs in different projects
+# You can create under this directory common libraries/helpers/methods which you would
+# like to use within your specs in different projects
 
 module CommonApplicationHelper
 
-  # you can use these methods automatically inside of your it-blocks
+  # You can use methods declared in this module inside of your it-blocks
   # it "does something" do
   #   new_global_method.should == "it just works"
   # end

data/templates/project/config.rb

@@ -2,7 +2,8 @@
 module Config
   module Application
     # URL, which will be opened by every test
-    # replace it with the URL of your application under test
+    #
+    # Replace it with the URL of your application under test
     # or if ui-test-common is used then
     # URL = Config.full_url("/relative/url/index.html")
     URL = "about:blank"
@@ -12,6 +13,7 @@ end
 # A global configuration for specs in this project, which will include by default
 # a ApplicationHelper module and open Config::Application::URL with
 # the browser.
+#
 # You can read more about RSpec-s before and after syntax from:
 # http://rspec.info/documentation/before_and_after.html
 Spec::Runner.configure do |config|

data/templates/project/environment.rb

@@ -1,13 +1,15 @@
-# add all your require statements into this file to avoid unnecessary
+# Add all your require statements into this file to avoid unnecessary
 # code in your spec files
 
-# uncomment following line to load functionality from ui-test-common
+# Uncomment following line to load functionality from ui-test-common
 # WatirSplash::Util.load_common
 
-# by default everything, which is not a spec file, will be loaded
-local_dir = File.join(File.dirname(__FILE__), "**/*.rb")
-filtered_ruby_files = Dir.glob(local_dir).delete_if do |file|
-  File.directory?(file) || File.basename(file) =~ /(ide_runner|config|_spec)\.rb$/
+# 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$/
 end
-require_all filtered_ruby_files
-require_rel "config.rb"
+require_rel filtered_spec_files
+require_rel "config.rb"
+require_rel "application_helper.rb"

data/templates/project/spec/dummy_spec.rb

@@ -1,4 +1,4 @@
-# this is a fully working dummy spec file which you can run to see if
+# This is a fully working spec file which you can run to see if
 # your configuration is correct and everything is working as expected
 
 describe "WatirSplash" do
@@ -10,9 +10,9 @@ describe "WatirSplash" do
   it "has easy access to ApplicationHelper methods" do
     # ApplicationHelper#helper_method_one will be executed
     helper_method_one.should == "one"
-    # ApplicationHelper#has_second_method? will be execute
+    # ApplicationHelper#has_second_method? will be executed
     should have_second_method
-    # ApplicationHelper#correct? method will be execute
+    # ApplicationHelper#correct? method will be executed
     should_not be_correct
   end
 
@@ -34,7 +34,7 @@ describe "WatirSplash" do
     end
   end
 
-  it "has also access to global methods" do
+  it "has access to global methods after generate_common command has been used" do
     pending "it fails as long as there's not executed 'watirsplash generate_common' command
 and ui-test-common is not loaded by this project" do
       new_global_method.should == "it just works"

data/templates/project/spec/spec.opts

@@ -0,0 +1,11 @@
+--color
+--require
+watirsplash
+--require
+watirsplash/html_formatter
+--format
+WatirSplash::HtmlFormatter:results/index.html
+--format
+nested
+--diff
+u

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 9
-  version: 0.1.9
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -14,8 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-01 00:00:00 +03:00
-default_executable: 
+date: 2010-05-04 00:00:00 +03:00
+default_executable: watirsplash
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: watir
@@ -117,34 +117,34 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id008
-description: Combines best features of Watir, RSpec and Ruby for browser-based functional testing.
-email: 
-- jarmo.p@gmail.com
+description: WatirSplash makes testing of web applications splashin' easy by combining best features of Watir, RSpec and Ruby!
+email: jarmo.p@gmail.com
 executables: 
 - watirsplash
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
 - History.rdoc
 - License.txt
+- README.rdoc
 files: 
-- bin/watirsplash
 - History.rdoc
-- lib/spec.opts
+- License.txt
+- README.rdoc
+- Rakefile
+- VERSION
+- bin/watirsplash
+- lib/watirsplash.rb
 - lib/watirsplash/autoit.rb
+- lib/watirsplash/generator.rb
 - lib/watirsplash/html_formatter.rb
-- lib/watirsplash/runner.rb
 - lib/watirsplash/spec.rb
 - lib/watirsplash/spec_helper.rb
 - lib/watirsplash/util.rb
-- lib/watirsplash/version.rb
 - lib/watirsplash/waiter.rb
 - lib/watirsplash/watir.rb
-- lib/watirsplash.rb
-- License.txt
-- Rakefile
-- README.rdoc
+- lib/watirsplash/win32screenshot.rb
+- spec/spec.opts
 - spec/spec_helper_spec.rb
 - spec/spec_match_array_spec.rb
 - spec/util_spec.rb
@@ -157,8 +157,8 @@ files:
 - templates/project/application_helper.rb
 - templates/project/config.rb
 - templates/project/environment.rb
-- templates/project/ide_runner.rb
 - templates/project/spec/dummy_spec.rb
+- templates/project/spec/spec.opts
 has_rdoc: true
 homepage: http://github.com/jarmo/WatirSplash
 licenses: []
@@ -166,12 +166,13 @@ licenses: []
 post_install_message: |-
   *************************
   
-  Thank you for installing WatirSplash 0.1.9! Don't forget to take a look at README file!
+  Thank you for installing WatirSplash 0.2.0! 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.
   
   *************************
 rdoc_options: 
+- --charset=UTF-8
 - --main
 - README.rdoc
 - --template
@@ -200,6 +201,11 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: watirsplash 0.1.9
-test_files: []
-
+summary: watirsplash 0.2.0
+test_files: 
+- spec/spec_helper_spec.rb
+- spec/spec_match_array_spec.rb
+- spec/util_spec.rb
+- spec/watir_ie_spec.rb
+- spec/watir_table_row_spec.rb
+- spec/watir_table_spec.rb

data/lib/spec.opts

@@ -1,5 +0,0 @@
---color
---format
-nested
---diff
-u

data/lib/watirsplash/runner.rb

@@ -1,97 +0,0 @@
-module WatirSplash
-
-  # WatirSplash runner class is responsible for:
-  # * generating directory structures for projects
-  # * starting RSpec with specified settings
-  class Runner
-    @@template_directory = File.join(File.dirname(__FILE__), "../../templates/")
-
-    class << self
-
-      # Run RSpec with custom settings
-      # * loads spec.opts from project's directory if exists
-      # * loads environment.rb from project's directory if exists
-      # * loads custom Formatter
-      def run
-        unless ARGV.empty?
-          require "watirsplash"
-          load_formatter
-          load_options
-          load_project_env
-        else
-          return help
-        end
-
-        ::Spec::Runner::CommandLine.run
-      end
-
-      # Generates ui-test project structure for project
-      def generate
-        ui_test_dir = File.join(Dir.pwd, "ui-test")
-        puts "Creating WatirSplash project directory structure to #{ui_test_dir}..."
-        require "fileutils"
-        FileUtils.cp_r File.join(@@template_directory, "project/."), ui_test_dir
-        puts "Done"
-        return 0
-      rescue => e
-        puts "Failed:"
-        puts e.message
-        return -1
-      end
-
-      # Generates ui-test-common directory structure
-      def generate_common
-        common_dir = File.join(Dir.pwd, "ui-test-common")
-        puts "Creating WatirSplash common project directory structure to #{common_dir}..."
-        require "fileutils"
-        FileUtils.cp_r File.join(@@template_directory, "common/."), common_dir
-        puts "Done"
-        return 0
-      rescue => e
-        puts "Failed:"
-        puts e.message
-        return -1
-      end
-
-      # Shows help
-      def help
-        puts %Q{WatirSplash:
-Usage: watirsplash (COMMAND|FILE(:LINE)?|DIRECTORY|GLOB)+ [options]
-Commands:
-          * generate - generate default directory structure for new project
-          * generate_common - generate common project directory structure
-          * help - show this help
-          * --help - show RSpec's help
-
-All other commands/options will be passed to RSpec directly.}
-
-        return 1
-      end
-
-      private
-
-      def load_formatter
-        ARGV << "--require" << "watirsplash/html_formatter.rb"
-        ARGV << "--format" << "WatirSplash::HtmlFormatter:#{File.join(Dir.pwd, "results/index.html")}"
-      end
-
-      def load_options
-        ARGV << "--options"
-        project_spec_opts = File.join(Dir.pwd, "spec.opts")
-        if File.exists?(project_spec_opts)
-          ARGV << project_spec_opts
-        else
-          ARGV << "#{File.join(File.dirname(__FILE__), "../spec.opts")}"
-        end
-      end
-
-      def load_project_env
-        project_env_file = File.join(Dir.pwd, "environment.rb")
-        if File.exists?(project_env_file)
-          ARGV << "--require" << project_env_file
-        end
-      end
-
-    end
-  end
-end

data/lib/watirsplash/version.rb

@@ -1,3 +0,0 @@
-module WatirSplash
-  VERSION = "0.1.9"
-end

data/templates/project/ide_runner.rb

@@ -1,3 +0,0 @@
-# this file is needed for launching specs from IDE
-require "watirsplash/runner"
-exit ::WatirSplash::Runner.run