typo 5.0.2 → 5.0.3.98

data/vendor/plugins/rspec/spec/spec/story/world_spec.rb

@@ -298,12 +298,18 @@ module Spec
         World.add_listener(mock_listener2)
 
         # expect
+        mock_listener1.should_receive(:step_upcoming).with(:given, 'a context')
         mock_listener1.should_receive(:step_succeeded).with(:given, 'a context')
+        mock_listener1.should_receive(:step_upcoming).with(:when, 'an event')
         mock_listener1.should_receive(:step_succeeded).with(:when, 'an event')
+        mock_listener1.should_receive(:step_upcoming).with(:then, 'an outcome')
         mock_listener1.should_receive(:step_succeeded).with(:then, 'an outcome')
 
+        mock_listener2.should_receive(:step_upcoming).with(:given, 'a context')
         mock_listener2.should_receive(:step_succeeded).with(:given, 'a context')
+        mock_listener2.should_receive(:step_upcoming).with(:when, 'an event')
         mock_listener2.should_receive(:step_succeeded).with(:when, 'an event')
+        mock_listener2.should_receive(:step_upcoming).with(:then, 'an outcome')
         mock_listener2.should_receive(:step_succeeded).with(:then, 'an outcome')
 
         # when
@@ -325,6 +331,7 @@ module Spec
         world = World.create
 
         # expect
+        mock_listener.should_receive(:step_upcoming).with(:given, 'a context')
         mock_listener.should_receive(:step_succeeded).with(:given, 'a context')
 
         # when

data/vendor/plugins/rspec/stories/example_groups/autogenerated_docstrings

@@ -4,7 +4,7 @@ Story: autogenerated docstrings
   I want examples to generate their own names
   So that I can reduce duplication between example names and example code
 
-  Scenario: run with ruby
+  Scenario: run passing examples with ruby
     Given the file ../../examples/pure/autogenerated_docstrings_example.rb
 
     When I run it with the ruby interpreter -fs
@@ -14,13 +14,32 @@ Story: autogenerated docstrings
     And the stdout should match /should include "a"/
     And the stdout should match /should respond to #size/
 
-    Scenario: run with spec
-      Given the file ../../examples/pure/autogenerated_docstrings_example.rb
+  Scenario: run failing examples with ruby
+    Given the file ../../failing_examples/failing_autogenerated_docstrings_example.rb
 
-      When I run it with the spec script -fs
+    When I run it with the ruby interpreter -fs
+
+    Then the stdout should match /should equal 2/
+    And the stdout should match /should be > 5/
+    And the stdout should match /should include "b"/
+    And the stdout should match /should not respond to #size/
+
+  Scenario: run passing examples with spec
+    Given the file ../../examples/pure/autogenerated_docstrings_example.rb
+
+    When I run it with the spec script -fs
+
+    Then the stdout should match /should equal 5/
+    And the stdout should match /should be < 5/
+    And the stdout should match /should include "a"/
+    And the stdout should match /should respond to #size/
+
+  Scenario: run failing examples with spec
+    Given the file ../../failing_examples/failing_autogenerated_docstrings_example.rb
 
-      Then the stdout should match /should equal 5/
-      And the stdout should match /should be < 5/
-      And the stdout should match /should include "a"/
-      And the stdout should match /should respond to #size/
+    When I run it with the spec script -fs
 
+    Then the stdout should match /should equal 2/
+    And the stdout should match /should be > 5/
+    And the stdout should match /should include "b"/
+    And the stdout should match /should not respond to #size/

data/vendor/plugins/rspec/stories/example_groups/output

@@ -18,3 +18,8 @@ Story: Getting correct output
     And the stdout should not match "Loaded suite"
     And the stdout should not match /\d+ tests, \d+ assertions, \d+ failures, \d+ errors/m
     And the stdout should match "1 example, 0 failures"
+
+  Scenario: Tweak backtrace
+    Given the file stories/failing_story.rb
+    When I run it with the ruby interpreter
+    Then the stdout should not match /\/lib\/spec\//

data/vendor/plugins/rspec/stories/interop/test_case_with_should_methods

@@ -7,7 +7,7 @@ Story: Test::Unit::TestCase extended by rspec with should methods
   Scenario: Run with ruby
     Given the file test/test_case_with_should_methods.rb
     When I run it with the ruby interpreter
-    Then PENDING the exit code should be 256
+    Then the exit code should be 256
     And the stdout should match "5 examples, 3 failures"
 
   Scenario: Run with spec

data/vendor/plugins/rspec/stories/resources/stories/failing_story.rb

@@ -0,0 +1,15 @@
+$:.push File.join(File.dirname(__FILE__), *%w[.. .. .. lib])
+
+require 'spec/story'
+
+Story "Failing story",
+%(As an RSpec user
+  I want a failing test
+  So that I can observe the output) do
+
+  Scenario "Failing scenario" do
+    Then "true should be false" do
+      true.should == false
+    end
+  end
+end

data/vendor/plugins/rspec_on_rails/generators/rspec/templates/spec.opts

@@ -4,4 +4,3 @@ progress
 --loadby
 mtime
 --reverse
---backtrace

data/vendor/plugins/rspec_on_rails/generators/rspec_controller/rspec_controller_generator.rb

@@ -1,5 +1,4 @@
 require 'rails_generator/generators/components/controller/controller_generator'
-require File.join(File.dirname(__FILE__), *%w[.. helpers rails_identifier])
 
 class RspecControllerGenerator < ControllerGenerator
 
@@ -16,7 +15,7 @@ class RspecControllerGenerator < ControllerGenerator
       m.directory File.join('spec/helpers', class_path)
       m.directory File.join('spec/views', class_path, file_name)
 
-			if RailsIdentifier.using_legacy_templates?
+			if Rails::VERSION::STRING < "2.0.0"
         @default_file_extension = "rhtml"
       else
         @default_file_extension = "html.erb"

data/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/rspec_scaffold_generator.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), *%w[.. helpers rails_identifier])
-
 class RspecScaffoldGenerator < Rails::Generator::NamedBase
   default_options :skip_migration => false
   
@@ -30,7 +28,7 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase
       @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}"
     end
     
-    if RailsIdentifier.using_legacy_templates?
+    if Rails::VERSION::STRING < "2.0.0"
       @resource_generator = "scaffold_resource"
       @default_file_extension = "rhtml"
 		else

data/vendor/plugins/rspec_on_rails/lib/autotest/discover.rb

@@ -0,0 +1 @@
+# This needs to be here for >= ZenTest-3.9.0 to add this directory to the load path.

data/vendor/plugins/rspec_on_rails/lib/autotest/rails_rspec.rb

@@ -25,55 +25,55 @@ $:.push(*Dir["vendor/rails/*/lib"])
 require 'active_support'
 require 'autotest/rspec'
 
-class Autotest::RailsRspec < Autotest::Rspec
-
-  def initialize # :nodoc:
-    super
-    @exceptions = %r%^\./(?:coverage|db|doc|log|public|script|vendor\/rails|previous_failures.txt)%
-    @test_mappings = {
-      %r%^(test|spec)/fixtures/(.*).yml$% => proc { |_, m|
-        ["spec/models/#{m[2].singularize}_spec.rb"] + files_matching(%r%^spec\/views\/#{m[2]}/.*_spec\.rb$%)
-      },
-      %r%^spec/(models|controllers|views|helpers|lib)/.*rb$% => proc { |filename, _|
-        filename
-      },
-      %r%^app/models/(.*)\.rb$% => proc { |_, m|
-        ["spec/models/#{m[1]}_spec.rb"]
-      },
-      %r%^app/views/(.*)$% => proc { |_, m|
-        files_matching %r%^spec/views/#{m[1]}_spec.rb$%
-      },
-      %r%^app/controllers/(.*)\.rb$% => proc { |_, m|
-        ["spec/controllers/#{m[1]}_spec.rb"]
-      },
-      %r%^app/helpers/(.*)_helper\.rb$% => proc { |_, m|
-        if m[1] == "application" then
-          files_matching(%r%^spec/(views|helpers)/.*_spec\.rb$%)
-        else
-          ["spec/helpers/#{m[1]}_helper_spec.rb"] + files_matching(%r%^spec\/views\/#{m[1]}/.*_spec\.rb$%)
-        end
-      },
-      %r%^app/helpers/application_helper\.rb$% => proc {
-        files_matching %r%^spec/(views|helpers)/.*_spec\.rb$%
-      },
-      %r%^app/controllers/application\.rb$% => proc { |_, m|
-        files_matching %r%^spec/controllers/.*_spec\.rb$%
-      },
-      %r%^config/routes\.rb$% => proc {
-        files_matching %r%^spec/(controllers|views|helpers)/.*_spec\.rb$%
-      },
-      %r%^config/database\.yml$% => proc { |_, m|
-        files_matching %r%^spec/models/.*_spec\.rb$%
-      },
-      %r%^(spec/(spec_helper|shared/.*)|config/(boot|environment(s/test)?))\.rb$% => proc {
-        files_matching %r%^spec/(models|controllers|views|helpers)/.*_spec\.rb$%
-      },
-      %r%^lib/(.*)\.rb$% => proc { |_, m|
-        ["spec/lib/#{m[1]}_spec.rb"]
-      },
-    }    
+Autotest.add_hook :initialize do |at|
+  %w{^config/ ^coverage/ ^db/ ^doc/ ^log/ ^public/ ^script ^vendor/rails ^vendor/plugins previous_failures.txt}.each do |exception|
+    at.add_exception(exception)
   end
   
+  at.clear_mappings
+  
+  at.add_mapping(%r%^(test|spec)/fixtures/(.*).yml$%) { |_, m|
+    ["spec/models/#{m[2].singularize}_spec.rb"] + at.files_matching(%r%^spec\/views\/#{m[2]}/.*_spec\.rb$%)
+  }
+  at.add_mapping(%r%^spec/(models|controllers|views|helpers|lib)/.*rb$%) { |filename, _|
+    filename
+  }
+  at.add_mapping(%r%^app/models/(.*)\.rb$%) { |_, m|
+    ["spec/models/#{m[1]}_spec.rb"]
+  }
+  at.add_mapping(%r%^app/views/(.*)$%) { |_, m|
+    at.files_matching %r%^spec/views/#{m[1]}_spec.rb$%
+  }
+  at.add_mapping(%r%^app/controllers/(.*)\.rb$%) { |_, m|
+    if m[1] == "application"
+      at.files_matching %r%^spec/controllers/.*_spec\.rb$%
+    else
+      ["spec/controllers/#{m[1]}_spec.rb"]
+    end
+  }
+  at.add_mapping(%r%^app/helpers/(.*)_helper\.rb$%) { |_, m|
+    if m[1] == "application" then
+      at.files_matching(%r%^spec/(views|helpers)/.*_spec\.rb$%)
+    else
+      ["spec/helpers/#{m[1]}_helper_spec.rb"] + at.files_matching(%r%^spec\/views\/#{m[1]}/.*_spec\.rb$%)
+    end
+  }
+  at.add_mapping(%r%^config/routes\.rb$%) {
+    at.files_matching %r%^spec/(controllers|views|helpers)/.*_spec\.rb$%
+  }
+  at.add_mapping(%r%^config/database\.yml$%) { |_, m|
+    at.files_matching %r%^spec/models/.*_spec\.rb$%
+  }
+  at.add_mapping(%r%^(spec/(spec_helper|shared/.*)|config/(boot|environment(s/test)?))\.rb$%) {
+    at.files_matching %r%^spec/(models|controllers|views|helpers)/.*_spec\.rb$%
+  }
+  at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m|
+    ["spec/lib/#{m[1]}_spec.rb"]
+  }
+end
+
+class Autotest::RailsRspec < Autotest::Rspec
+
   def spec_command
     "script/spec"
   end

data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/controller_example_group.rb

@@ -181,16 +181,26 @@ module Spec
               end
             end
 
-            if expect_render_mock_proxy.send(:__mock_proxy).send(:find_matching_expectation, :render, options)
-              expect_render_mock_proxy.render(options)
+            if matching_message_expectation_exists(options)
+              expect_render_mock_proxy.render(options, &block)
               @performed_render = true
             else
-              unless expect_render_mock_proxy.send(:__mock_proxy).send(:find_matching_method_stub, :render, options)
+              unless matching_stub_exists(options)
                 super(options, deprecated_status, &block)
               end
             end
           end
-
+          
+          private
+            def matching_message_expectation_exists(options)
+              expect_render_mock_proxy.send(:__mock_proxy).send(:find_matching_expectation, :render, options)
+            end
+          
+            def matching_stub_exists(options)
+              expect_render_mock_proxy.send(:__mock_proxy).send(:find_matching_method_stub, :render, options)
+            end
+          
+          public
           if self.respond_to?(:should_receive) && self.respond_to?(:stub!)
             self.send :alias_method, :orig_should_receive, :should_receive
             self.send :alias_method, :orig_stub!, :stub!

data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/functional_example_group.rb

@@ -31,8 +31,8 @@ module Spec
         # :call-seq:
         #   assigns()
         #
-        # Hash of instance variables to values that are made available to views.
-        # == Examples
+        # Hash of instance variables to values that are made available to
+        # views. == Examples
         #
         #   #in thing_controller.rb
         #   def new
@@ -43,8 +43,8 @@ module Spec
         #   get 'new'
         #   assigns[:registration].should == Thing.new
         #--
-        # NOTE - Even though docs say only use assigns[:key] format, but allowing assigns(:key)
-        # in order to avoid breaking old specs.
+        # NOTE - Even though docs only use assigns[:key] format, this supports
+        # assigns(:key) in order to avoid breaking old specs.
         #++
         def assigns(key = nil)
           if key.nil?

data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/helper_example_group.rb

@@ -38,7 +38,6 @@ module Spec
         ActionView::Base.included_modules.reverse.each do |mod|
           include mod if mod.parents.include?(ActionView::Helpers)
         end
-        ActionController::Routing::Routes.named_routes.install(self)
 
         before(:all) do
           @controller_class_name = 'Spec::Rails::Example::HelperBehaviourController'

data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/rails_example_group.rb

@@ -6,6 +6,14 @@ module Spec
   module Rails
     module Example
       class RailsExampleGroup < Test::Unit::TestCase
+        # Rails >= r8570 uses setup/teardown_fixtures explicitly
+        before(:each) do
+          setup_fixtures if self.respond_to?(:setup_fixtures)
+        end
+        after(:each) do
+          teardown_fixtures if self.respond_to?(:teardown_fixtures)
+        end
+        
         include Spec::Rails::Matchers
 
         @@model_id = 1000

data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/view_example_group.rb

@@ -28,6 +28,10 @@ module Spec
           ensure_that_flash_and_session_work_properly
         end
 
+        after(:each) do
+          ensure_that_base_view_path_is_not_set_across_example_groups
+        end
+
         def initialize(defined_description, &implementation) #:nodoc:
           super
           @controller_class_name = "Spec::Rails::Example::ViewExampleGroupController"
@@ -40,11 +44,6 @@ module Spec
           @controller.class.send :public, :flash
         end
 
-        def teardown #:nodoc:
-          super
-          ensure_that_base_view_path_is_not_set_across_example_groups
-        end
-
         def ensure_that_base_view_path_is_not_set_across_example_groups #:nodoc:
           ActionView::Base.base_view_path = nil
         end

data/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/have_text.rb

@@ -8,8 +8,8 @@ module Spec
           @expected = expected
         end
 
-        def matches?(response)
-          @actual = response.body
+        def matches?(response_or_text)
+          @actual = response_or_text.respond_to?(:body) ? response_or_text.body : response_or_text
           return actual =~ expected if Regexp === expected
           return actual == expected unless Regexp === expected
         end

data/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/render_template.rb

@@ -18,6 +18,10 @@ module Spec
           "expected #{@expected.inspect}, got #{@actual.inspect}"
         end
         
+        def negative_failure_message
+          "expected not to render #{@expected.inspect}, but did"
+        end
+        
         def description
           "render template #{@expected.inspect}"
         end

data/vendor/plugins/rspec_on_rails/lib/spec/rails/version.rb

@@ -1,23 +1,23 @@
-module Spec
-  module Rails
-    module VERSION #:nodoc:
-      BUILD_TIME_UTC = 20071217181808
-    end
-  end
-end
-
-# Verify that the plugin has the same revision as RSpec
-if Spec::Rails::VERSION::BUILD_TIME_UTC != Spec::VERSION::BUILD_TIME_UTC
-  raise <<-EOF
-
-############################################################################
-Your RSpec on Rails plugin is incompatible with your installed RSpec.
-
-RSpec          : #{Spec::VERSION::BUILD_TIME_UTC}
-RSpec on Rails : #{Spec::Rails::VERSION::BUILD_TIME_UTC}
-
-Make sure your RSpec on Rails plugin is compatible with your RSpec gem.
-See http://rspec.rubyforge.org/documentation/rails/install.html for details.
-############################################################################
-EOF
-end
+module Spec
+  module Rails
+    module VERSION #:nodoc:
+      BUILD_TIME_UTC = 20080131122909
+    end
+  end
+end
+
+# Verify that the plugin has the same revision as RSpec
+if Spec::Rails::VERSION::BUILD_TIME_UTC != Spec::VERSION::BUILD_TIME_UTC
+  raise <<-EOF
+
+############################################################################
+Your RSpec on Rails plugin is incompatible with your installed RSpec.
+
+RSpec          : #{Spec::VERSION::BUILD_TIME_UTC}
+RSpec on Rails : #{Spec::Rails::VERSION::BUILD_TIME_UTC}
+
+Make sure your RSpec on Rails plugin is compatible with your RSpec gem.
+See http://rspec.rubyforge.org/documentation/rails/install.html for details.
+############################################################################
+EOF
+end

data/vendor/plugins/rspec_on_rails/spec/rails/autotest/mappings_spec.rb

@@ -1,39 +1,36 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
-require File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "autotest", "rails_rspec")
+require File.join(File.dirname(__FILE__), *%w[.. .. .. lib autotest rails_rspec])
+require File.join(File.dirname(__FILE__), *%w[.. .. .. .. rspec spec autotest_matchers])
 
 describe Autotest::RailsRspec, "file mapping" do
   before(:each) do
     @autotest = Autotest::RailsRspec.new
-    @autotest.output = StringIO.new
-    @autotest.files.clear
-    @autotest.last_mtime = Time.at(0)
-  end
-  
-  def ensure_mapping(examples, impl)
-    @autotest.files[@impl] = Time.at(0)
-    examples.each do |example|
-      @autotest.files[example] = Time.at(0)
-    end
-    @autotest.tests_for_file(impl).should == examples
+    @autotest.hook :initialize
   end
   
   it "should map model example to model" do
-    ensure_mapping(['spec/models/thing_spec.rb'], 'app/models/thing.rb')
+    @autotest.should map_specs(['spec/models/thing_spec.rb']).
+                            to('app/models/thing.rb')
   end
   
   it "should map controller example to controller" do
-    ensure_mapping(['spec/controllers/things_controller_spec.rb'], 'app/controllers/things_controller.rb')
+    @autotest.should map_specs(['spec/controllers/things_controller_spec.rb']).
+                            to('app/controllers/things_controller.rb')
   end
   
   it "should map view.rhtml" do
-    ensure_mapping(['spec/views/things/index.rhtml_spec.rb'], 'app/views/things/index.rhtml')
+    @autotest.should map_specs(['spec/views/things/index.rhtml_spec.rb']).
+                            to('app/views/things/index.rhtml')
   end
   
   it "should map view.rhtml with underscores in example filename" do
-    ensure_mapping(['spec/views/things/index_rhtml_spec.rb'], 'app/views/things/index.rhtml')
+    @autotest.should map_specs(['spec/views/things/index_rhtml_spec.rb']).
+                            to('app/views/things/index.rhtml')
   end
   
   it "should map view.html.erb" do
-    ensure_mapping(['spec/views/things/index.html.erb_spec.rb'], 'app/views/things/index.html.erb')
+    @autotest.should map_specs(['spec/views/things/index.html.erb_spec.rb']).
+                            to('app/views/things/index.html.erb')
   end
+  
 end