dchelimsky-rspec-rails 1.1.11 → 1.1.11.1

data/rspec-rails.gemspec

@@ -2,27 +2,34 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "1.1.11"
+  s.version = "1.1.11.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["RSpec Development Team"]
-  s.date = %q{2008-10-24}
+  s.date = %q{2008-11-24}
   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/spec_helper.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", "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", "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.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.0}
-  s.summary = %q{rspec-rails 1.1.11}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{rspec-rails 1.1.11.1}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
-  end
 
-  s.add_dependency(%q<rspec>, ["= 1.1.11"])
+    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_development_dependency(%q<hoe>, [">= 1.8.2"])
+    else
+      s.add_dependency(%q<rspec>, ["= 1.1.11.1"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["= 1.1.11.1"])
+  end
 end

data/spec/rails/example/configuration_spec.rb

@@ -2,82 +2,78 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 module Spec
   module Example
-    describe Configuration, :shared => true do
-      before(:each) { @config = Configuration.new }
-    end
-
-    describe Configuration, "#use_transactional_fixtures" do
-      it_should_behave_like "Spec::Example::Configuration"
+    describe Configuration do
 
-      it "should return Test::Unit::TestCase.use_transactional_fixtures" do
-        @config.use_transactional_fixtures.should == Test::Unit::TestCase.use_transactional_fixtures
+      def config
+        @config ||= Configuration.new
       end
 
-      it "should set Test::Unit::TestCase.use_transactional_fixtures to false" do
-        Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
-          example_group.should_receive(:use_transactional_fixtures=).with(false)
+      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
         end
-        @config.use_transactional_fixtures = false
-      end
 
-      it "should set Test::Unit::TestCase.use_transactional_fixtures to true" do
-        Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
-          example_group.should_receive(:use_transactional_fixtures=).with(true)
+        it "should set Test::Unit::TestCase.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
-        @config.use_transactional_fixtures = true
-      end
-    end
-
-    describe Configuration, "#use_instantiated_fixtures" do
-      it_should_behave_like "Spec::Example::Configuration"
-
-      it "should return Test::Unit::TestCase.use_transactional_fixtures" do
-        @config.use_instantiated_fixtures.should == Test::Unit::TestCase.use_instantiated_fixtures
-      end
 
-      it "should set Test::Unit::TestCase.use_instantiated_fixtures to false" do
-        Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
-          example_group.should_receive(:use_instantiated_fixtures=).with(false)
+        it "should set Test::Unit::TestCase.use_transactional_fixtures to true" do
+          Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
+            example_group.should_receive(:use_transactional_fixtures=).with(true)
+          end
+          config.use_transactional_fixtures = true
         end
-        @config.use_instantiated_fixtures = false
       end
 
-      it "should set Test::Unit::TestCase.use_instantiated_fixtures to true" do
-        Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
-          example_group.should_receive(:use_instantiated_fixtures=).with(true)
+      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
         end
-        @config.use_instantiated_fixtures = true
-      end
-    end
 
-    describe Configuration, "#fixture_path" do
-      it_should_behave_like "Spec::Example::Configuration"
+        it "should set Test::Unit::TestCase.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 default to RAILS_ROOT + '/spec/fixtures'" do
-        @config.fixture_path.should == RAILS_ROOT + '/spec/fixtures'
-        Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
-          example_group.fixture_path.should == RAILS_ROOT + '/spec/fixtures'
+        it "should set Test::Unit::TestCase.use_instantiated_fixtures to true" do
+          Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
+            example_group.should_receive(:use_instantiated_fixtures=).with(true)
+          end
+          config.use_instantiated_fixtures = true
         end
       end
 
-      it "should set fixture_path" do
-        @config.fixture_path = "/new/path"
-        @config.fixture_path.should == "/new/path"
-        Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
-          example_group.fixture_path.should == "/new/path"
+      describe "#fixture_path" do
+        it "should default to RAILS_ROOT + '/spec/fixtures'" do
+          config.fixture_path.should == RAILS_ROOT + '/spec/fixtures'
+          Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
+            example_group.fixture_path.should == RAILS_ROOT + '/spec/fixtures'
+          end
         end
-      end
-    end
 
-    describe Configuration, "#global_fixtures" do
-      it_should_behave_like "Spec::Example::Configuration"
+        it "should set fixture_path" do
+          config.fixture_path = "/new/path"
+          config.fixture_path.should == "/new/path"
+          Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
+            example_group.fixture_path.should == "/new/path"
+          end
+        end
+      end
 
-      it "should set fixtures on TestCase" do
-        Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
-          example_group.should_receive(:fixtures).with(:blah)
+      describe "#global_fixtures" do
+        it "should set fixtures on TestCase" do
+          Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
+            example_group.should_receive(:fixtures).with(:blah)
+          end
+          config.global_fixtures = [:blah]
         end
-        @config.global_fixtures = [:blah]
       end
+      
     end
   end
 end

data/spec/rails/example/view_spec_spec.rb

@@ -249,6 +249,27 @@ describe "render 'view_spec/foo/show.rhtml'", :type => :view do
   end
 end
 
+describe "setting path parameters", :type => :view do
+  describe "(controller)" do
+    it "should supercede the default path parameters" do
+      render "view_spec/entry_form", :path_parameters => {:controller => 'foo'}
+      request.path_parameters[:controller].should == 'foo'
+    end
+  end
+  describe "(action)" do
+    it "should supercede the default path parameters" do
+      render "view_spec/entry_form", :path_parameters => {:action => 'foo'}
+      request.path_parameters[:action].should == 'foo'
+    end
+  end
+  describe "(something arbitrary)" do
+    it "should supercede the default path parameters" do
+      render "view_spec/entry_form", :path_parameters => {:foo => 'bar'}
+      request.path_parameters[:foo].should == 'bar'
+    end
+  end
+end
+
 module Spec
   module Rails
     module Example

data/spec/spec_helper.rb

@@ -1,19 +1,19 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(File.expand_path("#{dir}/../rspec/lib"))
-$LOAD_PATH.unshift(File.expand_path("#{dir}/../spec_resources/controllers"))
-$LOAD_PATH.unshift(File.expand_path("#{dir}/../spec_resources/helpers"))
+$LOAD_PATH.unshift(File.expand_path("#{dir}/resources/controllers"))
+$LOAD_PATH.unshift(File.expand_path("#{dir}/resources/helpers"))
 require File.expand_path("#{dir}/../../../../spec/spec_helper")
-require File.expand_path("#{dir}/../spec_resources/controllers/render_spec_controller")
-require File.expand_path("#{dir}/../spec_resources/controllers/rjs_spec_controller")
-require File.expand_path("#{dir}/../spec_resources/controllers/redirect_spec_controller")
-require File.expand_path("#{dir}/../spec_resources/controllers/action_view_base_spec_controller")
-require File.expand_path("#{dir}/../spec_resources/helpers/addition_helper")
-require File.expand_path("#{dir}/../spec_resources/helpers/explicit_helper")
-require File.expand_path("#{dir}/../spec_resources/helpers/more_explicit_helper")
-require File.expand_path("#{dir}/../spec_resources/helpers/view_spec_helper")
-require File.expand_path("#{dir}/../spec_resources/helpers/plugin_application_helper")
-
-extra_controller_paths = File.expand_path("#{dir}/../spec_resources/controllers")
+require File.expand_path("#{dir}/resources/controllers/render_spec_controller")
+require File.expand_path("#{dir}/resources/controllers/rjs_spec_controller")
+require File.expand_path("#{dir}/resources/controllers/redirect_spec_controller")
+require File.expand_path("#{dir}/resources/controllers/action_view_base_spec_controller")
+require File.expand_path("#{dir}/resources/helpers/addition_helper")
+require File.expand_path("#{dir}/resources/helpers/explicit_helper")
+require File.expand_path("#{dir}/resources/helpers/more_explicit_helper")
+require File.expand_path("#{dir}/resources/helpers/view_spec_helper")
+require File.expand_path("#{dir}/resources/helpers/plugin_application_helper")
+
+extra_controller_paths = File.expand_path("#{dir}/resources/controllers")
 
 unless ActionController::Routing.controller_paths.include?(extra_controller_paths)
   ActionController::Routing.instance_eval {@possible_controllers = nil}
@@ -24,7 +24,7 @@ module Spec
   module Rails
     module Example
       class ViewExampleGroupController
-        set_view_path File.join(File.dirname(__FILE__), "..", "spec_resources", "views")
+        set_view_path File.join(File.dirname(__FILE__), "..", "spec", "resources", "views")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dchelimsky-rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.1.11
+  version: 1.1.11.1
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-24 00:00:00 -07:00
+date: 2008-11-24 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
+        version: 1.1.11.1
     version: 
 description: Behaviour Driven Development for Ruby on Rails.
 email: 
@@ -137,59 +137,59 @@ files:
 - 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
-- 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
 - stories/all.rb
 - stories/configuration/stories.rb
 - stories/helper.rb
@@ -222,6 +222,6 @@ rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: rspec-rails 1.1.11
+summary: rspec-rails 1.1.11.1
 test_files: []