dchelimsky-rspec-rails 1.1.11.1 → 1.1.11.2

data/History.txt

@@ -1,12 +1,21 @@
 === Maintenance
 
-* 1 major enhancement
+* 2 major enhancements
 
   * support controller and action path params in view specs (Mike Vincent).
+  * use ActiveSupport::TestCase when available, else Test::Unit::TestCase - supports Rails 1.2.6 (Brandon Keepers). Closes #620.
 
-* 1 minor enhancement
+* 3 minor enhancements
 
   * improve rdoc for render_template (Patch from Andrew Premdas). Fixes #571.
+  * use more liberal globs to allow for specs in symlinked dirs (Martin Luder). Closes #361.
+  * Enable loading fixtures from arbitrary locations (Jacek Becela). Closes #464.
+  
+* 3 bug fixes
+
+  * Attempt to load application_controller before falling back to application (Geoff Garside). Closes #626.
+  * Include _id and reduce quoting of default values in view specs (Steen Lehmann). Closes #598.
+  * Record calls to render and check rendered[:template] and rendered[:partial] for edge rails (> v2.2.2). Closes #633.
 
 === Version 1.1.11 / 2008-10-24
 

data/Manifest.txt

@@ -3,7 +3,9 @@ License.txt
 Manifest.txt
 README.txt
 Rakefile
-UPGRADE
+features/step_definitions/people.rb
+features/support/env.rb
+features/transactions/transactions_should_rollback.feature
 generators/rspec/CHANGES
 generators/rspec/rspec_generator.rb
 generators/rspec/templates/all_stories.rb
@@ -148,14 +150,9 @@ spec/resources/views/view_spec/explicit_helper.rhtml
 spec/resources/views/view_spec/foo/show.rhtml
 spec/resources/views/view_spec/implicit_helper.rhtml
 spec/resources/views/view_spec/multiple_helpers.rhtml
+spec/resources/views/view_spec/path_params.html.erb
 spec/resources/views/view_spec/should_not_receive.rhtml
 spec/resources/views/view_spec/template_with_partial.rhtml
 spec/resources/views/view_spec/template_with_partial_using_collection.rhtml
 spec/resources/views/view_spec/template_with_partial_with_array.rhtml
 spec/spec_helper.rb
-stories/all.rb
-stories/configuration/stories.rb
-stories/helper.rb
-stories/steps/people.rb
-stories/transactions_should_rollback
-stories/transactions_should_rollback.rb

data/Rakefile

@@ -15,7 +15,7 @@ Hoe.new('rspec-rails', Spec::Rails::VERSION::STRING) do |p|
   p.description = "Behaviour Driven Development for Ruby on Rails."
   p.rubyforge_name = 'rspec'
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
-  p.extra_deps = [["rspec","1.1.11.1"]]
+  p.extra_deps = [["rspec","1.1.11.2"],["cucumber",">= 0.1.13"]]
   p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
 end
 

data/features/step_definitions/people.rb

@@ -0,0 +1,6 @@
+When "I add a Person" do
+  Person.create!(:name => "Foo")
+end
+Then "there should be one person" do
+  Person.count.should == 1
+end

data/features/support/env.rb

@@ -0,0 +1,11 @@
+# Sets up the Rails environment for Cucumber
+ENV["RAILS_ENV"] = "test"
+require File.expand_path(File.dirname(__FILE__) + '/../../../../../config/environment')
+require 'cucumber/rails/world'
+Cucumber::Rails.use_transactional_fixtures
+
+# require 'webrat/rails'
+
+# Comment out the next two lines if you're not using RSpec's matchers (should / should_not) in your steps.
+require 'cucumber/rails/rspec'
+# require 'webrat/rspec-rails'

data/generators/rspec/templates/rspec.rake

@@ -21,14 +21,14 @@ begin
   desc "Run all specs in spec directory (excluding plugin specs)"
   Spec::Rake::SpecTask.new(:spec => spec_prereq) do |t|
     t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
-    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_files = FileList['spec/**/*/*_spec.rb']
   end
 
   namespace :spec do
     desc "Run all specs in spec directory with RCov (excluding plugin specs)"
     Spec::Rake::SpecTask.new(:rcov) do |t|
       t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
-      t.spec_files = FileList['spec/**/*_spec.rb']
+      t.spec_files = FileList['spec/**/*/*_spec.rb']
       t.rcov = true
       t.rcov_opts = lambda do
         IO.readlines("#{RAILS_ROOT}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
@@ -38,13 +38,13 @@ begin
     desc "Print Specdoc for all specs (excluding plugin specs)"
     Spec::Rake::SpecTask.new(:doc) do |t|
       t.spec_opts = ["--format", "specdoc", "--dry-run"]
-      t.spec_files = FileList['spec/**/*_spec.rb']
+      t.spec_files = FileList['spec/**/*/*_spec.rb']
     end
 
     desc "Print Specdoc for all plugin examples"
     Spec::Rake::SpecTask.new(:plugin_doc) do |t|
       t.spec_opts = ["--format", "specdoc", "--dry-run"]
-      t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*')
+      t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*')
     end
 
     [:models, :controllers, :views, :helpers, :lib].each do |sub|
@@ -58,14 +58,14 @@ begin
     desc "Run the code examples in vendor/plugins (except RSpec's own)"
     Spec::Rake::SpecTask.new(:plugins => spec_prereq) do |t|
       t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
-      t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec-rails/*")
+      t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec-rails/*")
     end
 
     namespace :plugins do
       desc "Runs the examples for rspec_on_rails"
       Spec::Rake::SpecTask.new(:rspec_on_rails) do |t|
         t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
-        t.spec_files = FileList['vendor/plugins/rspec-rails/spec/**/*_spec.rb']
+        t.spec_files = FileList['vendor/plugins/rspec-rails/spec/**/*/*_spec.rb']
       end
     end
 
@@ -87,12 +87,14 @@ begin
 
     namespace :db do
       namespace :fixtures do
-        desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
+        desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z."
         task :load => :environment do
-          require 'active_record/fixtures'
-          ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
-          (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
-            Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
+          ActiveRecord::Base.establish_connection(Rails.env)
+          base_dir = File.join(Rails.root, 'spec', 'fixtures')
+          fixtures_dir = ENV['FIXTURES_DIR'] ? File.join(base_dir, ENV['FIXTURES_DIR']) : base_dir
+          
+          (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/).map {|f| File.join(fixtures_dir, f) } : Dir.glob(File.join(fixtures_dir, '*.{yml,csv}'))).each do |fixture_file|
+            Fixtures.create_fixtures(File.dirname(fixture_file), File.basename(fixture_file, '.*'))
           end
         end
       end

data/generators/rspec_default_values.rb

@@ -3,9 +3,9 @@ module Rails
     class GeneratedAttribute
       def default_value
         @default_value ||= case type
-          when :int, :integer               then "\"1\""
-          when :float                       then "\"1.5\""
-          when :decimal                     then "\"9.99\""
+          when :int, :integer               then "1"
+          when :float                       then "1.5"
+          when :decimal                     then "9.99"
           when :datetime, :timestamp, :time then "Time.now"
           when :date                        then "Date.today"
           when :string, :text               then "\"value for #{@name}\""

data/generators/rspec_scaffold/templates/edit_erb_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
 
-<% output_attributes = attributes.reject{|attribute| attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
+<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/edit.<%= default_file_extension %>" do
   include <%= controller_class_name %>Helper
   

data/generators/rspec_scaffold/templates/index_erb_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
 
-<% output_attributes = attributes.reject{|attribute| attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
+<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/index.<%= default_file_extension %>" do
   include <%= controller_class_name %>Helper
   
@@ -21,7 +21,7 @@ describe "/<%= table_name %>/index.<%= default_file_extension %>" do
   it "should render list of <%= table_name %>" do
     render "/<%= table_name %>/index.<%= default_file_extension %>"
 <% for attribute in output_attributes -%>
-    response.should have_tag("tr>td", <%= attribute.default_value %>, 2)
+    response.should have_tag("tr>td", <%= attribute.default_value %>.to_s, 2)
 <% end -%>
   end
 end

data/generators/rspec_scaffold/templates/new_erb_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
 
-<% output_attributes = attributes.reject{|attribute| attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
+<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/new.<%= default_file_extension %>" do
   include <%= controller_class_name %>Helper
   

data/generators/rspec_scaffold/templates/show_erb_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
 
-<% output_attributes = attributes.reject{|attribute| attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
+<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/show.<%= default_file_extension %>" do
   include <%= controller_class_name %>Helper
   before(:each) do
@@ -16,7 +16,7 @@ describe "/<%= table_name %>/show.<%= default_file_extension %>" do
   it "should render attributes in <p>" do
     render "/<%= table_name %>/show.<%= default_file_extension %>"
 <% for attribute in output_attributes -%>
-    response.should have_text(/<%= Regexp.escape(attribute.default_value)[1..-2]%>/)
+    response.should have_text(/<%= Regexp.escape(attribute.default_value).gsub(/^"|"$/, '')%>/)
 <% end -%>
   end
 end

data/lib/spec/rails/example/controller_example_group.rb

@@ -202,6 +202,16 @@ module Spec
                     @_first_render ||= args[0] unless args[0] =~ /^layouts/
                     PickedTemplate.new
                   end
+                  
+                  define_method :render do |*args|
+                    if @_rendered
+                      opts = args[0]
+                      (@_rendered[:template] ||= opts[:file]) if opts[:file]
+                      (@_rendered[:partials][opts[:partial]] += 1) if opts[:partial]
+                    else
+                      super
+                    end
+                  end
                 end
               end
             end

data/lib/spec/rails/example/rails_example_group.rb

@@ -8,26 +8,21 @@ module Spec
   module Rails
 
     module Example
-      class RailsExampleGroup < Test::Unit::TestCase
-        
-        # Rails >= r8570 uses setup/teardown_fixtures explicitly
-        # However, Rails >= r8664 extracted these out to use ActiveSupport::Callbacks.
-        # The latter case is handled at the TestCase level, in interop/testcase.rb
-        unless ActiveSupport.const_defined?(:Callbacks) and self.include?(ActiveSupport::Callbacks)
-          before(:each) do
-            setup_fixtures if self.respond_to?(:setup_fixtures)
-          end
-          after(:each) do
-            teardown_fixtures if self.respond_to?(:teardown_fixtures)
-          end
+      if ActiveSupport.const_defined?(:TestCase)
+        class RailsExampleGroup < ActiveSupport::TestCase
+          include ActionController::Assertions::SelectorAssertions
         end
-        
+      else
+        class RailsExampleGroup < Test::Unit::TestCase
+        end
+      end
+      
+      class RailsExampleGroup
         include Spec::Rails::Matchers
         include Spec::Rails::Mocks
-        
         Spec::Example::ExampleGroupFactory.default(self)
-        
       end
+      
     end
   end
 end

data/lib/spec/rails/extensions/spec/example/configuration.rb

@@ -1,8 +1,13 @@
 require 'spec/example/configuration'
+require 'test_help'
+
 begin
 module Spec
   module Example
     class Configuration
+      
+      TEST_CASE = ActiveSupport.const_defined?(:TestCase) ? ActiveSupport::TestCase : Test::Unit::TestCase
+      
       # Rails 1.2.3 does a copy of the @inheritable_attributes to the subclass when the subclass is
       # created. This causes an ordering issue when setting state on Configuration because the data is
       # already copied.
@@ -10,7 +15,7 @@ module Spec
       # @inheritable_attributes updated.
       # TODO: BT - When we no longer support Rails 1.2.3, we can remove this functionality
       EXAMPLE_GROUP_CLASSES = [
-        ::Test::Unit::TestCase,
+        TEST_CASE,
         ::Spec::Rails::Example::RailsExampleGroup,
         ::Spec::Rails::Example::FunctionalExampleGroup,
         ::Spec::Rails::Example::ControllerExampleGroup,
@@ -26,7 +31,7 @@ module Spec
         end
 
         def use_transactional_fixtures
-          Test::Unit::TestCase.use_transactional_fixtures
+          TEST_CASE.use_transactional_fixtures
         end
         def use_transactional_fixtures=(value)
           EXAMPLE_GROUP_CLASSES.each do |example_group|
@@ -35,7 +40,7 @@ module Spec
         end
 
         def use_instantiated_fixtures
-          Test::Unit::TestCase.use_instantiated_fixtures
+          TEST_CASE.use_instantiated_fixtures
         end
         def use_instantiated_fixtures=(value)
           EXAMPLE_GROUP_CLASSES.each do |example_group|
@@ -44,7 +49,7 @@ module Spec
         end
 
         def fixture_path
-          Test::Unit::TestCase.fixture_path
+          TEST_CASE.fixture_path
         end
         def fixture_path=(path)
           EXAMPLE_GROUP_CLASSES.each do |example_group|
@@ -53,7 +58,7 @@ module Spec
         end
 
         def global_fixtures
-          ::Test::Unit::TestCase.fixture_table_names
+          TEST_CASE.fixture_table_names
         end
         def global_fixtures=(fixtures)
           EXAMPLE_GROUP_CLASSES.each do |example_group|

data/lib/spec/rails/matchers/render_template.rb

@@ -10,9 +10,19 @@ module Spec
         end
       
         def matches?(response)
-          
           if response.respond_to?(:rendered_file)
             @actual = response.rendered_file
+          elsif response.respond_to?(:rendered)
+            case template = response.rendered[:template]
+            when nil
+              unless response.rendered[:partials].empty?
+                @actual = path_and_file(response.rendered[:partials].keys.first).join("/_")
+              end
+            when ActionView::Template
+              @actual = template.path
+            when String
+              @actual = template
+            end
           else
             @actual = response.rendered_template.to_s
           end

data/lib/spec/rails/version.rb

@@ -5,7 +5,7 @@ module Spec
         MAJOR  = 1
         MINOR  = 1
         TINY   = 11
-        MINESCULE = 1
+        MINESCULE = 2
 
         STRING = [MAJOR, MINOR, TINY, MINESCULE].join('.')
 

data/lib/spec/rails.rb

@@ -1,6 +1,11 @@
 silence_warnings { RAILS_ENV = "test" }
 
-require_dependency 'application'
+begin
+  require_dependency 'application_controller'
+rescue MissingSourceFile
+  require_dependency 'application'
+end
+
 require 'action_controller/test_process'
 require 'action_controller/integration'
 require 'active_record/fixtures' if defined?(ActiveRecord::Base)

data/rspec-rails.gemspec

@@ -2,34 +2,35 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "1.1.11.1"
+  s.version = "1.1.11.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["RSpec Development Team"]
-  s.date = %q{2008-11-24}
+  s.date = %q{2008-12-18}
   s.description = %q{Behaviour Driven Development for Ruby on Rails.}
   s.email = ["rspec-devel@rubyforge.org"]
   s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "generators/rspec/templates/previous_failures.txt"]
-  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "Rakefile", "UPGRADE", "generators/rspec/CHANGES", "generators/rspec/rspec_generator.rb", "generators/rspec/templates/all_stories.rb", "generators/rspec/templates/previous_failures.txt", "generators/rspec/templates/rcov.opts", "generators/rspec/templates/rspec.rake", "generators/rspec/templates/script/autospec", "generators/rspec/templates/script/spec", "generators/rspec/templates/script/spec_server", "generators/rspec/templates/spec.opts", "generators/rspec/templates/spec_helper.rb", "generators/rspec/templates/stories_helper.rb", "generators/rspec_controller/USAGE", "generators/rspec_controller/rspec_controller_generator.rb", "generators/rspec_controller/templates/controller_spec.rb", "generators/rspec_controller/templates/helper_spec.rb", "generators/rspec_controller/templates/view_spec.rb", "generators/rspec_default_values.rb", "generators/rspec_model/USAGE", "generators/rspec_model/rspec_model_generator.rb", "generators/rspec_model/templates/model_spec.rb", "generators/rspec_scaffold/rspec_scaffold_generator.rb", "generators/rspec_scaffold/templates/controller_spec.rb", "generators/rspec_scaffold/templates/edit_erb_spec.rb", "generators/rspec_scaffold/templates/helper_spec.rb", "generators/rspec_scaffold/templates/index_erb_spec.rb", "generators/rspec_scaffold/templates/new_erb_spec.rb", "generators/rspec_scaffold/templates/routing_spec.rb", "generators/rspec_scaffold/templates/show_erb_spec.rb", "init.rb", "lib/autotest/discover.rb", "lib/autotest/rails_rspec.rb", "lib/spec/rails.rb", "lib/spec/rails/example.rb", "lib/spec/rails/example/assigns_hash_proxy.rb", "lib/spec/rails/example/controller_example_group.rb", "lib/spec/rails/example/cookies_proxy.rb", "lib/spec/rails/example/functional_example_group.rb", "lib/spec/rails/example/helper_example_group.rb", "lib/spec/rails/example/model_example_group.rb", "lib/spec/rails/example/rails_example_group.rb", "lib/spec/rails/example/render_observer.rb", "lib/spec/rails/example/view_example_group.rb", "lib/spec/rails/extensions.rb", "lib/spec/rails/extensions/action_controller/base.rb", "lib/spec/rails/extensions/action_controller/rescue.rb", "lib/spec/rails/extensions/action_controller/test_response.rb", "lib/spec/rails/extensions/action_view/base.rb", "lib/spec/rails/extensions/active_record/base.rb", "lib/spec/rails/extensions/object.rb", "lib/spec/rails/extensions/spec/example/configuration.rb", "lib/spec/rails/extensions/spec/matchers/have.rb", "lib/spec/rails/interop/testcase.rb", "lib/spec/rails/matchers.rb", "lib/spec/rails/matchers/assert_select.rb", "lib/spec/rails/matchers/change.rb", "lib/spec/rails/matchers/have_text.rb", "lib/spec/rails/matchers/include_text.rb", "lib/spec/rails/matchers/redirect_to.rb", "lib/spec/rails/matchers/render_template.rb", "lib/spec/rails/mocks.rb", "lib/spec/rails/story_adapter.rb", "lib/spec/rails/version.rb", "rspec-rails.gemspec", "spec/rails/autotest/mappings_spec.rb", "spec/rails/example/assigns_hash_proxy_spec.rb", "spec/rails/example/configuration_spec.rb", "spec/rails/example/controller_isolation_spec.rb", "spec/rails/example/controller_spec_spec.rb", "spec/rails/example/cookies_proxy_spec.rb", "spec/rails/example/example_group_factory_spec.rb", "spec/rails/example/helper_spec_spec.rb", "spec/rails/example/model_spec_spec.rb", "spec/rails/example/shared_behaviour_spec.rb", "spec/rails/example/test_unit_assertion_accessibility_spec.rb", "spec/rails/example/view_spec_spec.rb", "spec/rails/extensions/action_controller_rescue_action_spec.rb", "spec/rails/extensions/action_view_base_spec.rb", "spec/rails/extensions/active_record_spec.rb", "spec/rails/interop/testcase_spec.rb", "spec/rails/matchers/assert_select_spec.rb", "spec/rails/matchers/description_generation_spec.rb", "spec/rails/matchers/errors_on_spec.rb", "spec/rails/matchers/have_text_spec.rb", "spec/rails/matchers/include_text_spec.rb", "spec/rails/matchers/redirect_to_spec.rb", "spec/rails/matchers/render_template_spec.rb", "spec/rails/matchers/should_change_spec.rb", "spec/rails/mocks/ar_classes.rb", "spec/rails/mocks/mock_model_spec.rb", "spec/rails/mocks/stub_model_spec.rb", "spec/rails/sample_modified_fixture.rb", "spec/rails/sample_spec.rb", "spec/rails/spec_server_spec.rb", "spec/rails/spec_spec.rb", "spec/rails_suite.rb", "spec/resources/controllers/action_view_base_spec_controller.rb", "spec/resources/controllers/controller_spec_controller.rb", "spec/resources/controllers/redirect_spec_controller.rb", "spec/resources/controllers/render_spec_controller.rb", "spec/resources/controllers/rjs_spec_controller.rb", "spec/resources/helpers/addition_helper.rb", "spec/resources/helpers/explicit_helper.rb", "spec/resources/helpers/more_explicit_helper.rb", "spec/resources/helpers/plugin_application_helper.rb", "spec/resources/helpers/view_spec_helper.rb", "spec/resources/views/controller_spec/_partial.rhtml", "spec/resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml", "spec/resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml", "spec/resources/views/controller_spec/action_setting_the_assigns_hash.rhtml", "spec/resources/views/controller_spec/action_with_errors_in_template.rhtml", "spec/resources/views/controller_spec/action_with_template.rhtml", "spec/resources/views/layouts/application.rhtml", "spec/resources/views/layouts/simple.rhtml", "spec/resources/views/objects/_object.html.erb", "spec/resources/views/render_spec/_a_partial.rhtml", "spec/resources/views/render_spec/action_with_alternate_layout.rhtml", "spec/resources/views/render_spec/some_action.js.rjs", "spec/resources/views/render_spec/some_action.rhtml", "spec/resources/views/render_spec/some_action.rjs", "spec/resources/views/rjs_spec/_replacement_partial.rhtml", "spec/resources/views/rjs_spec/hide_div.rjs", "spec/resources/views/rjs_spec/hide_page_element.rjs", "spec/resources/views/rjs_spec/insert_html.rjs", "spec/resources/views/rjs_spec/replace.rjs", "spec/resources/views/rjs_spec/replace_html.rjs", "spec/resources/views/rjs_spec/replace_html_with_partial.rjs", "spec/resources/views/rjs_spec/visual_effect.rjs", "spec/resources/views/rjs_spec/visual_toggle_effect.rjs", "spec/resources/views/tag_spec/no_tags.rhtml", "spec/resources/views/tag_spec/single_div_with_no_attributes.rhtml", "spec/resources/views/tag_spec/single_div_with_one_attribute.rhtml", "spec/resources/views/view_spec/_partial.rhtml", "spec/resources/views/view_spec/_partial_used_twice.rhtml", "spec/resources/views/view_spec/_partial_with_local_variable.rhtml", "spec/resources/views/view_spec/_partial_with_sub_partial.rhtml", "spec/resources/views/view_spec/_spacer.rhtml", "spec/resources/views/view_spec/accessor.rhtml", "spec/resources/views/view_spec/block_helper.rhtml", "spec/resources/views/view_spec/entry_form.rhtml", "spec/resources/views/view_spec/explicit_helper.rhtml", "spec/resources/views/view_spec/foo/show.rhtml", "spec/resources/views/view_spec/implicit_helper.rhtml", "spec/resources/views/view_spec/multiple_helpers.rhtml", "spec/resources/views/view_spec/should_not_receive.rhtml", "spec/resources/views/view_spec/template_with_partial.rhtml", "spec/resources/views/view_spec/template_with_partial_using_collection.rhtml", "spec/resources/views/view_spec/template_with_partial_with_array.rhtml", "spec/spec_helper.rb", "stories/all.rb", "stories/configuration/stories.rb", "stories/helper.rb", "stories/steps/people.rb", "stories/transactions_should_rollback", "stories/transactions_should_rollback.rb"]
+  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "Rakefile", "features/step_definitions/people.rb", "features/support/env.rb", "features/transactions/transactions_should_rollback.feature", "generators/rspec/CHANGES", "generators/rspec/rspec_generator.rb", "generators/rspec/templates/all_stories.rb", "generators/rspec/templates/previous_failures.txt", "generators/rspec/templates/rcov.opts", "generators/rspec/templates/rspec.rake", "generators/rspec/templates/script/autospec", "generators/rspec/templates/script/spec", "generators/rspec/templates/script/spec_server", "generators/rspec/templates/spec.opts", "generators/rspec/templates/spec_helper.rb", "generators/rspec/templates/stories_helper.rb", "generators/rspec_controller/USAGE", "generators/rspec_controller/rspec_controller_generator.rb", "generators/rspec_controller/templates/controller_spec.rb", "generators/rspec_controller/templates/helper_spec.rb", "generators/rspec_controller/templates/view_spec.rb", "generators/rspec_default_values.rb", "generators/rspec_model/USAGE", "generators/rspec_model/rspec_model_generator.rb", "generators/rspec_model/templates/model_spec.rb", "generators/rspec_scaffold/rspec_scaffold_generator.rb", "generators/rspec_scaffold/templates/controller_spec.rb", "generators/rspec_scaffold/templates/edit_erb_spec.rb", "generators/rspec_scaffold/templates/helper_spec.rb", "generators/rspec_scaffold/templates/index_erb_spec.rb", "generators/rspec_scaffold/templates/new_erb_spec.rb", "generators/rspec_scaffold/templates/routing_spec.rb", "generators/rspec_scaffold/templates/show_erb_spec.rb", "init.rb", "lib/autotest/discover.rb", "lib/autotest/rails_rspec.rb", "lib/spec/rails.rb", "lib/spec/rails/example.rb", "lib/spec/rails/example/assigns_hash_proxy.rb", "lib/spec/rails/example/controller_example_group.rb", "lib/spec/rails/example/cookies_proxy.rb", "lib/spec/rails/example/functional_example_group.rb", "lib/spec/rails/example/helper_example_group.rb", "lib/spec/rails/example/model_example_group.rb", "lib/spec/rails/example/rails_example_group.rb", "lib/spec/rails/example/render_observer.rb", "lib/spec/rails/example/view_example_group.rb", "lib/spec/rails/extensions.rb", "lib/spec/rails/extensions/action_controller/base.rb", "lib/spec/rails/extensions/action_controller/rescue.rb", "lib/spec/rails/extensions/action_controller/test_response.rb", "lib/spec/rails/extensions/action_view/base.rb", "lib/spec/rails/extensions/active_record/base.rb", "lib/spec/rails/extensions/object.rb", "lib/spec/rails/extensions/spec/example/configuration.rb", "lib/spec/rails/extensions/spec/matchers/have.rb", "lib/spec/rails/interop/testcase.rb", "lib/spec/rails/matchers.rb", "lib/spec/rails/matchers/assert_select.rb", "lib/spec/rails/matchers/change.rb", "lib/spec/rails/matchers/have_text.rb", "lib/spec/rails/matchers/include_text.rb", "lib/spec/rails/matchers/redirect_to.rb", "lib/spec/rails/matchers/render_template.rb", "lib/spec/rails/mocks.rb", "lib/spec/rails/story_adapter.rb", "lib/spec/rails/version.rb", "rspec-rails.gemspec", "spec/rails/autotest/mappings_spec.rb", "spec/rails/example/assigns_hash_proxy_spec.rb", "spec/rails/example/configuration_spec.rb", "spec/rails/example/controller_isolation_spec.rb", "spec/rails/example/controller_spec_spec.rb", "spec/rails/example/cookies_proxy_spec.rb", "spec/rails/example/example_group_factory_spec.rb", "spec/rails/example/helper_spec_spec.rb", "spec/rails/example/model_spec_spec.rb", "spec/rails/example/shared_behaviour_spec.rb", "spec/rails/example/test_unit_assertion_accessibility_spec.rb", "spec/rails/example/view_spec_spec.rb", "spec/rails/extensions/action_controller_rescue_action_spec.rb", "spec/rails/extensions/action_view_base_spec.rb", "spec/rails/extensions/active_record_spec.rb", "spec/rails/interop/testcase_spec.rb", "spec/rails/matchers/assert_select_spec.rb", "spec/rails/matchers/description_generation_spec.rb", "spec/rails/matchers/errors_on_spec.rb", "spec/rails/matchers/have_text_spec.rb", "spec/rails/matchers/include_text_spec.rb", "spec/rails/matchers/redirect_to_spec.rb", "spec/rails/matchers/render_template_spec.rb", "spec/rails/matchers/should_change_spec.rb", "spec/rails/mocks/ar_classes.rb", "spec/rails/mocks/mock_model_spec.rb", "spec/rails/mocks/stub_model_spec.rb", "spec/rails/sample_modified_fixture.rb", "spec/rails/sample_spec.rb", "spec/rails/spec_server_spec.rb", "spec/rails/spec_spec.rb", "spec/rails_suite.rb", "spec/resources/controllers/action_view_base_spec_controller.rb", "spec/resources/controllers/controller_spec_controller.rb", "spec/resources/controllers/redirect_spec_controller.rb", "spec/resources/controllers/render_spec_controller.rb", "spec/resources/controllers/rjs_spec_controller.rb", "spec/resources/helpers/addition_helper.rb", "spec/resources/helpers/explicit_helper.rb", "spec/resources/helpers/more_explicit_helper.rb", "spec/resources/helpers/plugin_application_helper.rb", "spec/resources/helpers/view_spec_helper.rb", "spec/resources/views/controller_spec/_partial.rhtml", "spec/resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml", "spec/resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml", "spec/resources/views/controller_spec/action_setting_the_assigns_hash.rhtml", "spec/resources/views/controller_spec/action_with_errors_in_template.rhtml", "spec/resources/views/controller_spec/action_with_template.rhtml", "spec/resources/views/layouts/application.rhtml", "spec/resources/views/layouts/simple.rhtml", "spec/resources/views/objects/_object.html.erb", "spec/resources/views/render_spec/_a_partial.rhtml", "spec/resources/views/render_spec/action_with_alternate_layout.rhtml", "spec/resources/views/render_spec/some_action.js.rjs", "spec/resources/views/render_spec/some_action.rhtml", "spec/resources/views/render_spec/some_action.rjs", "spec/resources/views/rjs_spec/_replacement_partial.rhtml", "spec/resources/views/rjs_spec/hide_div.rjs", "spec/resources/views/rjs_spec/hide_page_element.rjs", "spec/resources/views/rjs_spec/insert_html.rjs", "spec/resources/views/rjs_spec/replace.rjs", "spec/resources/views/rjs_spec/replace_html.rjs", "spec/resources/views/rjs_spec/replace_html_with_partial.rjs", "spec/resources/views/rjs_spec/visual_effect.rjs", "spec/resources/views/rjs_spec/visual_toggle_effect.rjs", "spec/resources/views/tag_spec/no_tags.rhtml", "spec/resources/views/tag_spec/single_div_with_no_attributes.rhtml", "spec/resources/views/tag_spec/single_div_with_one_attribute.rhtml", "spec/resources/views/view_spec/_partial.rhtml", "spec/resources/views/view_spec/_partial_used_twice.rhtml", "spec/resources/views/view_spec/_partial_with_local_variable.rhtml", "spec/resources/views/view_spec/_partial_with_sub_partial.rhtml", "spec/resources/views/view_spec/_spacer.rhtml", "spec/resources/views/view_spec/accessor.rhtml", "spec/resources/views/view_spec/block_helper.rhtml", "spec/resources/views/view_spec/entry_form.rhtml", "spec/resources/views/view_spec/explicit_helper.rhtml", "spec/resources/views/view_spec/foo/show.rhtml", "spec/resources/views/view_spec/implicit_helper.rhtml", "spec/resources/views/view_spec/multiple_helpers.rhtml", "spec/resources/views/view_spec/path_params.html.erb", "spec/resources/views/view_spec/should_not_receive.rhtml", "spec/resources/views/view_spec/template_with_partial.rhtml", "spec/resources/views/view_spec/template_with_partial_using_collection.rhtml", "spec/resources/views/view_spec/template_with_partial_with_array.rhtml", "spec/spec_helper.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://rspec.info/}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.1}
-  s.summary = %q{rspec-rails 1.1.11.1}
+  s.summary = %q{rspec-rails 1.1.11.2}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, ["= 1.1.11.1"])
+      s.add_runtime_dependency(%q<rspec>, ["= 1.1.11.2"])
+      s.add_runtime_dependency(%q<cucumber>, [">= 0.1.13"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.2"])
     else
-      s.add_dependency(%q<rspec>, ["= 1.1.11.1"])
+      s.add_dependency(%q<rspec>, ["= 1.1.11.2"])
     end
   else
-    s.add_dependency(%q<rspec>, ["= 1.1.11.1"])
+    s.add_dependency(%q<rspec>, ["= 1.1.11.2"])
   end
 end

data/spec/rails/example/configuration_spec.rb

@@ -9,18 +9,18 @@ module Spec
       end
 
       describe "#use_transactional_fixtures" do
-        it "should return Test::Unit::TestCase.use_transactional_fixtures" do
-          config.use_transactional_fixtures.should == Test::Unit::TestCase.use_transactional_fixtures
+        it "should return #{Spec::Example::Configuration::TEST_CASE}.use_transactional_fixtures" do
+          config.use_transactional_fixtures.should == Spec::Example::Configuration::TEST_CASE.use_transactional_fixtures
         end
 
-        it "should set Test::Unit::TestCase.use_transactional_fixtures to false" do
+        it "should set #{Spec::Example::Configuration::TEST_CASE}.use_transactional_fixtures to false" do
           Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
             example_group.should_receive(:use_transactional_fixtures=).with(false)
           end
           config.use_transactional_fixtures = false
         end
 
-        it "should set Test::Unit::TestCase.use_transactional_fixtures to true" do
+        it "should set #{Spec::Example::Configuration::TEST_CASE}.use_transactional_fixtures to true" do
           Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
             example_group.should_receive(:use_transactional_fixtures=).with(true)
           end
@@ -29,18 +29,18 @@ module Spec
       end
 
       describe "#use_instantiated_fixtures" do
-        it "should return Test::Unit::TestCase.use_transactional_fixtures" do
-          config.use_instantiated_fixtures.should == Test::Unit::TestCase.use_instantiated_fixtures
+        it "should return #{Spec::Example::Configuration::TEST_CASE}.use_transactional_fixtures" do
+          config.use_instantiated_fixtures.should == Spec::Example::Configuration::TEST_CASE.use_instantiated_fixtures
         end
 
-        it "should set Test::Unit::TestCase.use_instantiated_fixtures to false" do
+        it "should set #{Spec::Example::Configuration::TEST_CASE}.use_instantiated_fixtures to false" do
           Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
             example_group.should_receive(:use_instantiated_fixtures=).with(false)
           end
           config.use_instantiated_fixtures = false
         end
 
-        it "should set Test::Unit::TestCase.use_instantiated_fixtures to true" do
+        it "should set #{Spec::Example::Configuration::TEST_CASE}.use_instantiated_fixtures to true" do
           Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
             example_group.should_receive(:use_instantiated_fixtures=).with(true)
           end

data/spec/rails/example/controller_spec_spec.rb

@@ -276,4 +276,4 @@ module Spec
       end
     end
   end
-end
+end

data/spec/rails/interop/testcase_spec.rb

@@ -17,6 +17,10 @@ if ActiveSupport.const_defined?(:Callbacks) && Test::Unit::TestCase.include?(Act
     def self.run?
       @@has_been_run
     end
+
+    def self.run(options=Spec::Runner.options)
+      super options
+    end
     
     def do_some_setup
       @@setup_callback_count += 1
@@ -63,4 +67,4 @@ if ActiveSupport.const_defined?(:Callbacks) && Test::Unit::TestCase.include?(Act
     end
   end
   
-end
+end

data/spec/resources/views/view_spec/path_params.html.erb

@@ -0,0 +1 @@
+<%= params[:controller] %>

data/spec/spec_helper.rb

@@ -50,6 +50,7 @@ Spec::Runner.configure do |config|
 end
 
 
+ActionController::Routing::Routes.clear! # only since we're drawing routes here
 ActionController::Routing::Routes.draw do |map|
   map.resources :rspec_on_rails_specs
   map.connect 'custom_route', :controller => 'custom_route_spec', :action => 'custom_route'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dchelimsky-rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.1.11.1
+  version: 1.1.11.2
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-24 00:00:00 -08:00
+date: 2008-12-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.11.1
+        version: 1.1.11.2
     version: 
 description: Behaviour Driven Development for Ruby on Rails.
 email: 
@@ -40,7 +40,9 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- UPGRADE
+- features/step_definitions/people.rb
+- features/support/env.rb
+- features/transactions/transactions_should_rollback.feature
 - generators/rspec/CHANGES
 - generators/rspec/rspec_generator.rb
 - generators/rspec/templates/all_stories.rb
@@ -185,17 +187,12 @@ files:
 - spec/resources/views/view_spec/foo/show.rhtml
 - spec/resources/views/view_spec/implicit_helper.rhtml
 - spec/resources/views/view_spec/multiple_helpers.rhtml
+- spec/resources/views/view_spec/path_params.html.erb
 - spec/resources/views/view_spec/should_not_receive.rhtml
 - spec/resources/views/view_spec/template_with_partial.rhtml
 - spec/resources/views/view_spec/template_with_partial_using_collection.rhtml
 - spec/resources/views/view_spec/template_with_partial_with_array.rhtml
 - spec/spec_helper.rb
-- stories/all.rb
-- stories/configuration/stories.rb
-- stories/helper.rb
-- stories/steps/people.rb
-- stories/transactions_should_rollback
-- stories/transactions_should_rollback.rb
 has_rdoc: true
 homepage: http://rspec.info/
 post_install_message: 
@@ -222,6 +219,6 @@ rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: rspec-rails 1.1.11.1
+summary: rspec-rails 1.1.11.2
 test_files: []
 

data/UPGRADE

@@ -1,7 +0,0 @@
-== Upgrade
-
-  script/generate rspec
-  
-Or modify spec_helper.rb based on the template, which can be found at:
-
-  vendor/plugins/rspec-rails/generators/rspec/templates/spec_helper.rb

data/stories/all.rb

@@ -1,10 +0,0 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
-require File.join(File.dirname(__FILE__), *%w[steps people])
-
-# Run transactions_should_rollback in Ruby
-require File.join(File.dirname(__FILE__), *%w[transactions_should_rollback])
-
-# Run transactions_should_rollback in Plain Text
-with_steps_for :people do
-  run File.join(File.dirname(__FILE__), *%w[transactions_should_rollback]), :type => RailsStory
-end

data/stories/configuration/stories.rb

@@ -1,5 +0,0 @@
-require File.join(File.dirname(__FILE__), *%w[.. helper])
-
-with_steps_for :running_rspec do
-  run File.join(File.dirname(__FILE__), *%w[.. .. .. rspec stories configuration before_blocks.story]), :type => RailsStory
-end

data/stories/helper.rb

@@ -1,6 +0,0 @@
-dir = File.dirname(__FILE__)
-$LOAD_PATH.unshift File.expand_path("#{dir}/../lib")
-require File.expand_path("#{dir}/../../../../spec/spec_helper")
-require File.expand_path("#{dir}/../../rspec/stories/helper")
-
-require 'spec/rails/story_adapter'

data/stories/steps/people.rb

@@ -1,8 +0,0 @@
-steps_for :people do
-  When "I add a Person" do
-    Person.create!(:name => "Foo")
-  end
-  Then "there should be one person" do
-    Person.count.should == 1
-  end
-end

data/stories/transactions_should_rollback.rb

@@ -1,25 +0,0 @@
-require File.join(File.dirname(__FILE__), *%w[helper])
-
-Story "transactions should rollback", %{
-  As an RSpec/Rails Story author
-  I want transactions to roll back between scenarios
-  So that I can have confidence in the state of the database
-}, :type => RailsStory do
-  Scenario "add one Person" do
-    When "I add a Person" do
-      Person.create!(:name => "Foo")
-    end
-  end
-  
-  Scenario "add another person" do
-    GivenScenario "add one Person"
-    Then "there should be one person" do
-      Person.count.should == 1
-    end
-  end
-
-  Scenario "add yet another person" do
-    GivenScenario "add one Person"
-    Then "there should be one person"
-  end
-end