rspec-rails 2.0.0.beta.14.1 → 2.0.0.beta.14.2

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.14.1
+2.0.0.beta.14.2

data/features/controller_specs/isolation_from_views.feature

@@ -16,10 +16,12 @@ Feature: do not render views
           it "renders the index template" do
             get :index
             response.should render_template("index")
+            response.body.should =~ /generated by RSpec/
           end
           it "renders the widgets/index template" do
             get :index
             response.should render_template("widgets/index")
+            response.body.should =~ /generated by RSpec/
           end
         end
       end
@@ -37,6 +39,7 @@ Feature: do not render views
           it "renders the 'new' template" do
             get :index
             response.should render_template("new")
+            response.body.should =~ /generated by RSpec/
           end
         end
       end
@@ -54,6 +57,7 @@ Feature: do not render views
           it "renders the 'new' template" do
             get :index
             response.should contain("foo")
+            response.body.should =~ /generated by RSpec/
           end
         end
       end

data/features/controller_specs/render_views.feature

@@ -51,3 +51,53 @@ Feature: render views
     When I run "rspec spec"
     Then I should see "1 example, 1 failure"
     And I should see "Missing template"
+
+  Scenario: render_views on and off in diff contexts
+    Given a file named "spec/controllers/widgets_controller_spec.rb" with:
+      """
+      require "spec_helper.rb"
+
+      describe WidgetsController do
+        context "with render_views" do
+          render_views
+
+          describe "index" do
+            it "renders the actual template" do
+              get :index
+              response.body.should =~ /Listing widgets/m
+            end
+          end
+        end
+
+        context "without render_views" do
+          describe "index" do
+            it "renders the RSpec generated template" do
+              get :index
+              response.body.should =~ /generated by RSpec/
+            end
+          end
+        end
+
+        context "with render_views again" do
+          render_views
+
+          describe "index" do
+            it "renders the actual template" do
+              get :index
+              response.body.should =~ /Listing widgets/m
+            end
+          end
+        end
+
+        context "without render_views again" do
+          describe "index" do
+            it "renders the RSpec generated template" do
+              get :index
+              response.body.should =~ /generated by RSpec/
+            end
+          end
+        end
+      end
+      """
+    When I run "rspec spec"
+    Then I should see "4 examples, 0 failures"

data/lib/rspec/rails/view_rendering.rb

@@ -16,30 +16,33 @@ module RSpec
         end
 
         def render_views?
-          metadata_for_rspec_rails[:render_views]
+          !!metadata_for_rspec_rails[:render_views]
         end
       end
 
-        # Delegates find_all to the submitted controller's view_paths and then
-        # returns templates with modified source
-        class PathSetDelegatorResolver < ::ActionView::Resolver
-          attr_reader :path_set
+      # Delegates find_all to the submitted path set and then returns templates
+      # with modified source
+      class PathSetDelegatorResolver < ::ActionView::Resolver
+        attr_reader :path_set
 
-          def initialize(path_set)
-            @path_set = path_set
-          end
+        def initialize(path_set)
+          @path_set = path_set
+        end
 
-          def find_all(*args)
-            templates = path_set.find_all(*args)
-            templates.each do |t|
-              t.singleton_class.class_eval do
-                def source
-                  "Template source generated by RSpec."
-                end
-              end
-            end
+        def find_all(*args)
+          path_set.find_all(*args).collect do |template|
+            ::ActionView::Template.new(
+              "Template source generated by RSpec.",
+              template.identifier,
+              template.handler,
+              {
+                :virtual_path => template.virtual_path,
+                :format => template.formats
+              }
+            )
           end
         end
+      end
 
       included do
         before do

data/rspec-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.beta.14.1"
+  s.version = "2.0.0.beta.14.2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-06-27}
+  s.date = %q{2010-06-28}
   s.description = %q{RSpec-2 for Rails-3}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -119,7 +119,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/rspec-rails}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-rails-2.0.0.beta.14.1!
+  Thank you for installing rspec-rails-2.0.0.beta.14.2!
 
   This version of rspec-rails only works with 
   versions of rails >= 3.0.0.pre.
@@ -138,7 +138,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{rspec-rails-2.0.0.beta.14.1}
+  s.summary = %q{rspec-rails-2.0.0.beta.14.2}
   s.test_files = [
     "spec/rspec/rails/example/controller_example_group_spec.rb",
      "spec/rspec/rails/example/helper_example_group_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 124392765
+  hash: 124392763
   prerelease: true
   segments: 
   - 2
@@ -9,8 +9,8 @@ version: !ruby/object:Gem::Version
   - 0
   - beta
   - 14
-  - 1
-  version: 2.0.0.beta.14.1
+  - 2
+  version: 2.0.0.beta.14.2
 platform: ruby
 authors: 
 - David Chelimsky
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-27 00:00:00 -05:00
+date: 2010-06-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -171,7 +171,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.14.1!
+    Thank you for installing rspec-rails-2.0.0.beta.14.2!
   
     This version of rspec-rails only works with 
     versions of rails >= 3.0.0.pre.
@@ -216,7 +216,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.14.1
+summary: rspec-rails-2.0.0.beta.14.2
 test_files: 
 - spec/rspec/rails/example/controller_example_group_spec.rb
 - spec/rspec/rails/example/helper_example_group_spec.rb