rspec-rails 2.0.0.beta.8 → 2.0.0.beta.9.1

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

@@ -0,0 +1,201 @@
+require 'active_support/core_ext/object/blank'
+require 'action_controller'
+require 'action_controller/test_case'
+require 'action_view'
+
+unless defined?(ActionView::TestCase::Behavior)
+
+
+  # This has been merged to rails HEAD after the 3.0.0.beta.3 release (see
+  # https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/4678).
+  # Once 3.0.0.rc.1 comes out, we can remove it.
+  module ActionView
+
+    # This line is NOT part of the code merged into Rails, but ensures that
+    # we're using the correct code for rails-3.0.0.beta.3
+    remove_const :TestCase 
+
+    class TestCase < ActiveSupport::TestCase
+      class TestController < ActionController::Base
+        include ActionDispatch::TestProcess
+
+        attr_accessor :request, :response, :params
+
+        class << self
+          attr_writer :controller_path
+        end
+
+        def controller_path=(path)
+          self.class.controller_path=(path)
+        end
+
+        def initialize
+          self.class.controller_path = ""
+          @request = ActionController::TestRequest.new
+          @response = ActionController::TestResponse.new
+
+          @request.env.delete('PATH_INFO')
+
+          @params = {}
+        end
+      end
+
+      module Behavior
+        extend ActiveSupport::Concern
+
+        include ActionDispatch::Assertions, ActionDispatch::TestProcess
+        include ActionController::TemplateAssertions
+        include ActionView::Context
+
+        include ActionController::PolymorphicRoutes
+        include ActionController::RecordIdentifier
+
+        include AbstractController::Helpers
+        include ActionView::Helpers
+
+        attr_accessor :controller, :output_buffer, :rendered
+        
+        module ClassMethods
+          def tests(helper_class)
+            self.helper_class = helper_class
+          end
+
+          def determine_default_helper_class(name)
+            mod = name.sub(/Test$/, '').constantize
+            mod.is_a?(Class) ? nil : mod
+          rescue NameError
+            nil
+          end
+
+          def helper_method(*methods)
+            # Almost a duplicate from ActionController::Helpers
+            methods.flatten.each do |method|
+              _helpers.module_eval <<-end_eval
+                def #{method}(*args, &block)                    # def current_user(*args, &block)
+                  _test_case.send(%(#{method}), *args, &block)  #   test_case.send(%(current_user), *args, &block)
+                end                                             # end
+              end_eval
+            end
+          end
+
+          attr_writer :helper_class
+
+          def helper_class
+            @helper_class ||= determine_default_helper_class(name)
+          end
+
+        private
+
+          def include_helper_modules!
+            helper(helper_class) if helper_class
+            include _helpers
+          end
+
+        end
+
+        def setup_with_controller
+          @controller = ActionView::TestCase::TestController.new
+          @output_buffer = ActiveSupport::SafeBuffer.new
+          @rendered = ''
+
+          self.class.send(:include_helper_modules!)
+          make_test_case_available_to_view!
+          say_no_to_protect_against_forgery!
+        end
+
+        def config
+          @controller.config if @controller.respond_to?(:config)
+        end
+
+        def render(options = {}, local_assigns = {}, &block)
+          @rendered << output = _view.render(options, local_assigns, &block)
+          output
+        end
+
+        included do
+          setup :setup_with_controller
+        end
+
+      private
+
+        # Support the selector assertions
+        #
+        # Need to experiment if this priority is the best one: rendered => output_buffer
+        def response_from_page_or_rjs
+          HTML::Document.new(@rendered.blank? ? @output_buffer : @rendered).root
+        end
+
+        def say_no_to_protect_against_forgery!
+          _helpers.module_eval do
+            def protect_against_forgery?
+              false
+            end
+          end
+        end
+
+        def make_test_case_available_to_view!
+          test_case_instance = self
+          _helpers.module_eval do
+            define_method(:_test_case) { test_case_instance }
+            private :_test_case
+          end
+        end
+
+        def _view
+          view = ActionView::Base.new(ActionController::Base.view_paths, _assigns, @controller)
+          view.singleton_class.send :include, _helpers
+          view.singleton_class.send :include, @controller._router.url_helpers
+          view.singleton_class.send :delegate, :alert, :notice, :to => "request.flash"
+          view.output_buffer = self.output_buffer
+          view
+        end
+
+        EXCLUDE_IVARS = %w{
+          @_result
+          @output_buffer
+          @rendered
+          @templates
+          @view_context_class
+          @layouts
+          @partials
+          @controller
+
+          @method_name
+          @fixture_cache
+          @loaded_fixtures
+          @test_passed
+        }
+
+        def _instance_variables
+          instance_variables - EXCLUDE_IVARS
+          instance_variables
+        end
+
+        def _assigns
+          _instance_variables.inject({}) do |hash, var|
+            name = var[1..-1].to_sym
+            hash[name] = instance_variable_get(var)
+            hash
+          end
+        end
+
+        def _router
+          @controller._router if @controller.respond_to?(:_router)
+        end
+
+        def method_missing(selector, *args)
+          if @controller.respond_to?(:_router) &&
+          @controller._router.named_routes.helpers.include?(selector)
+            @controller.__send__(selector, *args)
+          else
+            super
+          end
+        end
+
+      end
+
+      include Behavior
+
+    end
+  end
+end

data/lib/rspec/rails/null_resolver.rb

@@ -0,0 +1,10 @@
+module RSpec
+  module Rails
+    class NullResolver < ActionView::PathResolver
+      def query(path, exts, formats)
+        handler, format = extract_handler_and_format(path, formats)
+        [ActionView::Template.new("RSpec-generated template", path, handler, :virtual_path => path, :format => format)]
+      end
+    end
+  end
+end

data/lib/{generators/rspec/install/templates/lib → rspec/rails}/tasks/rspec.rake

@@ -1,8 +1,8 @@
 begin
   require 'rspec/core'
   require 'rspec/core/rake_task'
-rescue MissingSourceFile 
-  module Rspec
+rescue MissingSourceFile
+  module RSpec
     module Core
       class RakeTask
         def initialize(name)
@@ -36,12 +36,12 @@ task :default => :spec
 task :stats => "spec:statsetup"
 
 desc "Run all specs in spec directory (excluding plugin specs)"
-Rspec::Core::RakeTask.new(:spec => spec_prereq)
+RSpec::Core::RakeTask.new(:spec => spec_prereq)
 
 namespace :spec do
   [:requests, :models, :controllers, :views, :helpers, :mailers, :lib].each do |sub|
     desc "Run the code examples in spec/#{sub}"
-    Rspec::Core::RakeTask.new(sub => spec_prereq) do |t|
+    RSpec::Core::RakeTask.new(sub => spec_prereq) do |t|
       t.pattern = "./spec/#{sub}/**/*_spec.rb"
     end
   end
@@ -66,4 +66,3 @@ namespace :spec do
     ::CodeStatistics::TEST_TYPES << "Request specs" if File.exist?('spec/requests')
   end
 end
-

data/lib/rspec/rails/transactional_database_support.rb

@@ -1,6 +1,4 @@
-require 'rspec/core'
-
-module Rspec
+module RSpec
   module Rails
     module TransactionalDatabaseSupport
 
@@ -9,7 +7,7 @@ module Rspec
       end
 
       def use_transactional_examples?
-        active_record_configured? && Rspec.configuration.use_transactional_examples?
+        active_record_configured? && RSpec.configuration.use_transactional_examples?
       end
 
       def setup_transactional_examples
@@ -34,8 +32,8 @@ module Rspec
   end
 end
 
-Rspec.configure do |c|
-  c.include Rspec::Rails::TransactionalDatabaseSupport
+RSpec.configure do |c|
+  c.include RSpec::Rails::TransactionalDatabaseSupport
   c.before { setup_transactional_examples }
   c.after  { teardown_transactional_examples }
 end

data/lib/rspec/rails/version.rb

@@ -1,4 +1,4 @@
-module Rspec # :nodoc:
+module RSpec # :nodoc:
   module Rails # :nodoc:
     module Version # :nodoc:
       STRING = File.readlines(File.expand_path('../../../../VERSION', __FILE__)).first

data/lib/rspec/rails/view_assigns.rb

@@ -0,0 +1,28 @@
+module RSpec
+  module Rails
+    module ViewAssigns
+      extend ActiveSupport::Concern
+
+      module InstanceMethods
+        # :callseq:
+        #   assign(:widget, stub_model(Widget))
+        #
+        # Assigns a value to an instance variable in the scope of the
+        # view being rendered.
+        def assign(key, value)
+          _encapsulated_assigns[key] = value
+        end
+
+      private
+
+        def _encapsulated_assigns
+          @_encapsulated_assigns ||= {}
+        end
+
+        def _assigns
+          super.merge(_encapsulated_assigns)
+        end
+      end
+    end
+  end
+end

data/lib/rspec/rails/view_rendering.rb

@@ -0,0 +1,33 @@
+module RSpec
+  module Rails
+    module ViewRendering
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def metadata_for_rspec_rails
+          metadata[:rspec_rails] ||= {}
+        end
+
+        def render_views
+          metadata_for_rspec_rails[:render_views] = true
+        end
+
+        def render_views?
+          metadata_for_rspec_rails[:render_views]
+        end
+      end
+
+      included do
+        before do
+          @_view_paths = controller.class.view_paths
+          controller.class.view_paths = [RSpec::Rails::NullResolver.new()] unless
+            self.class.render_views?
+        end
+
+        after do
+          controller.class.view_paths = @_view_paths
+        end
+      end
+    end
+  end
+end

data/rspec-rails.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.beta.8"
+  s.version = "2.0.0.beta.9.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-04-27}
-  s.description = %q{Rspec-2 for Rails-3}
+  s.date = %q{2010-05-27}
+  s.description = %q{RSpec-2 for Rails-3}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -20,9 +20,16 @@ Gem::Specification.new do |s|
      "Gemfile",
      "README.markdown",
      "Rakefile",
+     "Upgrade.markdown",
      "VERSION",
+     "autotest/discover.rb",
+     "cucumber.yml",
      "example_app_template.rb",
+     "features/controller_specs/do_not_render_views.feature",
+     "features/controller_specs/readers.feature",
+     "features/controller_specs/render_views.feature",
      "features/matchers/new_record_matcher.feature",
+     "features/model_specs/errors_on.feature",
      "features/model_specs/transactional_examples.feature",
      "features/step_definitions/model_steps.rb",
      "features/support/env.rb",
@@ -37,7 +44,6 @@ Gem::Specification.new do |s|
      "lib/generators/rspec/install/install_generator.rb",
      "lib/generators/rspec/install/templates/autotest/discover.rb",
      "lib/generators/rspec/install/templates/config/initializers/rspec_generator.rb.tt",
-     "lib/generators/rspec/install/templates/lib/tasks/rspec.rake",
      "lib/generators/rspec/install/templates/spec/spec_helper.rb",
      "lib/generators/rspec/integration/integration_generator.rb",
      "lib/generators/rspec/integration/templates/request_spec.rb",
@@ -63,18 +69,33 @@ Gem::Specification.new do |s|
      "lib/rspec/rails/adapters.rb",
      "lib/rspec/rails/example.rb",
      "lib/rspec/rails/example/controller_example_group.rb",
+     "lib/rspec/rails/example/helper_example_group.rb",
      "lib/rspec/rails/example/mailer_example_group.rb",
      "lib/rspec/rails/example/request_example_group.rb",
      "lib/rspec/rails/example/view_example_group.rb",
+     "lib/rspec/rails/extensions.rb",
+     "lib/rspec/rails/extensions/active_record/base.rb",
      "lib/rspec/rails/matchers.rb",
      "lib/rspec/rails/mocks.rb",
      "lib/rspec/rails/monkey.rb",
      "lib/rspec/rails/monkey/action_controller/test_case.rb",
+     "lib/rspec/rails/monkey/action_view/test_case.rb",
      "lib/rspec/rails/monkey/active_support/notifications/fanout.rb",
+     "lib/rspec/rails/null_resolver.rb",
+     "lib/rspec/rails/tasks/rspec.rake",
      "lib/rspec/rails/transactional_database_support.rb",
      "lib/rspec/rails/version.rb",
+     "lib/rspec/rails/view_assigns.rb",
+     "lib/rspec/rails/view_rendering.rb",
      "rspec-rails.gemspec",
+     "spec/rspec/rails/example/controller_example_group_spec.rb",
+     "spec/rspec/rails/example/helper_example_group_spec.rb",
+     "spec/rspec/rails/example/mailer_example_group_spec.rb",
+     "spec/rspec/rails/example/request_example_group_spec.rb",
+     "spec/rspec/rails/example/view_example_group_spec.rb",
+     "spec/rspec/rails/example/view_rendering_spec.rb",
      "spec/rspec/rails/matchers/be_a_new_spec.rb",
+     "spec/rspec/rails/matchers/errors_on_spec.rb",
      "spec/rspec/rails/matchers/redirect_to_spec.rb",
      "spec/rspec/rails/matchers/render_template_spec.rb",
      "spec/rspec/rails/mocks/ar_classes.rb",
@@ -82,6 +103,7 @@ Gem::Specification.new do |s|
      "spec/rspec/rails/mocks/stub_model_spec.rb",
      "spec/rspec/rails/transactional_database_support_spec.rb",
      "spec/spec_helper.rb",
+     "spec/support/helpers.rb",
      "specs.watchr",
      "templates/generate_stuff.rb",
      "templates/run_specs.rb"
@@ -89,7 +111,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.8!
+  Thank you for installing rspec-rails-2.0.0.beta.9.1!
 
   This version of rspec-rails only works with 
   versions of rails >= 3.0.0.pre.
@@ -104,16 +126,24 @@ Gem::Specification.new do |s|
   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.8}
+  s.summary = %q{rspec-rails-2.0.0.beta.9.1}
   s.test_files = [
-    "spec/rspec/rails/matchers/be_a_new_spec.rb",
+    "spec/rspec/rails/example/controller_example_group_spec.rb",
+     "spec/rspec/rails/example/helper_example_group_spec.rb",
+     "spec/rspec/rails/example/mailer_example_group_spec.rb",
+     "spec/rspec/rails/example/request_example_group_spec.rb",
+     "spec/rspec/rails/example/view_example_group_spec.rb",
+     "spec/rspec/rails/example/view_rendering_spec.rb",
+     "spec/rspec/rails/matchers/be_a_new_spec.rb",
+     "spec/rspec/rails/matchers/errors_on_spec.rb",
      "spec/rspec/rails/matchers/redirect_to_spec.rb",
      "spec/rspec/rails/matchers/render_template_spec.rb",
      "spec/rspec/rails/mocks/ar_classes.rb",
      "spec/rspec/rails/mocks/mock_model_spec.rb",
      "spec/rspec/rails/mocks/stub_model_spec.rb",
      "spec/rspec/rails/transactional_database_support_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/support/helpers.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -121,14 +151,14 @@ Gem::Specification.new do |s|
     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.8"])
+      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.9"])
       s.add_runtime_dependency(%q<webrat>, [">= 0.7.0"])
     else
-      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.8"])
+      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.9"])
       s.add_dependency(%q<webrat>, [">= 0.7.0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.8"])
+    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.9"])
     s.add_dependency(%q<webrat>, [">= 0.7.0"])
   end
 end