watirsplash 2.0.0.rc1 → 2.0.0.rc2

data/Gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: .
   specs:
-    watirsplash (1.5.0)
+    watirsplash (2.0.0.rc1)
       bundler (~> 1.0)
       rake (= 0.8.7)
       require_all
-      rspec (~> 2.6)
       syntax
       thor (~> 0)
 
@@ -82,6 +81,7 @@ PLATFORMS
 
 DEPENDENCIES
   firewatir (= 1.9.0)
+  rspec (~> 2.6.0)
   watir (= 1.9.0)
   watir-webdriver (~> 0.2.5)
   watirsplash!

data/History.rdoc

@@ -1,3 +1,18 @@
+=== Version 2.0.0 / 2011-07-xx
+
+ * introducing Page Objects - generate them with `watirsplash page` generator
+ * use WatirSplash::Browser.new to open up a browser and set it to RSpec-s formatter too
+ * removed ui-test-common functionality - just load it's environment.rb if you really need to use it
+ * do not load framework automatically anymore when requiring watirsplash - use WatirSplash::Util.load_framework method in environment.rb or config.rb instead
+ * do not maximize browser window anymore automatically
+ * load environment.rb directly in .rspec file
+ * added :default option for frameworks
+ * bumped dependencies for win32screenshot, watir, firewatir and watir-webdriver
+ * use Bundler for specifying dependencies from now on
+ * moved File.path and File.native_path methods to WatirSplash::Util.file_path and .file_native_path since File.path method conflicts with Ruby 1.9
+  
+  PS! This version is not fully backwards compatible due to some core changes, but it is possible to make your old project working with it.
+
 === Version 1.4.3 / 2011-06-05
 
  * fix #change matcher in conjunction with #within for rspec 2.6.0

data/README.rdoc

@@ -37,14 +37,14 @@ testing right away!
     ...
 
 5) Create a "search" page class and a spec skeleton for it
-    C:\my_project\ui-test>watirsplash page search --url http://bing.com
+    C:\my_project\ui-test>bundle exec watirsplash page search --url http://bing.com
           create  lib
           create  lib/app/page/search.rb
           create  spec
           create  spec/app/page/search_spec.rb
 
 6) Create a "results" page class without spec
-    C:\Users\jarmo\Desktop\minu\projects\Ruby\my_project\ui-test>watirsplash page results --no-spec
+    C:\my_project\ui-test>bundle exec watirsplash page results --no-spec
            exist  lib
           create  lib/app/page/results.rb
 
@@ -97,7 +97,7 @@ testing right away!
     end
 
 8) Execute all specs
-    C:\my_project\ui-test>rspec spec
+    C:\my_project\ui-test>bundle exec rspec spec
     Results will be saved into the directory C:/my_project/ui-test/results
 
     App::Page::Search @ app/page/search_spec.rb:1 (30.06.2011)

data/lib/watirsplash/frameworks/watir.rb

@@ -44,7 +44,7 @@ module Watir
       RAutomation::Window.new(:title => "File Download").button(:value => "&Save").click
 
       save_as_window = RAutomation::Window.new(:title => "Save As")
-      save_as_window.text_field(:class => "Edit", :index => 0).set(File.native_path(file_path))
+      save_as_window.text_field(:class => "Edit", :index => 0).set(WatirSplash::Util.file_native_path(file_path))
       save_as_window.button(:value => "&Save").click
 
       Wait.until {File.exists?(file_path)}
@@ -58,7 +58,7 @@ module Watir
       assert_exists
       self.click_no_wait
       window = RAutomation::Window.new(:title => /choose file( to upload)?/i)
-      window.text_field(:class => "Edit", :index => 0).set(File.native_path(file_path))
+      window.text_field(:class => "Edit", :index => 0).set(WatirSplash::Util.file_native_path(file_path))
       window.button(:value => "&Open").click
     end
   end

data/lib/watirsplash/generators/templates/new_project/environment.rb.tt

@@ -8,7 +8,7 @@ require "watirsplash"
 # Load the framework specified by the environment variable WATIRSPLASH_FRAMEWORK or WatirSplash::Util.framework
 WatirSplash::Util.load_framework
 
-require_all File.join(File.dirname(__FILE__), "lib/**/*.rb")
+require_all Dir.glob(File.join(File.dirname(__FILE__), "lib/**/*.rb"))
 require_rel "config.rb"
 
 # Add all your require statements into this file to avoid unnecessary

data/lib/watirsplash/util.rb

@@ -2,6 +2,20 @@ module WatirSplash
   # class for common functionality
   class Util
     class << self
+      # returns unique file path for use in the examples
+      #
+      # all file names generated with this method will
+      # be shown on the report upon test failure.
+      def file_path(file_name, description=nil)
+        WatirSplash::Util.formatter.file_path(file_name, description)
+      end
+
+      # returns native file path
+      # e.g. on Windows:
+      #   file_native_path("c:/blah/blah2/file.txt") => c:\\blah\\blah2\\file.txt
+      def file_native_path(file_path)
+        File::ALT_SEPARATOR ? file_path.gsub(File::SEPARATOR, File::ALT_SEPARATOR) : file_path
+      end
 
       # configure RSpec to use documentation and WatirSplash::HtmlFormatter formatters
       def configure_rspec_formatters

data/lib/watirsplash/version.rb

@@ -1,6 +1,6 @@
 module WatirSplash
   module Version
-    WATIRSPLASH = "2.0.0.rc1"
+    WATIRSPLASH = "2.0.0.rc2"
 
     # possible runtime dependencies
     WATIR = "1.9.0"

data/lib/watirsplash.rb

@@ -4,7 +4,6 @@ require "rspec"
 require "pathname"
 require_rel "watirsplash/version" unless defined? WatirSplash::Version
 require_rel "watirsplash/browser"
-require_rel "watirsplash/file_helper"
 require_rel "watirsplash/spec_helper"
 require_rel "watirsplash/rspec_patches"
 require_rel "watirsplash/util"

data/spec/util_spec.rb

@@ -0,0 +1,19 @@
+describe WatirSplash::Util do
+
+  before :all do
+    @file_name = "blah.temp"
+    @ext = File.extname(@file_name)
+    @base = File.basename(@file_name, @ext)
+  end
+
+  it ".file_path returns unique file path" do
+    expected_path = File.join(Dir.pwd, "results/files/#{@base}_.*#{@ext}")
+    WatirSplash::Util.file_path(@file_name).should =~ Regexp.new(expected_path)
+  end
+
+  it ".file_native_path returns unique file path with native path separator" do
+    expected_path = File.join(Dir.pwd, "results/files/#{@base}_.*#{@ext}").gsub("/", "\\")
+    WatirSplash::Util.file_native_path(WatirSplash::Util.file_path(@file_name)).should =~ Regexp.new(Regexp.escape(expected_path).gsub("\\.\\*", ".*"))
+  end
+
+end

data/spec/watir_ie_spec.rb

@@ -8,7 +8,7 @@ describe "Watir::IE", :if => WatirSplash::Util.framework == :watir do
     context "#save_as" do
       it "saves file with the browser" do
         begin
-          file_path = link(:text => "Download").save_as(File.path("download.zip"))
+          file_path = link(:text => "Download").save_as(WatirSplash::Util.file_path("download.zip"))
           File.read(file_path).should == "this is a 'zip' file!"
         ensure
           FileUtils.rm file_path rescue nil

data/watirsplash.gemspec

@@ -10,13 +10,6 @@ Gem::Specification.new do |s|
   s.email = %q{jarmo.p@gmail.com}
   s.description = %q{WatirSplash makes testing of web applications splashin' easy by combining best features of Watir, RSpec and Ruby!}
   s.homepage = %q{http://github.com/jarmo/WatirSplash}
-  s.post_install_message = %Q{*************************
-
-Thank you for installing WatirSplash #{version}! Don't forget to take a look at the README and History files!
-
-Execute `watirsplash new` under your project's directory to generate a default project structure.
-
-*************************}
   s.summary = %Q{watirsplash #{version}}
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: watirsplash
 version: !ruby/object:Gem::Version 
-  hash: 15424087
+  hash: 15424081
   prerelease: 6
   segments: 
   - 2
   - 0
   - 0
   - rc
-  - 1
-  version: 2.0.0.rc1
+  - 2
+  version: 2.0.0.rc2
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 Z
+date: 2011-07-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -113,7 +113,6 @@ files:
 - lib/watirsplash.rb
 - lib/watirsplash/browser.rb
 - lib/watirsplash/cli.rb
-- lib/watirsplash/file_helper.rb
 - lib/watirsplash/frameworks/firewatir.rb
 - lib/watirsplash/frameworks/helper.rb
 - lib/watirsplash/frameworks/watir-webdriver.rb
@@ -137,23 +136,16 @@ files:
 - lib/watirsplash/util.rb
 - lib/watirsplash/version.rb
 - spec/environment.rb
-- spec/file_helper_spec.rb
 - spec/rspec_patches_spec.rb
 - spec/spec_helper_spec.rb
 - spec/spec_match_array_spec.rb
+- spec/util_spec.rb
 - spec/watir_ie_spec.rb
 - watirsplash.gemspec
 homepage: http://github.com/jarmo/WatirSplash
 licenses: []
 
-post_install_message: |-
-  *************************
-  
-  Thank you for installing WatirSplash 2.0.0.rc1! Don't forget to take a look at the README and History files!
-  
-  Execute `watirsplash new` under your project's directory to generate a default project structure.
-  
-  *************************
+post_install_message: 
 rdoc_options: []
 
 require_paths: 
@@ -184,11 +176,11 @@ rubyforge_project:
 rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
-summary: watirsplash 2.0.0.rc1
+summary: watirsplash 2.0.0.rc2
 test_files: 
 - spec/environment.rb
-- spec/file_helper_spec.rb
 - spec/rspec_patches_spec.rb
 - spec/spec_helper_spec.rb
 - spec/spec_match_array_spec.rb
+- spec/util_spec.rb
 - spec/watir_ie_spec.rb

data/lib/watirsplash/file_helper.rb

@@ -1,18 +0,0 @@
-class File
-  class << self
-    # returns unique file path for use in the examples
-    #
-    # all file names generated with this method will
-    # be shown on the report upon test failure.
-    def path(file_name, description=nil)
-      WatirSplash::Util.formatter.file_path(file_name, description)
-    end
-
-    # returns native file path
-    # e.g. on Windows:
-    #   native_file_path("c:/blah/blah2/file.txt") => c:\\blah\\blah2\\file.txt
-    def native_path(file_path)
-      File::ALT_SEPARATOR ? file_path.gsub(File::SEPARATOR, File::ALT_SEPARATOR) : file_path
-    end
-  end
-end

data/spec/file_helper_spec.rb

@@ -1,19 +0,0 @@
-describe File do
-
-  before :all do
-    @file_name = "blah.temp"
-    @ext = File.extname(@file_name)
-    @base = File.basename(@file_name, @ext)
-  end
-
-  it ".path returns unique file path" do
-    expected_path = File.join(Dir.pwd, "results/files/#{@base}_.*#{@ext}")
-    File.path(@file_name).should =~ Regexp.new(expected_path)
-  end
-
-  it ".native_path returns unique file path with native path separator" do
-    expected_path = File.join(Dir.pwd, "results/files/#{@base}_.*#{@ext}").gsub("/", "\\")
-    File.native_path(File.path(@file_name)).should =~ Regexp.new(Regexp.escape(expected_path).gsub("\\.\\*", ".*"))
-  end
-
-end