rspec 1.0.2 → 1.0.3

data/CHANGES

@@ -1,4 +1,13 @@
-= RSpec Changelog
+== Version 1.0.3
+Bug fixes.
+
+* Fixed [#11104] Website uses old specify notation
+* Applied [#11101] StringHelpers.starts_with?(prefix) assumes a string parameter for _prefix_
+* Removed 'rescue nil' which was hiding errors in controller examples.
+* Fixed [#11075] controller specs fail when using mocha without integrated_views
+* Fixed problem with redirect_to failing incorrectly against edge rails.
+* Fixed [#11082] RspecResourceGenerator should be RspecScaffoldGenerator
+* Fixed [#10959] Focused Examples do not work for Behaviour defined with constant with modules
 
 == Version 1.0.2
 This is just to align the version numbers in rspec and rspec_on_rails.
@@ -38,6 +47,7 @@ backwards compatibility changes in the API are expected after this release.
 * Fixed [#10747] Helper methods defined in shared specs are not visible when shared spec is used
 * Fixed [#10748] Shared descriptions in separate files causes 'already exists' error
 * Applied [#10698] Running with --drb executes specs twice (patch from Ruy Asan)
+* Fixed [#10871] 0.9.4 - Focussed spec runner fails to run specs in descriptions with type and string when there is no leading space in the string
 
 == Version 0.9.4
 This release introduces massive improvements to Spec::Ui - the user interface functional testing

data/EXAMPLES.rd

@@ -103,6 +103,6 @@
 # * RSpec should be able to access TestCase methods
 # * RSpec should be able to accept included modules
 
-Finished in 0.026261 seconds
+Finished in 0.024365 seconds
 
 77 examples, 0 failures, 2 not implemented

data/Rakefile

@@ -156,10 +156,19 @@ desc "Creates a tag in svn"
 task :tag do
   from = `svn info #{File.dirname(__FILE__)}`.match(/URL: (.*)\/rspec/n)[1]
   to = from.gsub(/trunk/, "tags/#{Spec::VERSION::TAG}")
+  current = from.gsub(/trunk/, "tags/CURRENT")
   tag_cmd = "svn cp #{from} #{to} -m \"Tag release #{Spec::VERSION::FULL_VERSION}\""
+  remove_current_cmd = "svn rm #{current}"
+  commit_current_cmd = "svn ci #{current} -m \"Remove tags/CURRENT\""
+  create_current_cmd = "svn cp #{to} #{current} -m \"Copy #{Spec::VERSION::TAG} to tags/CURRENT\""
   raise "Can't tag to the same place: #{tag_cmd}" if to == from
   puts "Creating tag in SVN"
   `#{tag_cmd}`
+  puts "Removing CURRENT"
+  `#{remove_current_cmd}`
+  `#{commit_current_cmd}`
+  puts "Re-Creating CURRENT"
+  `#{create_current_cmd}`
   raise "Tagging failed" unless $? == 0
 end
 

data/lib/spec/dsl/behaviour_callbacks.rb

@@ -1,5 +1,6 @@
 module Spec
   module DSL
+    # See http://rspec.rubyforge.org/documentation/before_and_after.html
     module BehaviourCallbacks
       def prepend_before(*args, &block)
         scope, options = scope_and_options(*args)

data/lib/spec/dsl/behaviour_eval.rb

@@ -7,12 +7,38 @@ module Spec
         attr_writer :behaviour
         attr_accessor :description
 
+        # RSpec runs every example in a new instance of Object, mixing in
+        # the behaviour necessary to run examples. Because this behaviour gets
+        # mixed in, it can get mixed in to an instance of any class at all.
+        #
+        # This is something that you would hardly ever use, but there is one
+        # common use case for it - inheriting from Test::Unit::TestCase. RSpec's
+        # Rails plugin uses this feature to provide access to all of the features
+        # that are available for Test::Unit within RSpec examples.
         def inherit(klass)
           raise ArgumentError.new("Shared behaviours cannot inherit from classes") if @behaviour.shared?
           @behaviour_superclass = klass
           derive_execution_context_class_from_behaviour_superclass
         end
 
+        # You can pass this one or many modules. Each module will subsequently
+        # be included in the each object in which an example is run. Use this
+        # to provide global helper methods to your examples.
+        #
+        # == Example
+        #
+        #   module HelperMethods
+        #     def helper_method
+        #       ...
+        #     end
+        #   end
+        #
+        #   describe Thing do
+        #     include HelperMethods
+        #     it "should do stuff" do
+        #       helper_method
+        #     end
+        #   end
         def include(*mods)
           mods.each do |mod|
             included_modules << mod
@@ -20,6 +46,8 @@ module Spec
           end
         end
 
+        # Use this to pull in examples from shared behaviours.
+        # See Spec::Runner for information about shared behaviours.
         def it_should_behave_like(behaviour_description)
           behaviour = @behaviour.class.find_shared_behaviour(behaviour_description)
           if behaviour.nil?
@@ -28,7 +56,7 @@ module Spec
           behaviour.copy_to(self)
         end
 
-        def copy_to(eval_module)
+        def copy_to(eval_module) # :nodoc:
           examples.each          { |e| eval_module.examples << e; }
           before_each_parts.each { |p| eval_module.before_each_parts << p }
           after_each_parts.each  { |p| eval_module.after_each_parts << p }
@@ -39,10 +67,12 @@ module Spec
         end
         
         # :call-seq:
-        #   predicate_matchers[method_on_object] = matcher_name
+        #   predicate_matchers[matcher_name] = method_on_object
+        #   predicate_matchers[matcher_name] = [method1_on_object, method2_on_object]
         #
         # Dynamically generates a custom matcher that will match
-        # a predicate on your class.
+        # a predicate on your class. RSpec uses this itself to allow you
+        # to say File.should exist("path/to/file").
         #
         # == Example
         #
@@ -75,15 +105,18 @@ module Spec
           end
         end
         
+        # Creates an instance of Spec::DSL::Example and adds
+        # it to a collection of examples of the current behaviour.
         def it(description=:__generate_description, opts={}, &block)
           examples << Example.new(description, opts, &block)
         end
         
+        # Alias for it.
         def specify(description, opts={}, &block)
           it(description, opts, &block)
         end
 
-        def methods
+        def methods # :nodoc:
           my_methods = super
           my_methods |= behaviour_superclass.methods
           my_methods

data/lib/spec/dsl/example_matcher.rb

@@ -3,21 +3,33 @@ module Spec
     class ExampleMatcher
 
       attr_writer :example_desc
-      def initialize(context_desc, example_desc=nil)
-        @context_desc = context_desc
+      def initialize(behaviour_desc, example_desc=nil)
+        @behaviour_desc = behaviour_desc
         @example_desc = example_desc
       end
       
       def matches?(specified_examples)
         specified_examples.each do |specified_example|
-          return true if specified_example =~ /(^#{context_regexp} #{example_regexp}$|^#{context_regexp}$|^#{example_regexp}$)/
+          return true if matches_literal_example?(specified_example) || matches_example_not_considering_modules?(specified_example)
         end
         false
       end
       
       private
+        def matches_literal_example?(specified_example)
+          specified_example =~ /(^#{context_regexp} #{example_regexp}$|^#{context_regexp}$|^#{example_regexp}$)/
+        end
+
+        def matches_example_not_considering_modules?(specified_example)
+          specified_example =~ /(^#{context_regexp_not_considering_modules} #{example_regexp}$|^#{context_regexp_not_considering_modules}$|^#{example_regexp}$)/
+        end
+
         def context_regexp
-          Regexp.escape(@context_desc.split('::').last)
+          Regexp.escape(@behaviour_desc)
+        end
+
+        def context_regexp_not_considering_modules
+          Regexp.escape(@behaviour_desc.split('::').last)
         end
         
         def example_regexp

data/lib/spec/expectations/extensions/string_and_symbol.rb

@@ -2,7 +2,7 @@ module Spec
   module Expectations
     module StringHelpers
       def starts_with?(prefix)
-        to_s[0..(prefix.length - 1)] == prefix
+        to_s[0..(prefix.to_s.length - 1)] == prefix.to_s
       end
     end
   end

data/lib/spec/runner/behaviour_runner.rb

@@ -8,7 +8,7 @@ module Spec
       end
     
       def add_behaviour(behaviour)
-        unless specified_examples.nil? || specified_examples.empty? #|| behaviour.matches?(specified_examples)
+        if !specified_examples.nil? && !specified_examples.empty? #&& behaviour.matches?(specified_examples)
           behaviour.retain_examples_matching!(specified_examples) #if behaviour.matches?(specified_examples)
         end
         @behaviours << behaviour if behaviour.number_of_examples != 0 && !behaviour.shared?

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

@@ -133,7 +133,7 @@ module Spec
   <meta http-equiv="Pragma" content="no-cache" />
   <style type="text/css">
   body {
-    margin: 0; 
+    margin: 0;
     padding: 0;
     background: #fff;
     font-size: 80%;
@@ -176,21 +176,21 @@ function moveProgressBar(percentDone) {
 }
 function makeRed(element_id) {
   document.getElementById(element_id).style.background = '#C40D0D';
-    document.getElementById(element_id).style.color = '#FFFFFF'; 
+  document.getElementById(element_id).style.color = '#FFFFFF';
+}
+
+function makeYellow(element_id) {
+  if (element_id == "rspec-header" && document.getElementById(element_id).style.background != '#C40D0D')
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
   }
-    
-  function makeYellow(element_id) {
-    if (element_id == "rspec-header" && document.getElementById(element_id).style.background != '#C40D0D')
-    {
-      document.getElementById(element_id).style.background = '#FAF834';
-      document.getElementById(element_id).style.color = '#000000'; 
-    }
-    else
-    {
-      document.getElementById(element_id).style.background = '#FAF834';
-      document.getElementById(element_id).style.color = '#000000';
-    }
+  else
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
   }
+}
 EOF
         end
         

data/lib/spec/version.rb

@@ -3,11 +3,11 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 1
       MINOR  = 0
-      TINY   = 2
+      TINY   = 3
       RELEASE_CANDIDATE = nil
-      
-      # RANDOM_TOKEN: 0.378125753552199
-      REV = "$LastChangedRevision: 2008 $".match(/LastChangedRevision: (\d+)/)[1]
+
+      # RANDOM_TOKEN: 0.135908585165873
+      REV = "$LastChangedRevision: 2035 $".match(/LastChangedRevision: (\d+)/)[1]
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')

data/spec/spec/runner/behaviour_runner_spec.rb

@@ -2,6 +2,94 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Runner
+    describe BehaviourRunner, "#add_behaviour affecting passed in behaviour" do
+      before do
+        @options = Options.new
+        @runner = BehaviourRunner.new(@options)
+        class << @runner
+          attr_reader :behaviours
+        end
+
+        @behaviour = ::Spec::DSL::Behaviour.new("A Behaviour") do
+          it "runs 1" do
+          end
+          it "runs 2" do
+          end
+        end
+      end
+      
+      it "removes examples not selected from Behaviour when options.examples is set" do
+        @options.examples << "A Behaviour runs 1"
+
+        @behaviour.number_of_examples.should == 2
+
+        @runner.add_behaviour @behaviour
+        @behaviour.number_of_examples.should == 1
+        @behaviour.examples.first.send(:description).should == "runs 1"
+      end
+
+      it "keeps all examples when options.examples is nil" do
+        @options.examples = nil
+        @behaviour.number_of_examples.should == 2
+
+        @runner.add_behaviour @behaviour
+        @behaviour.number_of_examples.should == 2
+        @behaviour.examples.collect {|example| example.send(:description) }.should == ['runs 1', 'runs 2']
+      end
+
+      it "keeps all examples when options.examples is empty" do
+        @options.examples = []
+        @behaviour.number_of_examples.should == 2
+
+        @runner.add_behaviour @behaviour
+        @behaviour.number_of_examples.should == 2
+        @behaviour.examples.collect {|example| example.send(:description) }.should == ['runs 1', 'runs 2']
+      end
+    end
+
+    describe BehaviourRunner, "#add_behaviour affecting behaviours" do
+      before do
+        @options = Options.new
+        @runner = BehaviourRunner.new(@options)
+        class << @runner
+          attr_reader :behaviours
+        end
+      end
+
+      it "adds behaviour when behaviour has examples and is not shared" do
+        @behaviour = ::Spec::DSL::Behaviour.new("A Behaviour") do
+          it "uses this behaviour" do
+          end
+        end
+
+        @behaviour.should_not be_shared
+        @behaviour.number_of_examples.should be > 0
+        @runner.add_behaviour @behaviour
+
+        @runner.behaviours.length.should == 1
+      end
+
+      it "does not add the behaviour when number_of_examples is 0" do
+        @behaviour = ::Spec::DSL::Behaviour.new("A Behaviour") do
+        end
+        @behaviour.number_of_examples.should == 0
+        @runner.add_behaviour @behaviour
+
+        @runner.behaviours.should be_empty
+      end
+
+      it "does not add the behaviour when behaviour is shared" do
+        @behaviour = ::Spec::DSL::Behaviour.new("A Behaviour", :shared => true) do
+          it "does not use this behaviour" do
+          end
+        end
+        @behaviour.should be_shared
+        @runner.add_behaviour @behaviour
+
+        @runner.behaviours.should be_empty
+      end
+    end
+
     describe BehaviourRunner do
 
       it "should only run behaviours with at least one example" do

data/spec/spec/runner/{spec_matcher_spec.rb → example_matcher_spec.rb}

@@ -69,14 +69,14 @@ module Spec
       #   matcher.should match_description("with ([#]) an example")
       #   matcher.should match_description("a context with ([#]) an example")
       # end
-      # 
+      #
       # it "should match with regexp reserved (characters) in the context" do
       #   matcher=ExampleMatcher.new("with an example", "a ([#]) context")
       #   matcher.should match_description("a ([#]) context with an example")
       #   matcher.should match_description("a ([#]) context with an example")
       #   matcher.should match_description("a ([#]) context with an example")
       # end
-      
+
       # it "should not match wrong example only" do
       #   matcher=ExampleMatcher.new("with another example", "a context")
       #   matcher.should_not match_description("with an example")
@@ -98,5 +98,30 @@ module Spec
       # end
       
     end
+
+    describe ExampleMatcher, "normal case" do
+      it "matches when passed in example matches" do
+        @matcher = ExampleMatcher.new("Foo", "bar")
+        @matcher.matches?(["no match", "Foo bar"]).should == true
+      end
+
+      it "does not match when no passed in examples match" do
+        @matcher = ExampleMatcher.new("Foo", "bar")
+        @matcher.matches?(["no match1", "no match2"]).should == false
+      end
+    end
+
+    describe ExampleMatcher, "where description has '::' in it" do
+      it "matches when passed in example matches" do
+        @matcher = ExampleMatcher.new("Foo::Bar", "baz")
+        @matcher.matches?(["no match", "Foo::Bar baz"]).should == true
+      end
+
+      it "does not match when no passed in examples match" do
+        @matcher = ExampleMatcher.new("Foo::Bar", "baz")
+        @matcher.matches?(["no match1", "no match2"]).should == false
+      end
+    end
+
   end
 end

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
-date: 2007-05-23 00:00:00 -05:00
-summary: RSpec-1.0.2 (r2008) - BDD for Ruby http://rspec.rubyforge.org/
+  version: 1.0.3
+date: 2007-05-25 00:00:00 -05:00
+summary: RSpec-1.0.3 (r2035) - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
 email: rspec-devel@rubyforge.org
@@ -176,6 +176,7 @@ files:
 - spec/spec/runner/command_line_spec.rb
 - spec/spec/runner/context_matching_spec.rb
 - spec/spec/runner/drb_command_line_spec.rb
+- spec/spec/runner/example_matcher_spec.rb
 - spec/spec/runner/execution_context_spec.rb
 - spec/spec/runner/extensions/kernel_spec.rb
 - spec/spec/runner/formatter/failing_behaviours_formatter_spec.rb
@@ -197,7 +198,6 @@ files:
 - spec/spec/runner/options_spec.rb
 - spec/spec/runner/quiet_backtrace_tweaker_spec.rb
 - spec/spec/runner/reporter_spec.rb
-- spec/spec/runner/spec_matcher_spec.rb
 - spec/spec/runner/spec_parser_spec.rb
 - spec/spec/spec_classes.rb
 - spec/spec/translator_spec.rb