watirsplash 0.2.2 → 0.2.3

data/History.rdoc

@@ -1,3 +1,9 @@
+=== Version 0.2.3 / 2010-07-23
+
+Bug fixes:
+ * it is now possible to use method 'p' to find <p> elements in specs without invoking Kernel.p
+ * fixed project template to use require_all instead of require_rel
+
 === Version 0.2.2 / 2010-06-13
 
  * fixed minor bugs

data/README.rdoc

@@ -35,7 +35,7 @@ testing right away!
 
 == SYNOPSIS:
 
-=== Without WatirSplash:
+=== With plain Watir and RSpec:
     require 'watir'
     require 'spec'
 
@@ -48,9 +48,9 @@ testing right away!
         end
 
         it "has search field" do
-            @browser.text_field = text_field(:name => "q")
-            @browser.text_field.should exist
-            @browser.text_field.should be_visible
+            text_field = @browser.text_field(:name => "q")
+            text_field.should exist
+            text_field.should be_visible
         end
 
         it "performs search" do

data/Rakefile

@@ -60,7 +60,7 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "my-testing-library #{version}"
+  rdoc.title = "WatirSplash #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/watirsplash.rb

@@ -2,6 +2,7 @@ require "rubygems"
 require "require_all"
 require "spec"
 require "watir"
+require "pathname"
 require_rel "watirsplash/waiter"
 require_rel "watirsplash/spec_helper"
 require_rel "watirsplash/spec"

data/lib/watirsplash/html_formatter.rb

@@ -19,13 +19,10 @@ module WatirSplash
     def initialize(options, output) # :nodoc:
       raise "output has to be a file path!" unless output.is_a?(String)
       @output_dir = File.expand_path(File.dirname(output))
+      archive_results
+
       puts "Results will be saved into the directory #{@output_dir}"
       @files_dir = File.join(@output_dir, "files")
-      if File.exists?(@output_dir)
-        archive_dir = File.join(@output_dir, "../archive")
-        FileUtils.mkdir_p(archive_dir) unless File.exists?(archive_dir)
-        FileUtils.mv @output_dir, File.join(archive_dir, "#{File.basename(@output_dir)}_#{File.mtime(@output_dir).strftime("%y%m%d_%H%M%S")}")
-      end
       FileUtils.mkdir_p(@files_dir)
       @files_saved_during_example = []
       super
@@ -116,5 +113,15 @@ module WatirSplash
       file_path
     end
 
+    private
+
+    def archive_results
+      if File.exists?(@output_dir)
+        archive_dir = File.join(@output_dir, "../archive")
+        FileUtils.mkdir_p(archive_dir) unless File.exists?(archive_dir)
+        FileUtils.mv @output_dir, File.join(archive_dir, "#{File.basename(@output_dir)}_#{File.mtime(@output_dir).strftime("%y%m%d_%H%M%S")}")
+      end
+    end
+
   end
 end

data/lib/watirsplash/spec_helper.rb

@@ -55,8 +55,15 @@ module WatirSplash
       File::ALT_SEPARATOR ? file_path.gsub(File::SEPARATOR, File::ALT_SEPARATOR) : file_path
     end
 
-    def method_missing name, *arg #:nodoc:
-      @browser.respond_to?(name) ? @browser.send(name, *arg) : super
+    def method_missing name, *args #:nodoc:
+      @browser.respond_to?(name) ? @browser.send(name, *args) : super
+    end
+
+    # make sure that using method 'p' will be invoked on @browser
+    # and not Kernel
+    # use Kernel.p if you need to dump some variable 
+    def p *args #:nodoc:
+      @browser.p *args
     end
 
   end

data/lib/watirsplash/util.rb

@@ -1,8 +1,6 @@
 module WatirSplash
   # class for common functionality
   class Util
-    @@ui_test_common_dir = "ui-test-common"
-
     class << self
 
       # loads ui-test-common/environment.rb
@@ -15,30 +13,29 @@ module WatirSplash
         require File.join(dir, "environment.rb")
       end
 
+      # loads environment.rb for the project if it exists in the ui-test
+      # or in some higher level directory 
       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
+        Pathname(Dir.pwd).ascend do |path|
+          require File.join(path, "environment.rb") if has_environment?(path)
         end
       end
 
       private
 
       def common_dir
-        Dir.chdir("..") do
-          dirs = Dir.entries(Dir.pwd).find_all {|entry| File.directory?(entry)}
-          if dirs.include?(@@ui_test_common_dir) && File.exists?(@@ui_test_common_dir + "/environment.rb")
-            File.join(Dir.pwd, @@ui_test_common_dir)
-          elsif dirs.include?("..")
-            common_dir
-          else
-            raise "#{@@ui_test_common_dir} directory was not found! It has to exist somewhere higher in directory tree than your project's directory and it has to have environment.rb file in it!"
+        ui_test_common_dir = "ui-test-common"
+        Pathname(Dir.pwd).ascend do |path|
+          if File.exists?(dir = File.join(path, ui_test_common_dir)) &&
+                  has_environment?(dir)
+            return dir
           end
         end
+        raise "#{ui_test_common_dir} directory was not found! It has to exist somewhere higher in directory tree than your project's directory and it has to have environment.rb file in it!"
+      end
+
+      def has_environment? dir
+        return File.exists?(File.join(dir, "environment.rb"))
       end
 
     end

data/spec/spec_helper_spec.rb

@@ -43,7 +43,7 @@ describe WatirSplash::SpecHelper do
 
   it "has download_file method" do
     begin
-      goto "http://dl.dropbox.com/u/2731643/misc/download.html"
+      goto "http://dl.dropbox.com/u/2731643/WatirSplash/download.html"
       link(:text => "Download").click_no_wait
       file = download_file("download.zip")
       File.read(file).should == "this is a 'zip' file!"
@@ -52,4 +52,11 @@ describe WatirSplash::SpecHelper do
     end
   end
 
+  it "redirects usages of method 'p' to Watir::IE#p instead of Kernel.p" do
+    goto "http://dl.dropbox.com/u/2731643/WatirSplash/elements.html"
+    paragraph = p(:class => "my_pg")
+    paragraph.should exist
+    paragraph.text.should == "This is a paragraph!"
+  end
+
 end

data/spec/util_spec.rb

@@ -3,12 +3,9 @@ require "spec"
 describe WatirSplash::Util do
 
   it "loads ui-test-common" do
-    class WatirSplash::Util
-      @@ui_test_common_dir = "ui-test-common-for-test"
-    end
-
+    ui_test_common_dir = "../ui-test-common"
+    raise "ui-test-common directory should not exist due to testing!" if File.exists?(ui_test_common_dir)
     begin
-      ui_test_common_dir = "../ui-test-common-for-test"
       FileUtils.mkdir(ui_test_common_dir)
       File.open(File.join(ui_test_common_dir, "environment.rb"), "w") do |f|
         f.puts "
@@ -17,6 +14,7 @@ module GlobalApplication
 end"
       end
 
+      lambda {GlobalApplication::LOADED}.should raise_exception
       lambda {WatirSplash::Util.load_common}.should_not raise_exception
       GlobalApplication::LOADED.should be_true
     ensure
@@ -25,13 +23,28 @@ end"
   end
 
   it "raises exception if ui-test-common is not found" do
-    class WatirSplash::Util
-      @@ui_test_common_dir = "nonexisting_ui_test_common_dir"
-    end
-
     lambda {WatirSplash::Util.load_common}.
             should raise_exception(RuntimeError,
-                                   "nonexisting_ui_test_common_dir directory was not found! It has to exist somewhere higher in directory tree than your project's directory and it has to have environment.rb file in it!")
+                                   "ui-test-common directory was not found! It has to exist somewhere higher in directory tree than your project's directory and it has to have environment.rb file in it!")
+  end
+
+  it "loads project's environment.rb automatically" do
+    env_file = "../environment.rb"
+    raise "environment.rb file should not exist due to testing!" if File.exists?(env_file)
+    begin
+      File.open(env_file, "w") do |file|
+        file.puts "
+module GlobalApplication
+  ENVIRONMENT_LOADED = true
+end"
+      end
+
+      lambda {GlobalApplication::ENVIRONMENT_LOADED}.should raise_exception
+      lambda {WatirSplash::Util.load_environment}.should_not raise_exception
+      GlobalApplication::ENVIRONMENT_LOADED.should be_true
+    ensure
+      FileUtils.rm_rf(env_file)
+    end
   end
 
 end

data/spec/watir_ie_spec.rb

@@ -3,7 +3,7 @@ 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"
+    goto "http://dl.dropbox.com/u/2731643/WatirSplash/tables.html"
     t = table(:id => "normal")
     normal_cell = t[1][1]
     normal_cell.text.should == "1"

data/spec/watir_table_row_spec.rb

@@ -4,7 +4,7 @@ describe Watir::TableRow do
   include WatirSplash::SpecHelper
 
   before :all do
-    goto "http://dl.dropbox.com/u/2731643/misc/tables.html"
+    goto "http://dl.dropbox.com/u/2731643/WatirSplash/tables.html"
   end
 
   it "#to_a works with regular row" do

data/spec/watir_table_spec.rb

@@ -4,7 +4,7 @@ describe Watir::Table do
   include WatirSplash::SpecHelper
 
   before :all do
-    goto "http://dl.dropbox.com/u/2731643/misc/tables.html"
+    goto "http://dl.dropbox.com/u/2731643/WatirSplash/tables.html"
   end
 
   it "#to_a works with regular table" do

data/templates/project/environment.rb

@@ -10,6 +10,6 @@ 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_rel filtered_spec_files
+require_all filtered_spec_files
 require_rel "config.rb"
 require_rel "application_helper.rb"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-13 00:00:00 +03:00
+date: 2010-07-23 00:00:00 +03:00
 default_executable: watirsplash
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -167,7 +167,7 @@ licenses: []
 post_install_message: |-
   *************************
   
-  Thank you for installing WatirSplash 0.2.2! Don't forget to take a look at README and History files!
+  Thank you for installing WatirSplash 0.2.3! 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 +202,7 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: watirsplash 0.2.2
+summary: watirsplash 0.2.3
 test_files: 
 - spec/spec_helper_spec.rb
 - spec/spec_match_array_spec.rb