RubyGems - dchelimsky-rspec-rails - Versions diffs - 1.1.11.4 → 1.1.11.5 - Mend

dchelimsky-rspec-rails 1.1.11.4 → 1.1.11.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (24) hide show

data/History.txt +7 -1
data/Manifest.txt +2 -2
data/Rakefile +1 -5
data/TODO.txt +1 -0
data/generators/rspec/templates/script/spec_server +17 -8
data/lib/spec/rails/example/cookies_proxy.rb +5 -1
data/lib/spec/rails/example/functional_example_group.rb +13 -1
data/lib/spec/rails/extensions/action_controller/base.rb +1 -1
data/lib/spec/rails/extensions/action_controller/test_response.rb +11 -2
data/lib/spec/rails/extensions/active_record/base.rb +1 -2
data/lib/spec/rails/matchers/redirect_to.rb +3 -1
data/lib/spec/rails/mocks.rb +11 -8
data/lib/spec/rails/version.rb +1 -1
data/rspec-rails.gemspec +8 -8
data/spec/resources/controllers/controller_spec_controller.rb +2 -6
data/spec/spec/rails/example/controller_isolation_spec.rb +0 -2
data/spec/spec/rails/example/controller_spec_spec.rb +10 -2
data/spec/spec/rails/example/cookies_proxy_spec.rb +29 -12
data/spec/spec/rails/matchers/redirect_to_spec.rb +4 -0
data/spec/spec/rails/matchers/render_template_spec.rb +7 -3
data/spec/spec/rails/spec_server_spec.rb +96 -96
metadata +7 -6
data/spec/spec/rails/matchers/description_generation_spec.rb +0 -37
/data/spec/resources/views/render_spec/{some_action.rhtml → some_action.html.erb} +0 -0

data/History.txt CHANGED Viewed

@@ -1,5 +1,10 @@
 === Maintenance
+* 2 deprecations
+  * TestResponse#[] is deprecated if you're using Rails <= 2.2.x and removed if you're using Rails 2.3
+  * add_stubs(model, {:method => value}) is deprecated. Use model.stub!(:method => value) instead.
 * 2 major enhancements
   * support controller and action path params in view specs (Mike Vincent).
@@ -11,12 +16,13 @@
   * 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.
-* 4 bug fixes
+* 5 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.
   * config.gem 'rspec' can't be unpacked. Closes #629.
+  * spec_server not working with Rails 2.2.2 (Andreas Wolff). Closes #631.
 === Version 1.1.11 / 2008-10-24

data/Manifest.txt CHANGED Viewed

@@ -3,6 +3,7 @@ License.txt
 Manifest.txt
 README.txt
 Rakefile
+TODO.txt
 features/step_definitions/people.rb
 features/support/env.rb
 features/transactions/transactions_should_rollback.feature
@@ -95,8 +96,8 @@ 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.html.erb
 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
@@ -144,7 +145,6 @@ spec/spec/rails/extensions/active_record_spec.rb
 spec/spec/rails/interop/testcase_spec.rb
 spec/spec/rails/matchers/ar_be_valid_spec.rb
 spec/spec/rails/matchers/assert_select_spec.rb
-spec/spec/rails/matchers/description_generation_spec.rb
 spec/spec/rails/matchers/errors_on_spec.rb
 spec/spec/rails/matchers/have_text_spec.rb
 spec/spec/rails/matchers/include_text_spec.rb

data/Rakefile CHANGED Viewed

@@ -20,7 +20,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.4"]]
+  p.extra_deps = [["rspec","1.1.11.5"]]
   p.extra_dev_deps = [["cucumber",">= 0.1.13"]]
   p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
 end
@@ -44,10 +44,6 @@ task :release => [:clean, :package] do |t|
   end
 end
-task :spec do
-  system "spec spec"
-end
 Spec::Rake::SpecTask.new
 Cucumber::Rake::Task.new

data/TODO.txt ADDED Viewed

	@@ -0,0 +1 @@
1	+ As of Rails a14bbd7a8574c3b485d4b71e0950b2b9ff4e90d7, cookies are managed differently.

data/generators/rspec/templates/script/spec_server CHANGED Viewed

@@ -13,17 +13,21 @@ module Spec
       def run(argv, stderr, stdout)
         $stdout = stdout
         $stderr = stderr
-        base = ActiveRecord::Base
-        def base.clear_reloadable_connections!
-          active_connections.each do |name, conn|
-            if conn.requires_reloading?
-              conn.disconnect!
-              active_connections.delete(name)
+        unless ActiveRecord::Base.respond_to?(:clear_reloadable_connections!)
+          base = ActiveRecord::Base
+          def base.clear_reloadable_connections!
+            active_connections.each do |name, conn|
+              if conn.requires_reloading?
+                conn.disconnect!
+                active_connections.delete(name)
+              end
             end
           end
         end
+        ActiveRecord::Base.clear_reloadable_connections!
         if ActionController.const_defined?(:Dispatcher)
           dispatcher = ::ActionController::Dispatcher.new($stdout)
           dispatcher.cleanup_application
@@ -35,8 +39,13 @@ module Spec
         if Object.const_defined?(:Fixtures) && Fixtures.respond_to?(:reset_cache)
           Fixtures.reset_cache
         end
+        if ::ActiveSupport.const_defined?(:Dependencies)
+          ::ActiveSupport::Dependencies.mechanism = :load
+        else
+          ::Dependencies.mechanism = :load
+        end
-        ::Dependencies.mechanism = :load
         require_dependency('application.rb') unless Object.const_defined?(:ApplicationController)
         load File.dirname(__FILE__) + '/../spec/spec_helper.rb'

data/lib/spec/rails/example/cookies_proxy.rb CHANGED Viewed

@@ -9,7 +9,11 @@ module Spec
         end
         def[]=(name, value)
-          @example.request.cookies[name.to_s] = CGI::Cookie.new(name.to_s, value)
+          if ::Rails::VERSION::STRING >= '2.3'
+            @example.request.cookies[name.to_s] = value
+          else
+            @example.request.cookies[name.to_s] = CGI::Cookie.new(name.to_s, value)
+          end
         end
         def [](name)

data/lib/spec/rails/example/functional_example_group.rb CHANGED Viewed

@@ -44,11 +44,23 @@ module Spec
         #   post :login
         #   cookies[:login].expires.should == 1.week.from_now
         #
-        # == Examples (Rails >= 2.0.0 only)
+        # == Examples (Rails 2.0 > 2.2)
         #
         #   cookies[:user_id] = {:value => '1234', :expires => 1.minute.ago}
         #   get :index
         #   response.should be_redirect
+        #
+        # == Examples (Rails 2.3)
+        #
+        # Rails 2.3 changes the way cookies are made available to functional
+        # tests (and therefore rspec controller specs), only making single
+        # values available with no access to other aspects of the cookie. This
+        # is backwards-incompatible, so you have to change your examples to
+        # look like this:
+        #
+        #   cookies[:foo] = 'bar'
+        #   get :index
+        #   cookies[:foo].should == 'bar'
         def cookies
           @cookies ||= Spec::Rails::Example::CookiesProxy.new(self)
         end

data/lib/spec/rails/extensions/action_controller/base.rb CHANGED Viewed

@@ -2,7 +2,7 @@ module ActionController
   class Base
     class << self
       def set_view_path(path)
-        [:append_view_path, :view_paths=, :template_root=].each do |method|
+        [:append_view_path, :template_root=].each do |method|
           if respond_to?(method)
             return send(method, path)
           end

data/lib/spec/rails/extensions/action_controller/test_response.rb CHANGED Viewed

@@ -5,7 +5,16 @@ module ActionController #:nodoc:
     def capture(name)
       template.instance_variable_get "@content_for_#{name.to_s}"
     end
-    alias [] capture
+    if ::Rails::VERSION::STRING < "2.3"
+      def [](name)
+        Kernel.warn <<-WARNING
+[](name) as an alias for capture(name) (TestResponse extension in rspec-rails)
+is deprecated and will be removed in the rspec-rails release that follows the
+rails-2.3.0 release.
+WARNING
+        capture(name)
+      end
+    end
   end
 end

data/lib/spec/rails/extensions/active_record/base.rb CHANGED Viewed

@@ -1,8 +1,7 @@
 if defined?(ActiveRecord::Base)
   module ActiveRecord #:nodoc:
     class Base
-      (class << self; self; end).class_eval do
+      class << self
         # Extension for <tt>should have</tt> on AR Model classes
         #
         #   ModelClass.should have(:no).records

data/lib/spec/rails/matchers/redirect_to.rb CHANGED Viewed

@@ -74,13 +74,15 @@ module Spec
         end
         def description
-          "redirect to #{@actual.inspect}"
+          "redirect to #{@expected.inspect}"
         end
         class QueryParameterParser
           def self.parse_query_parameters(query, request)
             if defined?(CGIMethods)
               CGIMethods.parse_query_parameters(query)
+            elsif defined?(ActionController::RequestParser)
+              ActionController::RequestParser.parse_query_parameters(query)
             else
               request.class.parse_query_parameters(query)
             end

data/lib/spec/rails/mocks.rb CHANGED Viewed

@@ -104,21 +104,24 @@ module Spec
               model[k] = stubs.delete(k)
             end
           end
-          add_stubs(model, stubs)
+          model.stub!(stubs)
           yield model if block_given?
         end
       end
-      #--
-      # TODO - Shouldn't this just be an extension of stub! ??
-      # - object.stub!(:method => return_value, :method2 => return_value2, :etc => etc)
-      #++
+      # DEPRECATED - use object.stub!(:method => value, :method2 => value)
+      #
       # Stubs methods on +object+ (if +object+ is a symbol or string a new mock
       # with that name will be created). +stubs+ is a Hash of +method=>value+
       def add_stubs(object, stubs = {}) #:nodoc:
-        m = [String, Symbol].index(object.class) ? mock(object.to_s) : object
-        stubs.each {|k,v| m.stub!(k).and_return(v)}
-        m
+        Kernel.warn <<-WARNING
+DEPRECATION NOTICE: add_stubs is deprecated and will be removed
+from a future version of rspec-rails. Use this instead:
+  object.stub!(:method => value, :method2 => value)
+WARNING
+        object.stub!(stubs)
       end
       private

data/lib/spec/rails/version.rb CHANGED Viewed

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

data/rspec-rails.gemspec CHANGED Viewed

@@ -2,35 +2,35 @@
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "1.1.11.4"
+  s.version = "1.1.11.5"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["RSpec Development Team"]
-  s.date = %q{2008-12-29}
+  s.date = %q{2009-01-04}
   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", "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/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_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/spec/matchers/have.rb", "lib/spec/rails/extensions/spec/runner/configuration.rb", "lib/spec/rails/interop/testcase.rb", "lib/spec/rails/matchers.rb", "lib/spec/rails/matchers/ar_be_valid.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/autotest/mappings_spec.rb", "spec/rails_suite.rb", "spec/resources/controllers/action_view_base_spec_controller.rb", "spec/resources/controllers/application.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/models/animal.rb", "spec/resources/models/person.rb", "spec/resources/models/thing.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/rails/example/assigns_hash_proxy_spec.rb", "spec/spec/rails/example/configuration_spec.rb", "spec/spec/rails/example/controller_isolation_spec.rb", "spec/spec/rails/example/controller_spec_spec.rb", "spec/spec/rails/example/cookies_proxy_spec.rb", "spec/spec/rails/example/example_group_factory_spec.rb", "spec/spec/rails/example/helper_spec_spec.rb", "spec/spec/rails/example/model_spec_spec.rb", "spec/spec/rails/example/shared_behaviour_spec.rb", "spec/spec/rails/example/test_unit_assertion_accessibility_spec.rb", "spec/spec/rails/example/view_spec_spec.rb", "spec/spec/rails/extensions/action_controller_rescue_action_spec.rb", "spec/spec/rails/extensions/action_view_base_spec.rb", "spec/spec/rails/extensions/active_record_spec.rb", "spec/spec/rails/interop/testcase_spec.rb", "spec/spec/rails/matchers/ar_be_valid_spec.rb", "spec/spec/rails/matchers/assert_select_spec.rb", "spec/spec/rails/matchers/description_generation_spec.rb", "spec/spec/rails/matchers/errors_on_spec.rb", "spec/spec/rails/matchers/have_text_spec.rb", "spec/spec/rails/matchers/include_text_spec.rb", "spec/spec/rails/matchers/redirect_to_spec.rb", "spec/spec/rails/matchers/render_template_spec.rb", "spec/spec/rails/matchers/should_change_spec.rb", "spec/spec/rails/mocks/ar_classes.rb", "spec/spec/rails/mocks/mock_model_spec.rb", "spec/spec/rails/mocks/stub_model_spec.rb", "spec/spec/rails/sample_modified_fixture.rb", "spec/spec/rails/sample_spec.rb", "spec/spec/rails/spec_server_spec.rb", "spec/spec/rails/spec_spec.rb", "spec/spec_helper.rb"]
+  s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "TODO.txt", "generators/rspec/templates/previous_failures.txt"]
+  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "Rakefile", "TODO.txt", "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/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_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/spec/matchers/have.rb", "lib/spec/rails/extensions/spec/runner/configuration.rb", "lib/spec/rails/interop/testcase.rb", "lib/spec/rails/matchers.rb", "lib/spec/rails/matchers/ar_be_valid.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/autotest/mappings_spec.rb", "spec/rails_suite.rb", "spec/resources/controllers/action_view_base_spec_controller.rb", "spec/resources/controllers/application.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/models/animal.rb", "spec/resources/models/person.rb", "spec/resources/models/thing.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.html.erb", "spec/resources/views/render_spec/some_action.js.rjs", "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/rails/example/assigns_hash_proxy_spec.rb", "spec/spec/rails/example/configuration_spec.rb", "spec/spec/rails/example/controller_isolation_spec.rb", "spec/spec/rails/example/controller_spec_spec.rb", "spec/spec/rails/example/cookies_proxy_spec.rb", "spec/spec/rails/example/example_group_factory_spec.rb", "spec/spec/rails/example/helper_spec_spec.rb", "spec/spec/rails/example/model_spec_spec.rb", "spec/spec/rails/example/shared_behaviour_spec.rb", "spec/spec/rails/example/test_unit_assertion_accessibility_spec.rb", "spec/spec/rails/example/view_spec_spec.rb", "spec/spec/rails/extensions/action_controller_rescue_action_spec.rb", "spec/spec/rails/extensions/action_view_base_spec.rb", "spec/spec/rails/extensions/active_record_spec.rb", "spec/spec/rails/interop/testcase_spec.rb", "spec/spec/rails/matchers/ar_be_valid_spec.rb", "spec/spec/rails/matchers/assert_select_spec.rb", "spec/spec/rails/matchers/errors_on_spec.rb", "spec/spec/rails/matchers/have_text_spec.rb", "spec/spec/rails/matchers/include_text_spec.rb", "spec/spec/rails/matchers/redirect_to_spec.rb", "spec/spec/rails/matchers/render_template_spec.rb", "spec/spec/rails/matchers/should_change_spec.rb", "spec/spec/rails/mocks/ar_classes.rb", "spec/spec/rails/mocks/mock_model_spec.rb", "spec/spec/rails/mocks/stub_model_spec.rb", "spec/spec/rails/sample_modified_fixture.rb", "spec/spec/rails/sample_spec.rb", "spec/spec/rails/spec_server_spec.rb", "spec/spec/rails/spec_spec.rb", "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.4}
+  s.summary = %q{rspec-rails 1.1.11.5}
   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.4"])
+      s.add_runtime_dependency(%q<rspec>, ["= 1.1.11.5"])
       s.add_development_dependency(%q<cucumber>, [">= 0.1.13"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.2"])
     else
-      s.add_dependency(%q<rspec>, ["= 1.1.11.4"])
+      s.add_dependency(%q<rspec>, ["= 1.1.11.5"])
     end
   else
-    s.add_dependency(%q<rspec>, ["= 1.1.11.4"])
+    s.add_dependency(%q<rspec>, ["= 1.1.11.5"])
   end
 end

data/spec/resources/controllers/controller_spec_controller.rb CHANGED Viewed

@@ -6,12 +6,8 @@ class ControllerSpecController < ActionController::Base
   end
   skip_before_filter :raise_error
-  if ['edge','2.0.0'].include?(ENV['RSPEC_RAILS_VERSION'])
-    set_view_path [File.join(File.dirname(__FILE__), "..", "views")]
-  else
-    set_view_path File.join(File.dirname(__FILE__), "..", "views")
-  end
+  set_view_path File.join(File.dirname(__FILE__), "..", "views")
   def some_action
     render :template => "template/that/does/not/actually/exist"

data/spec/spec/rails/example/controller_isolation_spec.rb CHANGED Viewed

@@ -34,12 +34,10 @@ describe "a controller spec running in integration mode", :type => :controller d
   it "should choke if the template doesn't exist" do
     error = defined?(ActionController::MissingTemplate) ? ActionController::MissingTemplate : ActionView::MissingTemplate
     lambda { get 'some_action' }.should raise_error(error)
-    response.should_not be_success
   end
   it "should choke if the template has errors" do
     lambda { get 'action_with_errors_in_template' }.should raise_error(ActionView::TemplateError)
-    response.should_not be_success
   end
   describe "nested" do

data/spec/spec/rails/example/controller_spec_spec.rb CHANGED Viewed

@@ -144,12 +144,20 @@ require 'controller_spec_controller'
       it "should support a Symbol key" do
         get 'action_which_sets_cookie', :value => "cookie value"
-        cookies[:cookie_key].value.should == ["cookie value"]
+        if Rails::VERSION::STRING >= "2.3"
+          cookies[:cookie_key].should == "cookie+value"
+        else
+          cookies[:cookie_key].should == ["cookie value"]
+        end
       end
       it "should support a String key" do
         get 'action_which_sets_cookie', :value => "cookie value"
-        cookies['cookie_key'].value.should == ["cookie value"]
+        if Rails::VERSION::STRING >= "2.3"
+          cookies['cookie_key'].should == "cookie+value"
+        else
+          cookies['cookie_key'].should == ["cookie value"]
+        end
       end
     end

data/spec/spec/rails/example/cookies_proxy_spec.rb CHANGED Viewed

@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 class CookiesProxyExamplesController < ActionController::Base
   def index
     cookies[:key] = cookies[:key]
+    render :text => ""
   end
 end
@@ -18,18 +19,26 @@ module Spec
             cookies = CookiesProxy.new(self)
             cookies['key'] = 'value'
             get :index
-            cookies['key'].should == ['value']
+            if ::Rails::VERSION::STRING >= "2.3"
+              cookies['key'].should == 'value'
+            else
+              cookies['key'].should == ['value']
+            end
           end
-          if Rails::VERSION::STRING >= "2.0.0"
+          if ::Rails::VERSION::STRING >= "2.0.0"
             it "should accept a Hash value" do
               cookies = CookiesProxy.new(self)
               cookies['key'] = { :value => 'value', :expires => expiration = 1.hour.from_now, :path => path = '/path' }
               get :index
-              cookies['key'].should == ['value']
-              cookies['key'].value.should == ['value']
-              cookies['key'].expires.should == expiration
-              cookies['key'].path.should == path
+              if ::Rails::VERSION::STRING >= "2.3"
+                cookies['key'].should == 'value'
+              else
+                cookies['key'].should == ['value']
+                cookies['key'].value.should == ['value']
+                cookies['key'].expires.should == expiration
+                cookies['key'].path.should == path
+              end
             end
           end
@@ -41,18 +50,26 @@ module Spec
             example_cookies = CookiesProxy.new(self)
             example_cookies[:key] = 'value'
             get :index
-            example_cookies[:key].should == ['value']
+            if ::Rails::VERSION::STRING >= "2.3"
+              example_cookies[:key].should == 'value'
+            else
+              example_cookies[:key].should == ['value']
+            end
           end
-          if Rails::VERSION::STRING >= "2.0.0"
+          if ::Rails::VERSION::STRING >= "2.0.0"
             it "should accept a Hash value" do
               example_cookies = CookiesProxy.new(self)
               example_cookies[:key] = { :value => 'value', :expires => expiration = 1.hour.from_now, :path => path = '/path' }
               get :index
-              example_cookies[:key].should == ['value']
-              example_cookies[:key].value.should == ['value']
-              example_cookies[:key].expires.should == expiration
-              example_cookies[:key].path.should == path
+              if ::Rails::VERSION::STRING >= "2.3"
+                example_cookies[:key].should == 'value'
+              else
+                example_cookies[:key].should == ['value']
+                example_cookies[:key].value.should == ['value']
+                example_cookies[:key].expires.should == expiration
+                example_cookies[:key].path.should == path
+              end
             end
           end

data/spec/spec/rails/matchers/redirect_to_spec.rb CHANGED Viewed

@@ -204,6 +204,10 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
         response.should redirect_to(route)
       }.should raise_error(ActionController::RoutingError, /(no route found to match|No route matches) \"\/nonexistant\/none\" with \{\}/)
     end
+    it "provides a description" do
+      redirect_to("foo/bar").description.should == %q|redirect to "foo/bar"|
+    end
   end
 end

data/spec/spec/rails/matchers/render_template_spec.rb CHANGED Viewed

@@ -51,14 +51,14 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
       post 'some_action'
       lambda do
         response.should render_template('non_existent_template')
-      end.should fail_with(/expected \"non_existent_template\", got \"render_spec\/some_action(.rhtml)?\"/)
+      end.should fail_with(/expected \"non_existent_template\", got \"render_spec\/some_action(\.html\.erb)?\"/)
     end
     it "should fail without full path when template is associated with a different controller" do
       post 'action_which_renders_template_from_other_controller'
       lambda do
         response.should render_template('action_with_template')
-      end.should fail_with(/expected \"action_with_template\", got \"controller_spec\/action_with_template(.rhtml)?\"/)
+      end.should fail_with(/expected \"action_with_template\", got \"controller_spec\/action_with_template(\.rhtml)?\"/)
     end
     it "should fail with incorrect full path when template is associated with a different controller" do
@@ -72,7 +72,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
       get 'some_action'
       lambda {
         response.should render_template('render_spec/some_action.rjs')
-      }.should fail_with(/expected \"render_spec\/some_action\.rjs\", got \"render_spec\/some_action(\.rhtml)?\"/)
+      }.should fail_with(/expected \"render_spec\/some_action\.rjs\", got \"render_spec\/some_action(\.html\.erb)?\"/)
     end
     it "should fail when TEXT is rendered" do
@@ -88,6 +88,10 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
         response.should render_template('action_with_alternate_layout')
       end
     end
+    it "provides a description" do
+      render_template("foo/bar").description.should == %q|render template "foo/bar"|
+    end
   end
   describe "response.should_not render_template (in #{mode} mode)",

data/spec/spec/rails/spec_server_spec.rb CHANGED Viewed

@@ -1,96 +1,96 @@
-# require File.dirname(__FILE__) + '/../../spec_helper'
-#
-# describe "script/spec_server file", :shared => true do
-#   attr_accessor :tmbundle_install_directory
-#   attr_reader :animals_yml_path, :original_animals_content
-#
-#   before do
-#     @animals_yml_path = File.expand_path("#{RAILS_ROOT}/spec/fixtures/animals.yml")
-#     @original_animals_content = File.read(animals_yml_path)
-#   end
-#
-#   after do
-#     File.open(animals_yml_path, "w") do |f|
-#       f.write original_animals_content
-#     end
-#   end
-#
-#   after(:each) do
-#     system "lsof -i tcp:8989 | sed /COMMAND/d | awk '{print $2}' | xargs kill"
-#   end
-#
-#   it "runs a spec" do
-#     dir = File.dirname(__FILE__)
-#     output = ""
-#     Timeout.timeout(10) do
-#       loop do
-#         output = `#{RAILS_ROOT}/script/spec #{dir}/sample_spec.rb --drb 2>&1`
-#         break unless output.include?("No server is running")
-#       end
-#     end
-#
-#     if $?.exitstatus != 0 || output !~ /0 failures/
-#       flunk "command 'script/spec spec/sample_spec' failed\n#{output}"
-#     end
-#
-#     fixtures = YAML.load(@original_animals_content)
-#     fixtures['pig']['name'] = "Piggy"
-#
-#     File.open(animals_yml_path, "w") do |f|
-#       f.write YAML.dump(fixtures)
-#     end
-#
-#     Timeout.timeout(10) do
-#       loop do
-#         output = `#{RAILS_ROOT}/script/spec #{dir}/sample_modified_fixture.rb --drb 2>&1`
-#         break unless output.include?("No server is running")
-#       end
-#     end
-#
-#     if $?.exitstatus != 0 || output !~ /0 failures/
-#       flunk "command 'script/spec spec/sample_modified_fixture' failed\n#{output}"
-#     end
-#   end
-#
-#   def start_spec_server
-#     dir = File.dirname(__FILE__)
-#     Thread.start do
-#       system "cd #{RAILS_ROOT}; script/spec_server"
-#     end
-#
-#     file_content = ""
-#   end
-# end
-#
-# describe "script/spec_server file without TextMate bundle" do
-#   it_should_behave_like "script/spec_server file"
-#   before(:each) do
-#     start_spec_server
-#   end
-# end
-#
-# describe "script/spec_server file with TextMate bundle" do
-#   it_should_behave_like "script/spec_server file"
-#   before(:each) do
-#     dir = File.dirname(__FILE__)
-#     @tmbundle_install_directory = File.expand_path("#{Dir.tmpdir}/Library/Application Support/TextMate/Bundles")
-#     @bundle_name = "RSpec.tmbundle"
-#     FileUtils.mkdir_p(tmbundle_install_directory)
-#     bundle_dir = File.expand_path("#{dir}/../../../../../../#{@bundle_name}")
-#     File.directory?(bundle_dir).should be_true
-#     unless system(%Q|ln -s #{bundle_dir} "#{tmbundle_install_directory}"|)
-#       raise "Creating link to Textmate Bundle"
-#     end
-#     start_spec_server
-#   end
-#
-#   after(:each) do
-#     bundle_file_to_remove = "#{tmbundle_install_directory}/#{@bundle_name}"
-#     if bundle_file_to_remove == "/"
-#       raise "bundle file path resolved to '/' - could not call rm"
-#     end
-#     unless system(%Q|rm "#{bundle_file_to_remove}"|)
-#       raise "Removing Textmate bundle link failed"
-#     end
-#   end
-# end
+require File.dirname(__FILE__) + '/../../spec_helper'
+describe "script/spec_server file", :shared => true do
+  attr_accessor :tmbundle_install_directory
+  attr_reader :animals_yml_path, :original_animals_content
+  before do
+    @animals_yml_path = File.expand_path("#{RAILS_ROOT}/spec/fixtures/animals.yml")
+    @original_animals_content = File.read(animals_yml_path)
+  end
+  after do
+    File.open(animals_yml_path, "w") do |f|
+      f.write original_animals_content
+    end
+  end
+  after(:each) do
+    system "lsof -i tcp:8989 | sed /COMMAND/d | awk '{print $2}' | xargs kill"
+  end
+  it "runs a spec" do
+    dir = File.expand_path(File.dirname(__FILE__))
+    output = ""
+    Timeout.timeout(10) do
+      loop do
+        output = `#{RAILS_ROOT}/script/spec #{dir}/sample_spec.rb --drb 2>&1`
+        break unless output.include?("No server is running")
+      end
+    end
+    if $?.exitstatus != 0 || output !~ /0 failures/
+      flunk "command 'script/spec spec/sample_spec' failed\n#{output}"
+    end
+    fixtures = YAML.load(@original_animals_content)
+    fixtures['pig']['name'] = "Piggy"
+    File.open(animals_yml_path, "w") do |f|
+      f.write YAML.dump(fixtures)
+    end
+    Timeout.timeout(10) do
+      loop do
+        output = `#{RAILS_ROOT}/script/spec #{dir}/sample_modified_fixture.rb --drb 2>&1`
+        break unless output.include?("No server is running")
+      end
+    end
+    if $?.exitstatus != 0 || output !~ /0 failures/
+      flunk "command 'script/spec spec/sample_modified_fixture' failed\n#{output}"
+    end
+  end
+  def start_spec_server
+    dir = File.dirname(__FILE__)
+    Thread.start do
+      system "cd #{RAILS_ROOT}; script/spec_server"
+    end
+    file_content = ""
+  end
+end
+describe "script/spec_server file without TextMate bundle" do
+  it_should_behave_like "script/spec_server file"
+  before(:each) do
+    start_spec_server
+  end
+end
+describe "script/spec_server file with TextMate bundle" do
+  it_should_behave_like "script/spec_server file"
+  before(:each) do
+    dir = File.dirname(__FILE__)
+    @tmbundle_install_directory = File.expand_path("#{Dir.tmpdir}/Library/Application Support/TextMate/Bundles")
+    @bundle_name = "RSpec.tmbundle"
+    FileUtils.mkdir_p(tmbundle_install_directory)
+    bundle_dir = File.expand_path("#{dir}/../../../../../../#{@bundle_name}")
+    File.directory?(bundle_dir).should be_true
+    unless system(%Q|ln -s #{bundle_dir} "#{tmbundle_install_directory}"|)
+      raise "Creating link to Textmate Bundle"
+    end
+    start_spec_server
+  end
+  after(:each) do
+    bundle_file_to_remove = "#{tmbundle_install_directory}/#{@bundle_name}"
+    if bundle_file_to_remove == "/"
+      raise "bundle file path resolved to '/' - could not call rm"
+    end
+    unless system(%Q|rm "#{bundle_file_to_remove}"|)
+      raise "Removing Textmate bundle link failed"
+    end
+  end
+end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dchelimsky-rspec-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.11.4
+  version: 1.1.11.5
 platform: ruby
 authors:
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2008-12-29 00:00:00 -08:00
+date: 2009-01-04 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.4
+        version: 1.1.11.5
     version:
 description: Behaviour Driven Development for Ruby on Rails.
 email:
@@ -33,6 +33,7 @@ extra_rdoc_files:
 - License.txt
 - Manifest.txt
 - README.txt
+- TODO.txt
 - generators/rspec/templates/previous_failures.txt
 files:
 - History.txt
@@ -40,6 +41,7 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- TODO.txt
 - features/step_definitions/people.rb
 - features/support/env.rb
 - features/transactions/transactions_should_rollback.feature
@@ -132,8 +134,8 @@ files:
 - 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.html.erb
 - 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
@@ -181,7 +183,6 @@ files:
 - spec/spec/rails/interop/testcase_spec.rb
 - spec/spec/rails/matchers/ar_be_valid_spec.rb
 - spec/spec/rails/matchers/assert_select_spec.rb
-- spec/spec/rails/matchers/description_generation_spec.rb
 - spec/spec/rails/matchers/errors_on_spec.rb
 - spec/spec/rails/matchers/have_text_spec.rb
 - spec/spec/rails/matchers/include_text_spec.rb
@@ -222,6 +223,6 @@ rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key:
 specification_version: 2
-summary: rspec-rails 1.1.11.4
+summary: rspec-rails 1.1.11.5
 test_files: []

data/spec/spec/rails/matchers/description_generation_spec.rb DELETED Viewed

@@ -1,37 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-class DescriptionGenerationSpecController < ActionController::Base
-  def render_action
-  end
-  def redirect_action
-    redirect_to :action => :render_action
-  end
-end
-describe "Description generation", :type => :controller do
-  controller_name :description_generation_spec
-  after(:each) do
-    Spec::Matchers.clear_generated_description
-  end
-  it "should generate description for render_template" do
-    get 'render_action'
-    response.should render_template("render_action")
-    Spec::Matchers.generated_description.should == "should render template \"render_action\""
-  end
-  it "should generate description for render_template with full path" do
-    get 'render_action'
-    response.should render_template("description_generation_spec/render_action")
-    Spec::Matchers.generated_description.should == "should render template \"description_generation_spec/render_action\""
-  end
-  it "should generate description for redirect_to" do
-    get 'redirect_action'
-    response.should redirect_to("http://test.host/description_generation_spec/render_action")
-    Spec::Matchers.generated_description.should == "should redirect to \"http://test.host/description_generation_spec/render_action\""
-  end
-end

/data/spec/resources/views/render_spec/{some_action.rhtml → some_action.html.erb} RENAMED Viewed

File without changes