spec_ui 0.2.0 → 0.2.2

data/Manifest.txt

@@ -8,7 +8,7 @@ lib/spec/ui/images/rmagick_not_installed.png
 lib/spec/ui/images/win32screenshot_not_installed.png
 lib/spec/ui/images/wrong_win32screenshot.png
 lib/spec/ui/screenshot_saver.rb
-lib/spec/ui/selenium
+lib/spec/ui/selenium.rb
 lib/spec/ui/selenium/driver_ext.rb
 lib/spec/ui/version.rb
 lib/spec/ui/watir.rb
@@ -20,7 +20,7 @@ examples/selenium/spec/google/find_rspecs_homepage_spec.rb
 examples/selenium/spec/spec_helper.rb
 examples/watir/Rakefile
 examples/watir/README.txt
-examples/watir/spec/google/find_rspecs_homepage_spec.rb
+examples/watir/spec/watir/find_rspecs_homepage_spec.rb
 examples/watir/spec/spec_helper.rb
 spec/spec_helper.rb
 spec/spec/ui/watir/matchers_spec.rb

data/examples/selenium/README.txt

@@ -16,7 +16,7 @@ In the first one, run:
 
 In the second one, run:
 
-  rake spec:ui
+  rake spec:selenium
   
 = Note for OS X users =
 
@@ -24,6 +24,9 @@ In the second one, run:
 If you experience that the selenium server is just hanging, read this:
 http://forums.openqa.org/message.jspa?messageID=16541
 
+You may have better luck with one of the snapshot jars found under
+http://maven.openqa.org/org/openqa/selenium/server/selenium-server
+
 == Safari ==
 You may have to set up Safari's proxy settings manually:
 http://forums.openqa.org/thread.jspa?messageID=20570&#20570

data/examples/selenium/Rakefile

@@ -1,12 +1,17 @@
-require File.dirname(__FILE__) + '/spec/spec_helper'
+# You don't need to tweak the $LOAD_PATH if you have RSpec and Spec::Ui installed as gems
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../../rspec/lib')
+
+require 'rubygems'
 require 'spec/rake/spectask'
 
-desc "Run UI Specs"
-Spec::Rake::SpecTask.new('spec:ui') do |t|
-  t.spec_files = FileList['spec/**/*.rb']
+desc "Run Selenium Specs"
+Spec::Rake::SpecTask.new('spec:selenium') do |t|
+  t.spec_files = FileList['spec/google/**/*.rb']
+  # This line is not necessary if you have RSpec and Spec::Ui installed as gems
+  t.ruby_opts = ["-I#{File.dirname(__FILE__) + '/../../lib'}"]
   t.spec_opts = [
-    '--require', 'spec/spec_helper', 
+    '--require', 'rubygems,spec/ui', 
     '--format', 'Spec::Ui::ScreenshotFormatter:spec_report.html',
-    '--format', 'progress',
+    '--format', 'progress'
   ]
 end

data/examples/selenium/spec/google/find_rspecs_homepage_spec.rb

@@ -1,12 +1,9 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Google's search page" do
-  before(:all) do
-    @browser = Selenium::SeleniumDriver.new("localhost", 4444, "*safari", "http://www.google.no", 10000)
-    @browser.start
-  end
-    
+
   before(:each) do
+    # The @browser is initialised in spec_helper.rb
     @browser.open('http://www.google.no')
   end
 
@@ -28,11 +25,4 @@ describe "Google's search page" do
     @browser.is_text_present("Ali G").should be_false
   end
 
-  after(:each) do
-    Spec::Ui::WebappFormatter.browser = @browser
-  end
-
-  after(:all) do
-    @browser.kill! rescue nil
-  end
 end

data/examples/selenium/spec/spec_helper.rb

@@ -5,4 +5,22 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'rubygems'
 require 'spec'
 require 'spec/ui'
+require File.dirname(__FILE__) + '/selenium'
 require 'spec/ui/selenium'
+
+Spec::Runner.configure do |config|
+  
+  config.before(:all) do
+    @browser = Selenium::SeleniumDriver.new("localhost", 4444, "*firefox", "http://www.google.no", 10000)
+    @browser.start
+  end
+  
+  config.after(:each) do
+    Spec::Ui::ScreenshotFormatter.browser = @browser
+  end
+
+  config.after(:all) do
+    @browser.kill! rescue nil
+  end
+end
+  

data/examples/watir/README.txt

@@ -9,4 +9,4 @@ with spec/ui. Prerequisites:
 
 After this is installed, run the watir specs:
 
-  rake spec:ui
+  rake spec:watir

data/examples/watir/Rakefile

@@ -1,12 +1,17 @@
-require File.dirname(__FILE__) + '/spec/spec_helper'
+# You don't need to tweak the $LOAD_PATH if you have RSpec and Spec::Ui installed as gems
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../../rspec/lib')
+
+require 'rubygems'
 require 'spec/rake/spectask'
 
-desc "Run UI Specs"
-Spec::Rake::SpecTask.new('spec:ui') do |t|
-  t.spec_files = FileList['spec/**/*.rb']
+desc "Run Watir Specs"
+Spec::Rake::SpecTask.new('spec:watir') do |t|
+  t.spec_files = FileList['spec/watir/**/*.rb']
+  # This line is not necessary if you have RSpec and Spec::Ui installed as gems
+  t.ruby_opts = ["-I#{File.dirname(__FILE__) + '/../../lib'}"]
   t.spec_opts = [
-    '--require', 'spec/spec_helper', 
+    '--require', 'rubygems,spec/ui', 
     '--format', 'Spec::Ui::ScreenshotFormatter:spec_report.html',
-    '--format', 'progress',
+    '--format', 'progress'
   ]
 end

data/examples/watir/spec/spec_helper.rb

@@ -7,8 +7,16 @@ require 'spec'
 require 'spec/ui'
 require 'spec/ui/watir'
 
-class Spec::DSL::Behaviour
-  def before_eval #:nodoc:
-    include Spec::Matchers::Watir # This gives us Watir matchers
+Spec::Runner.configure do |config|
+  config.before(:all) do
+    @browser = Watir::Browser.new
+  end
+  
+  config.after(:each) do
+    Spec::Ui::ScreenshotFormatter.browser = @browser
+  end
+
+  config.after(:all) do
+    @browser.kill! rescue nil
   end
 end

data/examples/watir/spec/{google → watir}/find_rspecs_homepage_spec.rb

@@ -1,11 +1,8 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Google's search page" do
-  before(:all) do
-    @browser = Watir::Browser.new
-  end
-  
   before(:each) do
+    # The @browser is initialised in spec_helper.rb
     @browser.goto('http://www.google.com')
   end
 
@@ -26,12 +23,4 @@ describe "Google's search page" do
     @browser.button(:name, "btnG").click
     @browser.should_not have_text("Ali G")
   end
-  
-  after(:each) do
-    Spec::Ui::ScreenshotFormatter.browser = @browser
-  end
-
-  after(:all) do
-    @browser.kill! rescue nil
-  end
 end

data/lib/spec/ui/formatter.rb

@@ -27,7 +27,7 @@ module Spec
         end
         
         def png_path
-          raise "Screenshot not taken. You must call #{self.class}#screenshot! or #{self.class}#browser=(@browser) from after(:each)" if @png_path.nil?
+          raise "Screenshot not taken. You must call #{self.name}.screenshot! or #{self.name}.browser = @browser from after(:each)" if @png_path.nil?
           @png_path
         end
         

data/lib/spec/ui/selenium.rb

@@ -0,0 +1 @@
+require 'spec/ui/selenium/driver_ext'

data/lib/spec/ui/version.rb

@@ -3,7 +3,7 @@ module Spec
     module VERSION #:nodoc:
       MAJOR = 0
       MINOR = 2
-      TINY  = 0
+      TINY  = 2
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/lib/spec/ui/watir.rb

@@ -1,2 +1,3 @@
 require 'spec/ui/watir/browser'
 require 'spec/ui/watir/matchers'
+require 'spec/ui/watir/watir_behaviour'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: spec_ui
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-05-10 00:00:00 +02:00
+  version: 0.2.2
+date: 2007-05-18 00:00:00 -07:00
 summary: Run UI RSpec examples with screenshot reports
 require_paths: 
 - lib
@@ -39,7 +39,7 @@ files:
 - lib/spec/ui/images/win32screenshot_not_installed.png
 - lib/spec/ui/images/wrong_win32screenshot.png
 - lib/spec/ui/screenshot_saver.rb
-- lib/spec/ui/selenium
+- lib/spec/ui/selenium.rb
 - lib/spec/ui/selenium/driver_ext.rb
 - lib/spec/ui/version.rb
 - lib/spec/ui/watir.rb
@@ -51,7 +51,7 @@ files:
 - examples/selenium/spec/spec_helper.rb
 - examples/watir/Rakefile
 - examples/watir/README.txt
-- examples/watir/spec/google/find_rspecs_homepage_spec.rb
+- examples/watir/spec/watir/find_rspecs_homepage_spec.rb
 - examples/watir/spec/spec_helper.rb
 - spec/spec_helper.rb
 - spec/spec/ui/watir/matchers_spec.rb