dchelimsky-rspec-rails 1.1.99.7 → 1.1.99.8

data/History.txt

@@ -1,4 +1,4 @@
-=== Version 1.1.99.4 (in git)
+=== Version 1.1.99.x (in git)
 
 IMPORTANT: See Upgrade.markdown for information about upgrading to rspec-rails-1.1.99.4
 
@@ -34,6 +34,7 @@ IMPORTANT: This release includes the following backwards-compatibility-breaking
   * generated specs use declarative docstrings
   * rspec_scaffold generator generates layout and stylesheet (per Rails-2.3)
   * add bypass_rescue for controller specs
+  * infer template path from the first arg passed to describe in view specs
   
 * bug fixes
 
@@ -45,6 +46,7 @@ IMPORTANT: This release includes the following backwards-compatibility-breaking
   * support 2 arg version of ActionController::Base#render (reported by Nathan Wilmes)
   * rake spec:server:start doesn't choke if there is no tmp directory
   * force cache_classes = false when running with spec_server. Closes #287.
+  * keep spec_server working against edge rails (Jonathan Tron). Closes #685.
 
 === Version 1.1.12 / 2009-01-11
 

data/Rakefile

@@ -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 = [["dchelimsky-rspec","1.1.99.7"],["rack",">=0.4.0"]]
+  p.extra_deps = [["rspec","1.1.99.8"],["rack",">=0.4.0"]]
   p.extra_dev_deps = [["cucumber",">= 0.1.13"]]
   p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
 end

data/Upgrade.markdown

@@ -14,6 +14,7 @@ This release supports the following versions of rails:
 Be sure to run "script/generate rspec" and allow the following files to be overwritten:
 
 * lib/tasks/rspec.rake
+* script/spec
 * script/spec_server
 
 ## controller.use\_rails\_error\_handling! is deprecated

data/generators/rspec_scaffold/templates/edit_erb_spec.rb

@@ -14,7 +14,7 @@ describe "/<%= table_name %>/edit.<%= default_file_extension %>" do
   end
 
   it "renders the edit <%= file_name %> form" do
-    render "/<%= table_name %>/edit.<%= default_file_extension %>"
+    render
     
     response.should have_tag("form[action=#{<%= file_name %>_path(@<%= file_name %>)}][method=post]") do
 <% for attribute in output_attributes -%>

data/generators/rspec_scaffold/templates/index_erb_spec.rb

@@ -19,7 +19,7 @@ describe "/<%= table_name %>/index.<%= default_file_extension %>" do
   end
 
   it "renders a list of <%= table_name %>" do
-    render "/<%= table_name %>/index.<%= default_file_extension %>"
+    render
 <% for attribute in output_attributes -%>
     response.should have_tag("tr>td", <%= attribute.default_value %>.to_s, 2)
 <% end -%>

data/generators/rspec_scaffold/templates/new_erb_spec.rb

@@ -14,7 +14,7 @@ describe "/<%= table_name %>/new.<%= default_file_extension %>" do
   end
 
   it "renders new <%= file_name %> form" do
-    render "/<%= table_name %>/new.<%= default_file_extension %>"
+    render
     
     response.should have_tag("form[action=?][method=post]", <%= table_name %>_path) do
 <% for attribute in output_attributes -%>

data/generators/rspec_scaffold/templates/show_erb_spec.rb

@@ -14,7 +14,7 @@ describe "/<%= table_name %>/show.<%= default_file_extension %>" do
   end
 
   it "renders attributes in <p>" do
-    render "/<%= table_name %>/show.<%= default_file_extension %>"
+    render
 <% for attribute in output_attributes -%>
     response.should have_text(/<%= Regexp.escape(attribute.default_value).gsub(/^"|"$/, '')%>/)
 <% end -%>

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

@@ -119,8 +119,15 @@ module Spec
         # See Spec::Rails::Example::ViewExampleGroup for more information.
         def render(*args)
           options = Hash === args.last ? args.pop : {}
+          
+          if args.empty? 
+            unless [:partial, :inline, :file, :template, :xml, :json, :update].any? {|k| options.has_key? k} 
+              args << self.class.description_parts.first
+            end
+          end
+          
           options[:template] = args.first.to_s.sub(/^\//,'') unless args.empty?
-
+          
           set_base_view_path(options)
           add_helpers(options)
 

data/lib/spec/rails/spec_server.rb

@@ -53,12 +53,16 @@ module Spec
         
         require 'action_controller/dispatcher'
         dispatcher = ::ActionController::Dispatcher.new($stdout)
-        dispatcher.reload_application
+
+        if ::ActionController::Dispatcher.respond_to?(:reload_application)
+          ::ActionController::Dispatcher.reload_application
+        else
+          dispatcher.reload_application
+        end
         
         if Object.const_defined?(:Fixtures) && Fixtures.respond_to?(:reset_cache)
           Fixtures.reset_cache
         end
-        
 
         unless Object.const_defined?(:ApplicationController)
           %w(application_controller.rb application.rb).each do |name|
@@ -68,8 +72,8 @@ module Spec
         load "#{RAILS_ROOT}/spec/spec_helper.rb"
 
         if in_memory_database?
-          load "#{RAILS_ROOT}/db/schema.rb" # use db agnostic schema by default
-          ActiveRecord::Migrator.up('db/migrate') # use migrations
+          load "#{RAILS_ROOT}/db/schema.rb"
+          ActiveRecord::Migrator.up('db/migrate')
         end
         
         ::Spec::Runner::CommandLine.run(

data/lib/spec/rails/version.rb

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

data/rspec-rails.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "1.1.99.7"
+  s.version = "1.1.99.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["RSpec Development Team"]
-  s.date = %q{2009-02-18}
+  s.date = %q{2009-02-23}
   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", "TODO.txt", "generators/rspec/templates/previous_failures.txt"]
@@ -17,23 +17,23 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.1}
-  s.summary = %q{rspec-rails 1.1.99.7}
+  s.summary = %q{rspec-rails 1.1.99.8}
 
   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<dchelimsky-rspec>, ["= 1.1.99.7"])
+      s.add_runtime_dependency(%q<rspec>, ["= 1.1.99.8"])
       s.add_runtime_dependency(%q<rack>, [">= 0.4.0"])
       s.add_development_dependency(%q<cucumber>, [">= 0.1.13"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.3"])
     else
-      s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.7"])
+      s.add_dependency(%q<rspec>, ["= 1.1.99.8"])
       s.add_dependency(%q<rack>, [">= 0.4.0"])
     end
   else
-    s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.7"])
+    s.add_dependency(%q<rspec>, ["= 1.1.99.8"])
     s.add_dependency(%q<rack>, [">= 0.4.0"])
   end
 end

data/spec/spec/rails/example/view_example_group_spec.rb

@@ -261,6 +261,15 @@ describe "render 'view_spec/foo/show.rhtml'", :type => :view do
   end
 end
 
+describe "view_spec/foo/show.rhtml", :type => :view do
+  context "rendered with no args" do
+    it "renders just fine" do
+      render
+      request.path_parameters[:action].should == 'show'
+    end
+  end
+end
+
 describe "setting path parameters", :type => :view do
   describe "(controller)" do
     it "should supercede the default path parameters" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dchelimsky-rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.1.99.7
+  version: 1.1.99.8
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,18 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-18 00:00:00 -08:00
+date: 2009-02-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dchelimsky-rspec
+  name: rspec
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.99.7
+        version: 1.1.99.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -257,6 +257,6 @@ rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: rspec-rails 1.1.99.7
+summary: rspec-rails 1.1.99.8
 test_files: []