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

data/lib/rspec/rails.rb

@@ -1,3 +1,5 @@
+require 'webrat'
+
 require 'rspec/core'
 require 'rspec/rails/monkey'
 require 'rspec/rails/extensions'
@@ -6,5 +8,6 @@ require 'rspec/rails/adapters'
 require 'rspec/rails/matchers'
 require 'rspec/rails/fixture_support'
 require 'rspec/rails/mocks'
+require 'rspec/rails/module_inclusion'
 require 'rspec/rails/example'
 

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

@@ -1,6 +1,3 @@
-require 'action_controller'
-require 'webrat'
-
 module RSpec::Rails
   # Extends ActionController::TestCase::Behavior to work with RSpec.
   #
@@ -75,16 +72,18 @@ module RSpec::Rails
   #     
   module ControllerExampleGroup
     extend ActiveSupport::Concern
+    extend RSpec::Rails::ModuleInclusion
 
     include RSpec::Rails::SetupAndTeardownAdapter
     include RSpec::Rails::TestUnitAssertionAdapter
     include ActionController::TestCase::Behavior
     include RSpec::Rails::ViewRendering
-    include Webrat::Matchers
     include Webrat::Methods
+    include Webrat::Matchers
     include RSpec::Matchers
     include RSpec::Rails::Matchers::RedirectTo
     include RSpec::Rails::Matchers::RenderTemplate
+    include RSpec::Rails::Matchers::RoutingMatchers
 
     module ClassMethods
       def controller_class
@@ -93,7 +92,7 @@ module RSpec::Rails
     end
 
     module InstanceMethods
-      attr_reader :controller
+      attr_reader :controller, :routes
     end
 
     included do
@@ -103,8 +102,6 @@ module RSpec::Rails
       end
     end
 
-    RSpec.configure do |c|
-      c.include self, :example_group => { :file_path => /\bspec\/controllers\// }
-    end
+    RSpec.configure &include_self_when_dir_matches('spec','controllers')
   end
 end

data/lib/rspec/rails/example/helper_example_group.rb

@@ -1,6 +1,4 @@
-require 'action_view'
 require 'rspec/rails/view_assigns'
-require 'webrat'
 
 module RSpec::Rails
   # Extends ActionView::TestCase::Behavior
@@ -28,7 +26,8 @@ module RSpec::Rails
   #   end
   #
   module HelperExampleGroup
-    extend  ActiveSupport::Concern
+    extend ActiveSupport::Concern
+    extend RSpec::Rails::ModuleInclusion
 
     include RSpec::Rails::SetupAndTeardownAdapter
     include RSpec::Rails::TestUnitAssertionAdapter
@@ -62,8 +61,6 @@ module RSpec::Rails
       end
     end
 
-    RSpec.configure do |c|
-      c.include self, :example_group => { :file_path => /\bspec\/helpers\// }
-    end
+    RSpec.configure &include_self_when_dir_matches('spec','helpers')
   end
 end

data/lib/rspec/rails/example/mailer_example_group.rb

@@ -1,12 +1,9 @@
-require 'action_mailer'
-require 'webrat'
-
 module RSpec::Rails
   module MailerExampleGroup
     extend ActiveSupport::Concern
+    extend RSpec::Rails::ModuleInclusion
 
     include ActionMailer::TestCase::Behavior
-
     include Webrat::Matchers
     include RSpec::Matchers
 
@@ -16,8 +13,6 @@ module RSpec::Rails
       end
     end
 
-    RSpec.configure do |c|
-      c.include self, :example_group => { :file_path => /\bspec\/mailers\// }
-    end
+    RSpec.configure &include_self_when_dir_matches('spec','mailers')
   end
 end

data/lib/rspec/rails/example/request_example_group.rb

@@ -1,6 +1,3 @@
-require 'action_dispatch'
-require 'webrat'
-
 module RSpec::Rails
   # Extends ActionDispatch::Integration::Runner to work with RSpec.
   #
@@ -16,6 +13,7 @@ module RSpec::Rails
   #   => delegates to assert_redirected_to(destination)
   module RequestExampleGroup
     extend ActiveSupport::Concern
+    extend RSpec::Rails::ModuleInclusion
 
     include ActionDispatch::Integration::Runner
     include RSpec::Rails::TestUnitAssertionAdapter
@@ -47,8 +45,6 @@ module RSpec::Rails
       end
     end
 
-    RSpec.configure do |c|
-      c.include self, :example_group => { :file_path => /\bspec\/requests\// }
-    end
+    RSpec.configure &include_self_when_dir_matches('spec','requests')
   end
 end

data/lib/rspec/rails/example/routing_example_group.rb

@@ -3,10 +3,11 @@ require "action_dispatch/testing/assertions/routing"
 module RSpec::Rails
   module RoutingExampleGroup
     extend ActiveSupport::Concern
+    extend RSpec::Rails::ModuleInclusion
 
     include RSpec::Rails::TestUnitAssertionAdapter
     include ActionDispatch::Assertions::RoutingAssertions
-    include RSpec::Rails::RoutingSpecMatchers
+    include RSpec::Rails::Matchers::RoutingMatchers
 
     module InstanceMethods
       attr_reader :routes
@@ -18,8 +19,6 @@ module RSpec::Rails
       end
     end
 
-    RSpec.configure do |c|
-      c.include self, :example_group => { :file_path => /\bspec\/routing\// }
-    end
+    RSpec.configure &include_self_when_dir_matches('spec','routing')
   end
 end

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

@@ -1,6 +1,4 @@
-require 'action_view'
 require 'rspec/rails/view_assigns'
-require 'webrat'
 
 module RSpec::Rails
   # Extends ActionView::TestCase::Behavior
@@ -20,7 +18,8 @@ module RSpec::Rails
   #     end
   #   end
   module ViewExampleGroup
-    extend  ActiveSupport::Concern
+    extend ActiveSupport::Concern
+    extend RSpec::Rails::ModuleInclusion
 
     include RSpec::Rails::SetupAndTeardownAdapter
     include RSpec::Rails::TestUnitAssertionAdapter
@@ -108,8 +107,6 @@ module RSpec::Rails
       end
     end
 
-    RSpec.configure do |c|
-      c.include self, :example_group => { :file_path => /\bspec\/views\// }
-    end
+    RSpec.configure &include_self_when_dir_matches('spec','views')
   end
 end

data/lib/rspec/rails/matchers.rb

@@ -7,16 +7,6 @@ module RSpec::Rails
   end
 end
 
-begin
-  require "active_record"
-rescue LoadError
-end
-
-begin
-  require "action_controller"
-rescue LoadError
-end
-
 begin
   require 'test/unit/assertionfailederror'
 rescue LoadError
@@ -30,6 +20,6 @@ end
 
 require 'rspec/rails/matchers/render_template'
 require 'rspec/rails/matchers/redirect_to'
-require 'rspec/rails/matchers/routing_spec_matchers'
+require 'rspec/rails/matchers/routing_matchers'
 require 'rspec/rails/matchers/be_a_new'
 require 'rspec/rails/matchers/have_extension'

data/lib/rspec/rails/matchers/{routing_spec_matchers.rb → routing_matchers.rb}

@@ -1,5 +1,5 @@
-module RSpec::Rails
-  module RoutingSpecMatchers
+module RSpec::Rails::Matchers
+  module RoutingMatchers
     extend RSpec::Matchers::DSL
 
     matcher :route_to do |route_options|

data/lib/rspec/rails/mocks.rb

@@ -22,6 +22,10 @@ module RSpec
         def persisted?
           !!id
         end
+
+        def destroy
+          self.stub(:id) { nil }
+        end
       end
       
       # Creates a mock object instance for a +model_class+ with common
@@ -38,7 +42,13 @@ module RSpec
         m = mock(derived_name, options_and_stubs)
         m.extend InstanceMethods
         m.extend ActiveModel::Conversion
-        m.stub(:errors) { ActiveModel::Errors.new(m) }
+        errors = ActiveModel::Errors.new(m)
+        [:save, :update_attributes].each do |key|
+          if options_and_stubs[key] == false
+            errors.stub(:empty?) { false }
+          end
+        end
+        m.stub(:errors) { errors }
         m.__send__(:__mock_proxy).instance_eval(<<-CODE, __FILE__, __LINE__)
           def @object.is_a?(other)
             #{model_class}.ancestors.include?(other)

data/lib/rspec/rails/module_inclusion.rb

@@ -0,0 +1,11 @@
+module RSpec::Rails
+  module ModuleInclusion
+    def include_self_when_dir_matches(*path_parts)
+      lambda do |c|
+        c.include self, :example_group => {
+          :file_path => Regexp.compile(path_parts.join('[\\\/]'))
+        }
+      end
+    end
+  end
+end

data/lib/rspec/rails/monkey/action_mailer/test_case.rb

@@ -1,69 +1,69 @@
-require 'action_mailer'
+if defined?(ActionMailer)
+  module ActionMailer
+    unless defined?(ActionMailer::TestCase::Behavior)
+      class TestCase < ActiveSupport::TestCase
+        module Behavior
+          extend ActiveSupport::Concern
 
-module ActionMailer
-  unless defined?(ActionMailer::TestCase::Behavior)
-    class TestCase < ActiveSupport::TestCase
-      module Behavior
-        extend ActiveSupport::Concern
+          include TestHelper
 
-        include TestHelper
+          module ClassMethods
+            def tests(mailer)
+              write_inheritable_attribute(:mailer_class, mailer)
+            end
 
-        module ClassMethods
-          def tests(mailer)
-            write_inheritable_attribute(:mailer_class, mailer)
-          end
+            def mailer_class
+              if mailer = read_inheritable_attribute(:mailer_class)
+                mailer
+              else
+                tests determine_default_mailer(name)
+              end
+            end
 
-          def mailer_class
-            if mailer = read_inheritable_attribute(:mailer_class)
-              mailer
-            else
-              tests determine_default_mailer(name)
+            def determine_default_mailer(name)
+              name.sub(/Test$/, '').constantize
+            rescue NameError => e
+              raise NonInferrableMailerError.new(name)
             end
           end
 
-          def determine_default_mailer(name)
-            name.sub(/Test$/, '').constantize
-          rescue NameError => e
-            raise NonInferrableMailerError.new(name)
-          end
-        end
+          module InstanceMethods
 
-        module InstanceMethods
+          protected
 
-        protected
+            def initialize_test_deliveries
+              ActionMailer::Base.delivery_method = :test
+              ActionMailer::Base.perform_deliveries = true
+              ActionMailer::Base.deliveries.clear
+            end
 
-          def initialize_test_deliveries
-            ActionMailer::Base.delivery_method = :test
-            ActionMailer::Base.perform_deliveries = true
-            ActionMailer::Base.deliveries.clear
-          end
+            def set_expected_mail
+              @expected = Mail.new
+              @expected.content_type ["text", "plain", { "charset" => charset }]
+              @expected.mime_version = '1.0'
+            end
 
-          def set_expected_mail
-            @expected = Mail.new
-            @expected.content_type ["text", "plain", { "charset" => charset }]
-            @expected.mime_version = '1.0'
-          end
+          private
 
-        private
+            def charset
+              "UTF-8"
+            end
 
-          def charset
-            "UTF-8"
-          end
+            def encode(subject)
+              Mail::Encodings.q_value_encode(subject, charset)
+            end
 
-          def encode(subject)
-            Mail::Encodings.q_value_encode(subject, charset)
+            def read_fixture(action)
+              IO.readlines(File.join(Rails.root, 'test', 'fixtures', self.class.mailer_class.name.underscore, action))
+            end
           end
 
-          def read_fixture(action)
-            IO.readlines(File.join(Rails.root, 'test', 'fixtures', self.class.mailer_class.name.underscore, action))
+          included do
+            setup :initialize_test_deliveries
+            setup :set_expected_mail
           end
         end
-
-        included do
-          setup :initialize_test_deliveries
-          setup :set_expected_mail
-        end
       end
     end
   end
-end
+end

data/lib/rspec/rails/view_rendering.rb

@@ -1,4 +1,3 @@
-require 'action_controller'
 require 'action_view/testing/resolvers'
 
 module RSpec
@@ -21,17 +20,42 @@ module RSpec
         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
+
+          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
+          end
+        end
+
       included do
         before do
-          @_view_paths = controller.class.view_paths
-          controller.class.view_paths = [ActionView::NullResolver.new()] unless
-            self.class.render_views?
+          unless self.class.render_views?
+            @_path_set_delegator_resolver = PathSetDelegatorResolver.new(@controller.class.view_paths)
+            @controller.class.view_paths = ::ActionView::PathSet.new.push(@_path_set_delegator_resolver)
+          end
         end
-
+        
         after do
-          controller.class.view_paths = @_view_paths
+          unless self.class.render_views?
+            @controller.class.view_paths = @_path_set_delegator_resolver.path_set
+          end
         end
       end
+
     end
   end
 end

data/rspec-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.beta.13"
+  s.version = "2.0.0.beta.14.1"
 
   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-23}
+  s.date = %q{2010-06-27}
   s.description = %q{RSpec-2 for Rails-3}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -25,13 +25,13 @@ Gem::Specification.new do |s|
      "VERSION",
      "autotest/discover.rb",
      "cucumber.yml",
-     "features/controller_specs/do_not_render_views.feature",
+     "features/controller_specs/isolation_from_views.feature",
      "features/controller_specs/readers.feature",
      "features/controller_specs/render_views.feature",
+     "features/matchers/be_routable_matcher.feature",
      "features/matchers/new_record_matcher.feature",
      "features/model_specs/errors_on.feature",
      "features/model_specs/transactional_examples.feature",
-     "features/routing_specs/be_routable_matcher.feature",
      "features/step_definitions/model_steps.rb",
      "features/support/env.rb",
      "features/view_specs/view_spec.feature",
@@ -85,8 +85,9 @@ Gem::Specification.new do |s|
      "lib/rspec/rails/matchers/have_extension.rb",
      "lib/rspec/rails/matchers/redirect_to.rb",
      "lib/rspec/rails/matchers/render_template.rb",
-     "lib/rspec/rails/matchers/routing_spec_matchers.rb",
+     "lib/rspec/rails/matchers/routing_matchers.rb",
      "lib/rspec/rails/mocks.rb",
+     "lib/rspec/rails/module_inclusion.rb",
      "lib/rspec/rails/monkey.rb",
      "lib/rspec/rails/monkey/action_mailer/test_case.rb",
      "lib/rspec/rails/version.rb",
@@ -118,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.13!
+  Thank you for installing rspec-rails-2.0.0.beta.14.1!
 
   This version of rspec-rails only works with 
   versions of rails >= 3.0.0.pre.
@@ -128,13 +129,16 @@ Gem::Specification.new do |s|
 
     script/rails generate rspec:install
 
+  Also, be sure to look at Upgrade.markdown to see 
+  what might have changed since the last release.
+
 **************************************************
 }
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-rails-2.0.0.beta.13}
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{rspec-rails-2.0.0.beta.14.1}
   s.test_files = [
     "spec/rspec/rails/example/controller_example_group_spec.rb",
      "spec/rspec/rails/example/helper_example_group_spec.rb",
@@ -159,15 +163,15 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.13"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.beta.14"])
       s.add_runtime_dependency(%q<webrat>, [">= 0.7.0"])
     else
-      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.13"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.14"])
       s.add_dependency(%q<webrat>, [">= 0.7.0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.13"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.14"])
     s.add_dependency(%q<webrat>, [">= 0.7.0"])
   end
 end