rspec 0.7.0 → 0.7.1

data/CHANGES

@@ -1,6 +1,25 @@
 = RSpec Changelog
 
-== Version 0.7.0 (in SVN)
+== Version 0.7.1
+
+Bug fixes and a couple o' new features.
+
+* Fixed [#6575] Parse error in aliasing the partial mock original method (patch by Brian Takita)
+* Fixed [#6277] debris left by stubbing (trunk) [submitted by dastels] (fixed by fix to [#6575])
+* Fixed [#6575] Parse error in aliasing the partial mock original method
+* Fixed [#6555] should_have_tag does not match documentation
+* Fixed [#6567] SyntaxError should not stop entire run
+* Fixed [#6558] integrated views look for template even when redirected
+* Fixed [#6547] response.should_be_redirect broken in 0.7.0
+* Applied [#6471] Easy way to spec routes
+* Applied [#6587] Rspec on Rails displays "Spec::Rails::ContextFactory" as context name
+* Applied [#6514] Document has trivial typos.
+* Added [#6560] controller.session should be available before the action
+* Added support for should_have_rjs :visual_effect
+* Different printing and colours for unmet expectations (red) and other exceptions (magenta)
+* Simplified method_missing on mock_methods to make it less invasive on partial mocks. 
+
+== Version 0.7.0
 
 This is the "Grow up and eat your own dog food release". RSpec is now used on itself and
 we're no longer using Test::Unit to test it. Although, we are still extending Test::Unit
@@ -10,7 +29,6 @@ IMPORTANT NOTE: THIS RELEASE IS NOT 100% BACKWARDS COMPATIBLE TO 0.6.x
 
 There are a few changes that will require that you change your existing specs.
 
---------------------------------------------------
 RSpec now handles equality exactly like ruby does:
 
 # actual.should_equal(expected) will pass if actual.equal?(expected) returns true
@@ -35,8 +53,8 @@ used to pass for any non-nil, non-false value), and actual.should_be false will
 value other than false (it used to pass for nil or false).
 
 Here's what you'll need to do to update your specs:
-* search for "should_equal" and replace with "should_eql"
-* run specs
+# search for "should_equal" and replace with "should_eql"
+# run specs
 
 If any specs still fail, they are probably related to should_be(true) or should_be(false) using
 non-boolean values. Those you'll just have to inspect manually and adjust appropriately (sorry!).
@@ -53,15 +71,15 @@ mock.should_receive(:message).and_return([1,2,3])
 but we decided that was counter intuitive and otherwise lame.
 
 Here's what you'll need to do to update your specs:
-* search for "and_return(["
-* get rid of the "[" and "]"
+# search for "and_return(["
+# get rid of the "[" and "]"
 
 --------------------------------------------------
 RSpec on Rails now supports the following (thanks to ZenTest upon which it is built):
 
-* Separate specs for models, views, controllers and helpers
-* Controller specs are completely decoupled from the views by default (though you can tell them to couple themselves if you prefer)
-* View specs are completely decoupled from app-specific controllers
+# Separate specs for models, views, controllers and helpers
+# Controller specs are completely decoupled from the views by default (though you can tell them to couple themselves if you prefer)
+# View specs are completely decoupled from app-specific controllers
 
 See http://rspec.rubyforge.org/documentation/rails/index.html for more information
 --------------------------------------------------

data/Rakefile

@@ -24,6 +24,7 @@ PKG_FILES = FileList[
   'vendor/watir/*.rb',
   'vendor/watir/*.txt',
   'vendor/selenium/*.rb',
+  'vendor/selenium/*.patch',
   'vendor/selenium/*.txt'
 ]
 
@@ -35,7 +36,7 @@ Spec::Rake::SpecTask.new do |t|
   t.spec_opts = ['--diff','--color','--backtrace']
   t.rcov = true
   t.rcov_dir = 'doc/output/coverage'
-  t.rcov_opts = ['--exclude', 'spec\/spec,bin\/spec']
+  t.rcov_opts = ['--exclude', 'spec\/spec,bin\/spec,examples']
 end
 
 desc "Run all failing examples"
@@ -188,8 +189,12 @@ task :pre_commit => [
 
 task :rails_pre_commit do
   Dir.chdir 'vendor/rspec_on_rails' do    
-    `rake pre_commit --verbose`    
-    raise "RSpec on Rails pre_commit failed\n(cd to vendor/rspec_on_rails and run rake pre_commit for more details)" if $? != 0
+    IO.popen("rake pre_commit --verbose") do |io|
+      io.each do |line|
+        puts line
+      end
+    end
+    raise "RSpec on Rails pre_commit failed" if $? != 0
   end
 end
 

data/bin/spec

@@ -1,19 +1,5 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.push File.dirname(__FILE__) + "/../lib"
 require File.expand_path(File.dirname(__FILE__) + "/../lib/spec") # better stack traces this way
-
-$context_runner = ::Spec::Runner::OptionParser.create_context_runner(ARGV, false, STDERR, STDOUT)
-
-# If ARGV is a glob, it will actually each over each one of the matching files.
-ARGV.each do |file_or_dir|
-  if File.directory?(file_or_dir)
-    Dir["#{file_or_dir}/**/*.rb"].each do |file| 
-      require file
-    end
-  else
-    require file_or_dir
-  end
-end
-
-$context_runner.run(true)
+::Spec::Runner::CommandLine.run(ARGV, STDERR, STDOUT, true, true)
 

data/lib/spec.rb

@@ -1,4 +1,4 @@
 require 'spec/version'
 require 'spec/expectations'
 require 'spec/mocks'
-require 'spec/runner'
+require 'spec/runner'

data/lib/spec/mocks/errors.rb

@@ -1,9 +1,9 @@
 module Spec
   module Mocks
-    class MockExpectationError < StandardError
+    class MockExpectationError < Expectations::ExpectationNotMetError
     end
     
-    class AmbiguousReturnError < StandardError
+    class AmbiguousReturnError < Expectations::ExpectationNotMetError
     end
   end
 end

data/lib/spec/mocks/mock.rb

@@ -10,6 +10,17 @@ module Spec
         @name = name
         @options = options
       end
+
+      def method_missing(sym, *args, &block)
+        __mock_handler.instance_eval {@messages_received << [sym, args, block]}
+        begin
+          return self if __mock_handler.null_object?
+          super(sym, *args, &block)
+        rescue NoMethodError
+          __mock_handler.raise_unexpected_message_error sym, *args
+        end
+      end
+      
     end
   end
 end

data/lib/spec/mocks/mock_handler.rb

@@ -9,7 +9,7 @@ module Spec
         @expectations = []
         @messages_received = []
         @stubs = []
-        @proxied_methods = []
+        @proxied_methods = {}
         @options = options ? DEFAULT_OPTIONS.dup.merge(options) : DEFAULT_OPTIONS
       end
 
@@ -17,44 +17,41 @@ module Spec
         :null_object => false,
         :auto_verify => true
       }
-      
+
       def null_object?
         @options[:null_object]
       end
-      
+
       def add_message_expectation(expected_from, sym, opts={}, &block)
         __add expected_from, sym, block
         @expectations << MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil, 1, opts)
         @expectations.last
       end
-      
+
       def add_negative_message_expectation(expected_from, sym, &block)
         __add expected_from, sym, block
         @expectations << NegativeMessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil)
         @expectations.last
       end
-      
+
       def add_stub(expected_from, sym)
         __add expected_from, sym, nil
         @stubs << MethodStub.new(@error_generator, @expectation_ordering, expected_from, sym, nil)
         @stubs.last
       end
-      
+
       def __add expected_from, sym, block
         Runner::Specification.add_listener(self) if @options[:auto_verify]
         define_expected_method(sym)
       end
-      
+
       def spec_finished spec
         verify
       end
 
       def define_expected_method(sym)
-        if @target.respond_to? sym
-          metaclass_eval %-
-            alias_method :#{__pre_proxied_method_name(sym)}, :#{sym}
-          -
-          @proxied_methods << sym
+        if @target.respond_to?(sym) && !@proxied_methods[sym]
+          @proxied_methods[sym] = @target.method(sym)
         end
 
         metaclass_eval %-
@@ -64,10 +61,6 @@ module Spec
         -
       end
 
-      def __pre_proxied_method_name method_name
-        "original_#{method_name.to_s.delete('!').delete('[').delete('\]')}_before_proxy"
-      end
-
       def verify #:nodoc:
         begin
           verify_expectations
@@ -75,14 +68,14 @@ module Spec
           reset
         end
       end
-      
+
       def reset
         clear_expectations
         clear_stubs
         reset_proxied_methods
         clear_proxied_methods
       end
-      
+
       def verify_expectations
         @expectations.each do |expectation|
           expectation.verify_messages_received
@@ -90,24 +83,25 @@ module Spec
       end
 
       def reset_proxied_methods
-        @proxied_methods.each do |method_name|
-          if @target.respond_to? __pre_proxied_method_name(method_name)
-            metaclass_eval %-
-              alias_method :#{method_name}, :#{__pre_proxied_method_name(method_name)}
-              remove_method :#{__pre_proxied_method_name(method_name)}
-            -
-          end  
-        end  
-      end  
+        @proxied_methods.each do |method_name, method_obj|
+          define_instance_method(method_name, method_obj)
+        end
+      end
+
+      def define_instance_method(method_name, method_obj)
+        (class << @target; self; end).class_eval do
+          define_method method_name, &method_obj
+        end
+      end
 
       def clear_expectations #:nodoc:
         @expectations.clear
       end
-      
+
       def clear_stubs #:nodoc:
         @stubs.clear
       end
-      
+
       def clear_proxied_methods #:nodoc:
         @proxied_methods.clear
       end
@@ -115,7 +109,7 @@ module Spec
       def metaclass_eval str
         (class << @target; self; end).class_eval str
       end
-      
+
       def received_message?(sym, *args, &block)
         return true if @messages_received.find {|array| array == [sym, args, block]}
         return false
@@ -124,19 +118,19 @@ module Spec
       def find_matching_expectation(sym, *args)
         @expectations.find {|expectation| expectation.matches(sym, args)}
       end
-      
+
       def find_almost_matching_expectation(sym, *args)
         @expectations.find {|expectation| expectation.matches_name_but_not_args(sym, args)}
       end
-      
+
       def find_matching_method_stub(sym)
         @stubs.find {|stub| stub.matches(sym, [])}
       end
-      
+
       def has_negative_expectation?(sym)
         @expectations.detect {|expectation| expectation.negative_expectation_for?(sym)}
       end
-      
+
       def message_received(sym, *args, &block)
         if expectation = find_matching_expectation(sym, *args)
           expectation.invoke(args, block)
@@ -148,11 +142,11 @@ module Spec
           @target.send :method_missing, sym, *args, &block
         end
       end
-      
+
       def raise_unexpected_message_error sym, *args
         @error_generator.raise_unexpected_message_error sym, *args
       end
-      
+
     end
   end
 end

data/lib/spec/mocks/mock_methods.rb

@@ -27,15 +27,11 @@ module Spec
 
       def method_missing(sym, *args, &block)
         __mock_handler.instance_eval {@messages_received << [sym, args, block]}
-        begin
-          return self if __mock_handler.null_object?
-          super(sym, *args, &block)
-        rescue NoMethodError
-          __mock_handler.raise_unexpected_message_error sym, *args
-        end
+        super(sym, *args, &block)
       end
       
       private
+
       def __mock_handler
         @mock_handler ||= MockHandler.new(self, @name, @options)
       end

data/lib/spec/runner.rb

@@ -5,6 +5,7 @@ require 'spec/runner/specification'
 require 'spec/runner/execution_context'
 require 'spec/runner/context_runner'
 require 'spec/runner/option_parser'
+require 'spec/runner/command_line'
 require 'spec/runner/backtrace_tweaker'
 require 'spec/runner/reporter'
 require 'spec/runner/spec_matcher'

data/lib/spec/runner/backtrace_tweaker.rb

@@ -1,13 +1,10 @@
 module Spec
   module Runner
-    class BacktraceTweaker
+    class NoisyBacktraceTweaker
       def tweak_instance_exec_line line, spec_name
         line = line.split(':in')[0] + ":in `#{spec_name}'" if line.include?('__instance_exec')
         line
       end
-    end
-
-    class NoisyBacktraceTweaker < BacktraceTweaker
       def tweak_backtrace(error, spec_name)
         return if error.backtrace.nil?
         error.backtrace.collect! do |line|
@@ -18,24 +15,28 @@ module Spec
     end
 
     # Tweaks raised Exceptions to mask noisy (unneeded) parts of the backtrace
-    class QuietBacktraceTweaker < BacktraceTweaker
+    class QuietBacktraceTweaker
+      def tweak_instance_exec_line line, spec_name
+        line = line.split(':in')[0] if line.include?('__instance_exec')
+        line
+      end
       def tweak_backtrace(error, spec_name)
         return if error.backtrace.nil?
         error.backtrace.collect! do |line|
           line = tweak_instance_exec_line line, spec_name
           line = nil if line =~ /\/lib\/ruby\//
           line = nil if line =~ /\/lib\/spec\/expectations\//
-          line = nil if line =~ /\/lib\/spec\/method_proxy\//
           line = nil if line =~ /\/lib\/spec\/mocks\//
           line = nil if line =~ /\/lib\/spec\/rake\//
           line = nil if line =~ /\/lib\/spec\/runner\//
-          line = nil if line =~ /\/lib\/spec\/stubs\//
           line = nil if line =~ /bin\/spec:/
           line = nil if line =~ /bin\/rcov:/
           line = nil if line =~ /lib\/rspec_on_rails/
           line = nil if line =~ /script\/rails_spec/
-          # TextMate's Ruby plugin
+          # TextMate's Ruby and RSpec plugins
           line = nil if line =~ /Ruby\.tmbundle\/Support\/tmruby.rb:/
+          line = nil if line =~ /RSpec\.tmbundle\/Support\/lib/
+          line = nil if line =~ /temp_textmate\./
           line
         end
         error.backtrace.compact!

data/lib/spec/runner/command_line.rb

@@ -0,0 +1,31 @@
+module Spec
+  module Runner
+    # Facade to run specs without having to fork a new ruby process (using `spec ...`)
+    class CommandLine
+      # Runs specs. +argv+ is the commandline args as per the spec commandline API, +stderr+ 
+      # and +stdiout+ are the streams output will be written to, +exit+ tells whether or
+      # not a system exit should be called after the specs are run and
+      # +warn_if_no_files+ tells whether or not a warning (the help message)
+      # should be printed to +stderr+ in case no files are specified.
+      def self.run(argv, stderr, stdout, exit, warn_if_no_files)
+        old_context_runner = defined?($context_runner) ? $context_runner : nil
+        $context_runner = OptionParser.create_context_runner(argv, stderr, stdout, warn_if_no_files)
+
+        # If ARGV is a glob, it will actually each over each one of the matching files.
+        argv.each do |file_or_dir|
+          if File.directory?(file_or_dir)
+            Dir["#{file_or_dir}/**/*.rb"].each do |file| 
+              load file
+            end
+          elsif File.file?(file_or_dir)
+            load file_or_dir
+          else
+            raise "File or directory not found: #{file_or_dir}"
+          end
+        end
+        $context_runner.run(exit)
+        $context_runner = old_context_runner
+      end
+    end
+  end
+end

data/lib/spec/runner/context_runner.rb

@@ -3,12 +3,10 @@ require File.dirname(__FILE__) + '/../../spec'
 module Spec
   module Runner
     class ContextRunner
-      attr_reader :standalone
       
-      def initialize(reporter, standalone, dry_run, single_spec=nil)
+      def initialize(reporter, dry_run, single_spec=nil)
         @contexts = []
         @reporter = reporter
-        @standalone = standalone
         @dry_run = dry_run
         @single_spec = single_spec
       end

data/lib/spec/runner/extensions/kernel.rb

@@ -1,14 +1,13 @@
 module Kernel
   def context(name, &block)
     context = Spec::Runner::Context.new(name, &block)
-    runner = context_runner
-    runner.add_context(context)
+    context_runner.add_context(context)
   end
   
 private
   
   def context_runner
-    if $context_runner.nil?; $context_runner = ::Spec::Runner::OptionParser.create_context_runner(ARGV.dup, true, STDERR, STDOUT); at_exit { $context_runner.run(false) }; end
+    if $context_runner.nil?; $context_runner = ::Spec::Runner::OptionParser.create_context_runner(ARGV.dup, STDERR, STDOUT, false); at_exit { $context_runner.run(false) }; end
     $context_runner
   end
 end

data/lib/spec/runner/formatter/base_text_formatter.rb

@@ -59,8 +59,13 @@ module Spec
         def dump_failure(counter, failure)
           @output.puts
           @output.puts "#{counter.to_s})"
-          @output.puts failure.header
-          @output.puts failure.exception.message
+          if(failure.expectation_not_met?)
+            @output.puts red(failure.header)
+            @output.puts red(failure.exception.message)
+          else
+            @output.puts magenta(failure.header)
+            @output.puts magenta(failure.exception.message)
+          end
           @output.puts failure.exception.backtrace.join("\n")
           STDOUT.flush
         end
@@ -88,6 +93,7 @@ module Spec
     
         def red(text); colour(text, "\e[31m"); end
         def green(text); colour(text, "\e[32m"); end
+        def magenta(text); colour(text, "\e[35m"); end
         
         def format_backtrace(backtrace)
           backtrace.nil? ? "" : backtrace.join("\n")

data/lib/spec/runner/formatter/html_formatter.rb

@@ -20,8 +20,8 @@ module Spec
             @output.puts "</div>"
           end
           @output.puts "<div class=\"context\">"
-          @output.puts "  <h2>#{name}</h2>"
           @output.puts "  <ul>"
+          @output.puts "  <li class=\"context_name\">#{name}</li>"
         end
 
         def start_dump
@@ -36,17 +36,17 @@ module Spec
         end
 
         def spec_passed(name)
-          @output.puts "<li class=\"spec passed\"><div class=\"name\">#{escape(@current_spec)}</div></li>"
+          @output.puts "    <li class=\"spec passed\"><div class=\"passed_spec_name\">#{escape(@current_spec)}</div></li>"
         end
 
         def spec_failed(name, counter, failure)
-          @output.puts "<li class=\"spec failed\">"
-          @output.puts "  <div class=\"name\">#{escape(@current_spec)}</div>"
-          @output.puts "  <div class=\"failure\" id=\"failure_#{counter}\">"
-          @output.puts "    <div class=\"message\"><pre>#{escape(failure.exception.message)}</pre></div>" unless failure.exception.nil?
-          @output.puts "    <div class=\"backtrace\"><pre>#{format_backtrace(failure.exception.backtrace)}</pre></div>" unless failure.exception.nil?
-          @output.puts "  </div>"
-          @output.puts "</li>"
+          @output.puts "    <li class=\"spec failed\">"
+          @output.puts "      <div class=\"failed_spec_name\">#{escape(@current_spec)}</div>"
+          @output.puts "      <div class=\"failure\" id=\"failure_#{counter}\">"
+          @output.puts "        <div class=\"message\"><pre>#{escape(failure.exception.message)}</pre></div>" unless failure.exception.nil?
+          @output.puts "        <div class=\"backtrace\"><pre>#{format_backtrace(failure.exception.backtrace)}</pre></div>" unless failure.exception.nil?
+          @output.puts "      </div>"
+          @output.puts "    </li>"
           STDOUT.flush
         end
         
@@ -58,8 +58,8 @@ module Spec
         end
 
         def dump_summary(duration, spec_count, failure_count)
-          @output.print "</body>"
-          @output.print "</html>"
+          @output.puts "</body>"
+          @output.puts "</html>"
           STDOUT.flush
         end
         
@@ -76,15 +76,11 @@ module Spec
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
   <style type="text/css">
   body {
-    font-size: 10pt;
-    font: "lucida grande";
+    font-size: 9pt;
+    font-family: verdana, arial, helvetica;
     width: 85%;
   }
 
-  h2 {
-    color: #589CCF;
-  }
-
   div.context {
     padding: 0px;
     background: #fff;
@@ -98,23 +94,36 @@ module Spec
   li { 
     list-style-type: none; 
     margin: 0;
-    border: 2px solid #fff;
+    border: 1px solid #fff;
+  }
+
+  li.context_name {
+    font-size: 1.3em;
+    font-weight: bold;
+    color: #589CCF;
+  }
+
+  div.passed_spec_name {
+    font-weight: bold;
+    color: #324F17;
+  }
+
+  div.failed_spec_name {
+    font-weight: bold;
+    color: #EEB4B4;
   }
 
   li.passed {
     display: block; 
-    background: #46A002; 
-    color: #fff; 
-    padding: 2px 4px; 
-    font-weight: bold
+    background: #659D32; 
+    padding: 1px 4px; 
   }
 
   li.failed {
     display: block; 
-    background: red; 
-    color: #fff; 
+    background: #CD0000; 
+    color: #000; 
     padding: 2px 4px; 
-    font-weight: bold
   }
 
   li.failed .failure {

data/lib/spec/runner/formatter/progress_bar_formatter.rb

@@ -8,7 +8,7 @@ module Spec
         end
       
         def spec_failed(name, counter, failure)
-          @output.print red('F')
+          @output.print failure.expectation_not_met? ? red('F') : magenta('F')
           STDOUT.flush
         end
 

data/lib/spec/runner/formatter/specdoc_formatter.rb

@@ -9,7 +9,7 @@ module Spec
         end
       
         def spec_failed(name, counter, failure)
-          @output.print red("- #{name} (FAILED - #{counter})\n")
+          @output.puts failure.expectation_not_met? ? red("- #{name} (FAILED - #{counter})") : magenta("- #{name} (ERROR - #{counter})")
           STDOUT.flush
         end
       

data/lib/spec/runner/option_parser.rb

@@ -5,8 +5,8 @@ module Spec
   module Runner
     class OptionParser
 
-      def self.create_context_runner(args, standalone, err, out=STDOUT)
-        options = parse(args, standalone, err, out)
+      def self.create_context_runner(args, err, out, warn_if_no_files)
+        options = parse(args, err, out, warn_if_no_files)
 
         formatter = options.formatter_type.new(options.out, options.dry_run, options.colour)
         reporter = Reporter.new(formatter, options.backtrace_tweaker) 
@@ -17,10 +17,10 @@ module Spec
           Spec::Expectations::Should::Base.differ = options.differ_class.new(options.diff_format, options.context_lines, options.colour)
         end
 
-        ContextRunner.new(reporter, standalone, options.dry_run, options.spec_name)
+        ContextRunner.new(reporter, options.dry_run, options.spec_name)
       end
 
-      def self.parse(args, standalone, err, out)
+      def self.parse(args, err, out, warn_if_no_files)
         options = OpenStruct.new
         options.out = out == STDOUT ? Kernel : out
         options.formatter_type = Formatter::ProgressBarFormatter
@@ -120,9 +120,9 @@ module Spec
         end
         opts.parse!(args)
 
-        if args.empty?
-          err.puts opts unless standalone
-          exit if err == $stderr unless standalone
+        if args.empty? && warn_if_no_files
+          err.puts opts
+          exit if err == $stderr
         end
 
         options

data/lib/spec/runner/reporter.rb

@@ -83,7 +83,15 @@ module Spec
         end
 
         def header
-          "#{@exception.class.name} in '#{@context_name} #{@spec_name}'"
+          if expectation_not_met?
+            "'#{@context_name} #{@spec_name}' FAILED"
+          else
+            "#{@exception.class.name} in '#{@context_name} #{@spec_name}'"
+          end
+        end
+        
+        def expectation_not_met?
+          @exception.is_a?(Spec::Expectations::ExpectationNotMetError)
         end
 
       end

data/lib/spec/version.rb

@@ -3,9 +3,9 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 7
-      TINY   = 0
-      # RANDOM_TOKEN: 0.846310547367564
-      REV    = "$LastChangedRevision: 1039 $".match(/LastChangedRevision: (\d+)/)[1]
+      TINY   = 1
+      # RANDOM_TOKEN: 0.75692472177863
+      REV    = "$LastChangedRevision: 1080 $".match(/LastChangedRevision: (\d+)/)[1]
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       FULL_VERSION = "#{STRING} (r#{REV})"

data/vendor/selenium/start_browser_once.patch

@@ -0,0 +1,65 @@
+Index: find_rspecs_home_page.rb
+===================================================================
+--- find_rspecs_home_page.rb	(revision 767)
++++ find_rspecs_home_page.rb	(working copy)
+@@ -2,22 +2,18 @@
+ 
+ context "Google's search page" do
+ 
+-  setup do
+-    @browser = Selenium::SeleneseInterpreter.new("localhost", 4444, "*firefox", "http://www.google.no", 10000)
+-    @browser.start
+-    @browser.open('http://www.google.no')
+-  end
+-
+   specify "should find rspec's home page when I search for rspec" do
+-    @browser.type "name=q", "rspec"
+-    @browser.click_and_wait "name=btnG"
+-    @browser.is_text_present("rspec.rubyforge.org").should_be(true)
++    browser.open('http://www.google.no')
++    browser.type "name=q", "rspec"
++    browser.click_and_wait "name=btnG"
++    browser.is_text_present("rspec.rubyforge.org").should_be(true)
+   end
+ 
+   specify "should not find Ali G when I search for rspec" do
+-    @browser.type "name=q", "rspec"
+-    @browser.click_and_wait "name=btnG"
+-    @browser.is_text_present("Ali G").should_be(false)
++    browser.open('http://www.google.no')
++    browser.type "name=q", "rspec"
++    browser.click_and_wait "name=btnG"
++    browser.is_text_present("Ali G").should_be(false)
+   end
+ 
+ end
+
+Index: rspec_selenium.rb
+===================================================================
+--- rspec_selenium.rb	(revision 767)
++++ rspec_selenium.rb	(working copy)
+@@ -3,10 +3,22 @@
+ require File.dirname(__FILE__) + '/selenium'
+ 
+ class RSpecSelenium
+-  def teardown
+-    @browser.stop
++  def setup
++    unless defined?@@browser
++      @@browser = Selenium::SeleneseInterpreter.new("localhost", 4444, "*firefox", "http://www.google.no", 10000)
++      @@browser.start
++    end
+   end
++
++  def browser
++    @@browser
++  end
++
++  def self.shutdown
++    @@browser.stop
++  end
+ end
++at_exit{RSpecSelenium.shutdown}
+ 
+ module Spec
+   module Runner

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.9.0
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
-date: 2006-11-05
-summary: RSpec-0.7.0 (r1039) - BDD for Ruby http://rspec.rubyforge.org/
+  version: 0.7.1
+date: 2006-11-10 00:00:00 -06:00
+summary: RSpec-0.7.1 (r1080) - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
 email: rspec-devel@rubyforge.org
@@ -23,6 +23,9 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
       version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
 authors: 
 - - Steven Baker
   - Aslak Hellesoy
@@ -36,7 +39,6 @@ files:
 - Rakefile
 - README
 - lib/spec.rb
-- lib/spec/callback.rb
 - lib/spec/expectations.rb
 - lib/spec/mocks.rb
 - lib/spec/runner.rb
@@ -67,6 +69,7 @@ files:
 - lib/spec/rake/spectask.rb
 - lib/spec/rake/verify_rcov.rb
 - lib/spec/runner/backtrace_tweaker.rb
+- lib/spec/runner/command_line.rb
 - lib/spec/runner/context.rb
 - lib/spec/runner/context_eval.rb
 - lib/spec/runner/context_runner.rb
@@ -103,6 +106,7 @@ files:
 - vendor/watir/README.txt
 - vendor/selenium/find_rspecs_home_page.rb
 - vendor/selenium/rspec_selenium.rb
+- vendor/selenium/start_browser_once.patch
 - vendor/selenium/README.txt
 test_files: []