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

data/lib/autotest/rails_rspec2.rb

@@ -22,7 +22,7 @@
 
 $:.push(*Dir["vendor/rails/*/lib"])
 
-require 'active_support'
+require 'active_support/core_ext'
 require 'autotest/rspec2'
 
 Autotest.add_hook :initialize do |at|

data/lib/generators/rspec/helper/helper_generator.rb

@@ -3,6 +3,7 @@ require 'generators/rspec'
 module Rspec
   module Generators
     class HelperGenerator < Base
+      include Rails::Generators::ResourceHelpers
       class_option :helpers, :type => :boolean, :default => false
 
       def create_helper_files

data/lib/generators/rspec/helper/templates/helper_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
 # Specs in this file have access to a helper object that includes
-# the <%= class_name %>Helper. For example:
+# the <%= controller_class_name %>Helper. For example:
 # 
-# describe <%= class_name %>Helper do
+# describe <%= controller_class_name %>Helper do
 #   describe "string concat" do
 #     it "concats two strings with spaces" do
 #       helper.concat_strings("this","that").should == "this that"
 #     end
 #   end
 # end
-describe <%= class_name %>Helper do
+describe <%= controller_class_name %>Helper do
   pending "add some examples to (or delete) #{__FILE__}"
 end

data/lib/generators/rspec/install/install_generator.rb

@@ -11,13 +11,13 @@ DESC
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       end
 
-      def copy_lib_files
-        directory 'lib'
-      end
-
-      def create_config_files
+      def copy_initializer_files
         inside "config" do
-          directory "initializers"
+          empty_directory "initializers", :verbose => false
+
+          inside "initializers" do
+            template "rspec_generator.rb.tt", "rspec_generator.rb"
+          end
         end
       end
 
@@ -25,7 +25,7 @@ DESC
         directory 'spec'
       end
 
-      def copy_autotest_discover_file
+      def copy_autotest_files
         directory 'autotest'
       end
 

data/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -5,6 +5,7 @@ module Rspec
   module Generators
     class ScaffoldGenerator < Base
       include Rails::Generators::ResourceHelpers
+      source_paths << File.expand_path("../../helper/templates", __FILE__)
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
 
       class_option :orm, :desc => "ORM used to generate the controller"
@@ -32,11 +33,19 @@ module Rspec
         copy_view :show
       end
 
+      def copy_helper_files
+        return unless options[:helper_specs]
+
+        template "helper_spec.rb",
+          File.join('spec/helpers', "#{controller_file_name}_helper_spec.rb")
+
+      end
+
       def copy_routing_files
         return unless options[:routing_specs]
 
         template 'routing_spec.rb',
-                 File.join('spec/routing', controller_class_path, "#{controller_file_name}_routing_spec.rb")
+          File.join('spec/routing', "#{controller_file_name}_routing_spec.rb")
       end
 
       hook_for :integration_tool, :as => :integration

data/lib/generators/rspec/scaffold/templates/edit_spec.rb

@@ -14,7 +14,7 @@ describe "<%= table_name %>/edit.html.<%= options[:template_engine] %>" do
   it "renders the edit <%= file_name %> form" do
     render
 
-    response.should have_selector("form", :action => <%= file_name %>_path(@<%= file_name %>), :method => "post") do |form|
+    rendered.should have_selector("form", :action => <%= file_name %>_path(@<%= file_name %>), :method => "post") do |form|
 <% for attribute in output_attributes -%>
       form.should have_selector("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
 <% end -%>

data/lib/generators/rspec/scaffold/templates/index_spec.rb

@@ -19,7 +19,7 @@ describe "<%= table_name %>/index.html.<%= options[:template_engine] %>" do
   it "renders a list of <%= table_name %>" do
     render
 <% for attribute in output_attributes -%>
-    response.should have_selector("tr>td", :content => <%= attribute.default.inspect %>.to_s, :count => 2)
+    rendered.should have_selector("tr>td", :content => <%= attribute.default.inspect %>.to_s, :count => 2)
 <% end -%>
   end
 end

data/lib/generators/rspec/scaffold/templates/new_spec.rb

@@ -14,7 +14,7 @@ describe "<%= table_name %>/new.html.<%= options[:template_engine] %>" do
   it "renders new <%= file_name %> form" do
     render
 
-    response.should have_selector("form", :action => <%= table_name %>_path, :method => "post") do |form|
+    rendered.should have_selector("form", :action => <%= table_name %>_path, :method => "post") do |form|
 <% for attribute in output_attributes -%>
       form.should have_selector("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
 <% end -%>

data/lib/generators/rspec/scaffold/templates/show_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "<%= table_name %>/show.html.<%= options[:template_engine] %>" do
   before(:each) do
-    assign(:<%= file_name %>, @<%= file_name %> = stub_model(<%= class_name %><%= output_attributes.empty? ? ')' : ',' %>
+    assign(:<%= file_name %>, @<%= file_name %> = stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
       :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
@@ -15,7 +15,7 @@ describe "<%= table_name %>/show.html.<%= options[:template_engine] %>" do
   it "renders attributes in <p>" do
     render
 <% for attribute in output_attributes -%>
-    response.should contain(<%= attribute.default.inspect %>)
+   rendered.should contain(<%= attribute.default.inspect %>)
 <% end -%>
   end
 end

data/lib/rspec-rails.rb

@@ -0,0 +1,12 @@
+module RSpec
+  module Rails
+    class Railtie < ::Rails::Railtie
+      config.generators.integration_tool :rspec
+      config.generators.test_framework   :rspec
+
+      rake_tasks do
+        load "rspec/rails/tasks/rspec.rake"
+      end
+    end
+  end
+end

data/lib/rspec/rails.rb

@@ -1,6 +1,14 @@
+require 'rspec/core'
 require 'rspec/rails/monkey'
+require 'rspec/rails/extensions'
+require 'rspec/rails/null_resolver'
+require 'rspec/rails/view_rendering'
 require 'rspec/rails/adapters'
 require 'rspec/rails/transactional_database_support'
 require 'rspec/rails/matchers'
 require 'rspec/rails/example'
 require 'rspec/rails/mocks'
+
+RSpec.configure do |c|
+  c.add_option :use_transactional_examples, :type => :boolean, :default => true
+end

data/lib/rspec/rails/adapters.rb

@@ -1,24 +1,28 @@
 require 'active_support/concern'
 require 'test/unit/assertions'
 
-module Rspec
+module RSpec
   module Rails
     module SetupAndTeardownAdapter
-      def setup(*methods)
-        methods.each {|method| before { send method } }
-      end
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def setup(*methods)
+          methods.each {|method| before { send method } }
+        end
 
-      def teardown(*methods)
-        methods.each {|method| after { send method } }
+        def teardown(*methods)
+          methods.each {|method| after { send method } }
+        end
       end
     end
 
     module TestUnitAssertionAdapter
       extend ActiveSupport::Concern
 
-      included do
-        include Test::Unit::Assertions
+      include Test::Unit::Assertions
 
+      included do
         before do
           @_result = Struct.new(:add_assertion).new
         end

data/lib/rspec/rails/example.rb

@@ -1,4 +1,5 @@
 require 'rspec/rails/example/controller_example_group'
 require 'rspec/rails/example/request_example_group'
+require 'rspec/rails/example/helper_example_group'
 require 'rspec/rails/example/view_example_group'
 require 'rspec/rails/example/mailer_example_group'

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

@@ -4,29 +4,30 @@ require 'webrat'
 module ControllerExampleGroupBehaviour
   extend ActiveSupport::Concern
 
-  module ControllerClassReader
+  include RSpec::Rails::SetupAndTeardownAdapter
+  include RSpec::Rails::TestUnitAssertionAdapter
+  include ActionController::TestCase::Behavior
+  include RSpec::Rails::ViewRendering
+  include Webrat::Matchers
+  include Webrat::Methods
+  include RSpec::Matchers
+
+  attr_reader :controller
+
+  module ClassMethods
     def controller_class
       describes
     end
   end
 
   included do
-    extend  Rspec::Rails::SetupAndTeardownAdapter
-    include Rspec::Rails::TestUnitAssertionAdapter
-    include ActionController::TestCase::Behavior
-    extend  ControllerClassReader
-    include Webrat::Matchers
-    include Webrat::Methods
-    include Rspec::Matchers
     before do
       @routes = ::Rails.application.routes
       ActionController::Base.allow_forgery_protection = false
     end
   end
 
-  Rspec.configure do |c|
-    c.include self, :example_group => {
-      :describes => lambda {|described| described < ActionController::Base }
-    }
+  RSpec.configure do |c|
+    c.include self, :example_group => { :file_path => /\bspec\/controllers\// }
   end
 end

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

@@ -0,0 +1,43 @@
+require 'webrat'
+require 'rspec/rails/view_assigns'
+
+module HelperExampleGroupBehaviour
+  extend  ActiveSupport::Concern
+
+  include RSpec::Rails::SetupAndTeardownAdapter
+  include RSpec::Rails::TestUnitAssertionAdapter
+  include ActionView::TestCase::Behavior
+  include RSpec::Rails::ViewAssigns
+  include Webrat::Matchers
+
+  module ClassMethods
+    def determine_default_helper_class(ignore)
+      describes
+    end
+  end
+
+  module InstanceMethods
+    # Returns an instance of ActionView::Base instrumented with this helper and
+    # any of the built-in rails helpers.
+    def helper
+      _view
+    end
+
+  private
+
+    def _controller_path
+      running_example.example_group.describes.to_s.sub(/Helper/,'').underscore
+    end
+  end
+
+  included do
+    before do
+      controller.controller_path = _controller_path
+    end
+  end
+
+  RSpec.configure do |c|
+    c.include self, :example_group => { :file_path => /\bspec\/helpers\// }
+  end
+end
+

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

@@ -1,16 +1,17 @@
 require 'webrat'
 
-module MailerExampleGroupBehavior
+module MailerExampleGroupBehaviour
+  extend ActiveSupport::Concern
+
   include Webrat::Matchers
-  include Rspec::Matchers
+  include RSpec::Matchers
 
   def read_fixture(action)
     IO.readlines(File.join(Rails.root, 'spec', 'fixtures', self.described_class.name.underscore, action))
   end
 
-  Rspec.configure do |c|
-    c.include self, :example_group => { :describes => lambda {|k| k < ActionMailer::Base }}
-    c.before :each, :example_group => { :describes => lambda {|k| k < ActionMailer::Base }} do
+  included do
+    before do
       ActionMailer::Base.delivery_method = :test
       ActionMailer::Base.perform_deliveries = true
       ActionMailer::Base.deliveries.clear
@@ -19,4 +20,8 @@ module MailerExampleGroupBehavior
       @expected.mime_version = '1.0'
     end
   end
+
+  RSpec.configure do |c|
+    c.include self, :example_group => { :file_path => /\bspec\/mailers\// }
+  end
 end

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

@@ -3,15 +3,15 @@ require 'webrat'
 
 module RequestExampleGroupBehaviour
   extend ActiveSupport::Concern
+
   include ActionDispatch::Integration::Runner
+  include RSpec::Rails::TestUnitAssertionAdapter
+  include ActionDispatch::Assertions
+  include Webrat::Matchers
+  include Webrat::Methods
+  include RSpec::Matchers
 
   included do
-    include Rspec::Rails::TestUnitAssertionAdapter
-    include ActionDispatch::Assertions
-    include Webrat::Matchers
-    include Webrat::Methods
-    include Rspec::Matchers
-
     before do
       @router = ::Rails.application.routes
     end
@@ -29,7 +29,7 @@ module RequestExampleGroupBehaviour
     config.mode = :rack
   end
 
-  Rspec.configure do |c|
+  RSpec.configure do |c|
     c.include self, :example_group => { :file_path => /\bspec\/requests\// }
   end
 end

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

@@ -1,80 +1,62 @@
 require 'webrat'
+require 'rspec/rails/view_assigns'
 
 module ViewExampleGroupBehaviour
-  include Webrat::Matchers
-  include Rspec::Matchers
+  extend  ActiveSupport::Concern
 
-  class ViewExampleController < ActionController::Base
-    attr_accessor :controller_path
-  end
+  include RSpec::Rails::SetupAndTeardownAdapter
+  include RSpec::Rails::TestUnitAssertionAdapter
+  include ActionView::TestCase::Behavior
+  include RSpec::Rails::ViewAssigns
+  include Webrat::Matchers
 
-  module ViewExtension
-    def protect_against_forgery?; end
-    def method_missing(name, *args)
-      if controller.respond_to?(name) || Rails.application.routes.named_routes.helpers.include?(name)
-        controller.__send__(name, *args)
-      else
-        super(name, *args)
-      end
+  module InstanceMethods
+    def response
+      RSpec.deprecate("response", "rendered")
+      rendered
     end
-  end
-
-  def view
-    @view ||= begin
-                view = ActionView::Base.new(ActionController::Base.view_paths, assigns, controller)
-                view.extend(ActionController::PolymorphicRoutes)
-                view.extend(ViewExtension)
-                view
-              end
-  end
-
-  def assign(name, value)
-    assigns[name] = value
-  end
-
-  def assigns
-    @assigns ||= {}
-  end
 
-  def response
-    @response
-  end
+    # :callseq:
+    #   render 
+    #   render(:template => "widgets/new.html.erb")
+    #   render({:partial => "widgets/widget.html.erb"}, {... locals ...})
+    #   render({:partial => "widgets/widget.html.erb"}, {... locals ...}) do ... end
+    #
+    # Delegates to ActionView::Base#render, so see documentation on that for more
+    # info.
+    #
+    # The only addition is that you can call render with no arguments, and RSpec
+    # will pass the top level description to render:
+    #
+    #   describe "widgets/new.html.erb" do
+    #     it "shows all the widgets" do
+    #       render # => view.render(:file => "widgets/new.html.erb")
+    #       ...
+    #     end
+    #   end
+    def render(options={}, local_assigns={}, &block)
+      options = {:template => _default_file_to_render} if Hash === options and options.empty?
+      super(options, local_assigns, &block)
+    end
 
-  def file_to_render
-    running_example.example_group.top_level_description
-  end
+  private
 
-  def controller_path
-    parts = file_to_render.split('/')
-    parts.pop
-    parts.join('/')
-  end
+    def _default_file_to_render
+      running_example.example_group.top_level_description
+    end
 
-  def render
-    @response = view.render :file => file_to_render
+    def _controller_path
+      _default_file_to_render.split("/")[0..-2].join("/")
+    end
   end
 
-  def method_missing(selector, *args)
-    if Rails.application.routes.named_routes.helpers.include?(selector)
-      controller.__send__(selector, *args)
-    else
-      super
+  included do
+    before do
+      controller.controller_path = _controller_path
     end
   end
 
-  Rspec.configure do |c|
+  RSpec.configure do |c|
     c.include self, :example_group => { :file_path => /\bspec\/views\// }
   end
-
-private
-
-  def controller
-    @controller ||= begin
-                      controller = ViewExampleController.new
-                      controller.controller_path = controller_path
-                      controller.request = ActionDispatch::Request.new(Rack::MockRequest.env_for("/url"))
-                      controller
-                    end
-  end
-
 end