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

data/Gemfile

@@ -2,9 +2,15 @@ source "http://rubygems.org"
 
 gem 'arel', :path => "./vendor/arel"
 gem 'rails', :path => "./vendor/rails"
-gem 'rspec', '>= 2.0.0.beta.10'
+
+gem 'rspec-core', :path => "../rspec-core"
+gem 'rspec-expectations', :path => "../rspec-expectations"
+gem 'rspec-mocks', :path => "../rspec-mocks"
+gem 'rspec', :path => "../rspec"
+
+gem 'thor'
 gem 'cucumber'
 gem 'aruba'
 gem 'jeweler'
 gem 'webrat'
-
+gem 'sqlite3-ruby', :require => 'sqlite3'

data/README.markdown

@@ -1,5 +1,9 @@
 # rspec-rails-2
 
+This README aligns with the code in git HEAD. If you're looking for the README for
+the latest release, go to [http://github.com/rspec/rspec-rails](http://github.com/rspec/rspec-rails),
+and select the appropriate tag from the Switch Tags select list.
+
 ## RSpec-2 for Rails-3
 
 rspec-rails-2 brings rspec-2 to rails-3 with lightweight extensions to both
@@ -132,6 +136,14 @@ Delegates to assert_redirect
 
 View specs live in spec/views, and mix in ActionView::TestCase::Behavior.
 
+    describe "events/index.html.erb" do
+      it "renders _event partial for each event" do
+        assign(:events, [stub_model(Event), stub_model(Event)])
+        render
+        view.should render_template(:partial => "_event", :count => 2)
+      end
+    end
+
     describe "events/show.html.erb" do
       it "displays the event location" do
         assign(:event, stub_model(Event,
@@ -167,6 +179,33 @@ This represents the rendered view.
 
 `rendered` replaces `response` from rspec-rails-1.3
 
+# Routing specs
+
+Routing specs live in spec/routing.
+
+    describe "routing to profiles" do
+      it "routes /profile/:username to profile#show for username" do
+        { :get => "/profiles/jsmith" }.should route_to(
+          :controller => "profiles",
+          :action => "show",
+          :username => "jsmith"
+        )
+      end
+
+      it "does not expose a list of profiles" do
+        { :get => "/profiles" }.should_not be_routable
+      end
+    end
+
+## `route_to`
+
+Delegates to Rails' assert_routing.
+
+## `be_routable`
+
+Passes if the path is recognized by Rails' routing. This is primarily intended
+to be used with `should_not` to specify routes that should not be routable.
+
 # Helper specs
 
 Helper specs live in spec/helpers, and mix in ActionView::TestCase::Behavior.

data/Rakefile

@@ -1,3 +1,16 @@
+unless File.directory?("vendor/rails") && File.directory?("vendor/arel")
+  raise <<-MESSAGE
+You need to clone the rails and arel git repositories into ./vendor
+before you can use any of the rake tasks.
+
+    git clone git://github.com/rails/arel.git  vendor/arel
+    git clone git://github.com/rails/rails.git vendor/rails
+
+MESSAGE
+end
+require "bundler"
+Bundler.setup
+
 require 'rake'
 require 'yaml'
 
@@ -54,41 +67,12 @@ namespace :gem do
   end
 end
 
-namespace :rails do
-  desc "clone the rails repo"
-  task :clone do
-    mkdir 'vendor' unless File.directory?('vendor')
-    unless File.directory?('vendor/rails')
-      Dir.chdir('vendor') do
-        sh "git clone git://github.com/rails/rails"
-      end
-    end
-    unless File.directory?('vendor/arel')
-      Dir.chdir('vendor') do
-        sh "git clone git://github.com/rails/arel"
-      end
-    end
-  end
-
-  desc "update the rails repo"
-  task :update => :clone do
-    Dir.chdir('vendor/rails') do
-      sh "git checkout master"
-      sh "git pull"
-    end
-    Dir.chdir('vendor/arel') do
-      sh "git checkout master"
-      sh "git pull"
-    end
-  end
-end
-
 namespace :generate do
   desc "generate a fresh app with rspec installed"
-  task :app => ["rails:clone"] do |t|
+  task :app do |t|
     unless File.directory?('./tmp/example_app')
-      ruby "./vendor/rails/bin/rails new ./tmp/example_app"
-      system "cp ./templates/Gemfile ./tmp/example_app/" 
+      sh "bundle exec rails new ./tmp/example_app"
+      sh "cp ./templates/Gemfile ./tmp/example_app/" 
     end
   end
 

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.12
+2.0.0.beta.13

data/features/routing_specs/be_routable_matcher.feature

@@ -0,0 +1,64 @@
+Feature: be_routable matcher
+
+  The be_routable matcher is intended for use with should_not to specify
+  that a given route should_not be_routable.
+
+  Scenario: specify routeable route should be routable (passes)
+    Given a file named "spec/routing/widgets_routing_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe WidgetsController do
+        it "routes to /widgets" do
+          { :get => "/widgets" }.should be_routable
+        end
+      end
+      """
+
+    When I run "rspec spec/routing/widgets_routing_spec.rb"
+    Then I should see "1 example, 0 failures"
+
+  Scenario: specify routeable route should not be routable (fails)
+    Given a file named "spec/routing/widgets_routing_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe WidgetsController do
+        it "does not route to widgets" do
+          { :get => "/widgets" }.should_not be_routable
+        end
+      end
+      """
+
+    When I run "rspec spec/routing/widgets_routing_spec.rb"
+    Then I should see "1 example, 1 failure"
+
+  Scenario: specify non-routeable route should not be routable (passes)
+    Given a file named "spec/routing/widgets_routing_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe WidgetsController do
+        it "does not route to widgets/foo/bar" do
+          { :get => "/widgets/foo/bar" }.should_not be_routable
+        end
+      end
+      """
+
+    When I run "rspec spec/routing/widgets_routing_spec.rb"
+    Then I should see "1 example, 0 failures"
+
+  Scenario: specify non-routeable route should be routable (fails)
+    Given a file named "spec/routing/widgets_routing_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe WidgetsController do
+        it "routes to widgets/foo/bar" do
+          { :get => "/widgets/foo/bar" }.should be_routable
+        end
+      end
+      """
+
+    When I run "rspec spec/routing/widgets_routing_spec.rb"
+    Then I should see "1 example, 1 failure"

data/features/support/env.rb

@@ -1,5 +1,22 @@
-require "aruba"
-require "rspec/expectations"
+require 'bundler'
+Bundler.setup
+
+require 'aruba'
+require 'rspec/expectations'
+
+module ArubaOverrides
+  def detect_ruby_script(cmd)
+    if cmd =~ /^rspec /
+      "bundle exec ../../../rspec-core/bin/#{cmd}"
+    elsif cmd =~ /^ruby /
+      "bundle exec #{cmd}"
+    else
+      super(cmd)
+    end
+  end
+end
+
+World(ArubaOverrides)
 
 unless File.directory?('./tmp/example_app')
   system "rake generate:app generate:stuff"

data/lib/autotest/rails_rspec2.rb

@@ -35,7 +35,7 @@ Autotest.add_hook :initialize do |at|
   at.add_mapping(%r%^(test|spec)/fixtures/(.*).yml$%) { |_, m|
     ["spec/models/#{m[2].singularize}_spec.rb"] + at.files_matching(%r%^spec\/views\/#{m[2]}/.*_spec\.rb$%)
   }
-  at.add_mapping(%r%^spec/(models|controllers|routing|views|helpers|lib)/.*rb$%) { |filename, _|
+  at.add_mapping(%r%^spec/(models|controllers|routing|views|helpers|mailers|lib)/.*rb$%) { |filename, _|
     filename
   }
   at.add_mapping(%r%^app/models/(.*)\.rb$%) { |_, m|
@@ -70,6 +70,9 @@ Autotest.add_hook :initialize do |at|
   at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m|
     ["spec/lib/#{m[1]}_spec.rb"]
   }
+  at.add_mapping(%r%^app/mailers/(.*)\.rb$%) { |_, m|
+    ["spec/mailers/#{m[1]}_spec.rb"]
+  }
 end
 
 class Autotest::RailsRspec2 < Autotest::Rspec2

data/lib/generators/rspec/install/templates/lib/tasks/rspec.rake

@@ -39,7 +39,7 @@ desc "Run all specs in spec directory (excluding plugin specs)"
 RSpec::Core::RakeTask.new(:spec => spec_prereq)
 
 namespace :spec do
-  [:requests, :models, :controllers, :views, :helpers, :mailers, :lib].each do |sub|
+  [:requests, :models, :controllers, :views, :helpers, :mailers, :lib, :routing].each do |sub|
     desc "Run the code examples in spec/#{sub}"
     RSpec::Core::RakeTask.new(sub => spec_prereq) do |t|
       t.pattern = "./spec/#{sub}/**/*_spec.rb"

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

@@ -15,7 +15,7 @@ module Rspec
       class_option :controller_specs, :type => :boolean, :default => true,  :desc => "Generate controller specs"
       class_option :view_specs,       :type => :boolean, :default => true,  :desc => "Generate view specs"
       class_option :helper_specs,     :type => :boolean, :default => true,  :desc => "Generate helper specs"
-      class_option :routing_specs,    :type => :boolean, :default => false, :desc => "Generate routing specs"
+      class_option :routing_specs,    :type => :boolean, :default => true,  :desc => "Generate routing specs"
 
       def copy_controller_files
         return unless options[:controller_specs]

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "<%= table_name %>/edit.html.<%= options[:template_engine] %>" do
   before(:each) do
-    assign(:<%= file_name %>, @<%= file_name %> = stub_model(<%= class_name %>,
+    @<%= file_name %> = assign(:<%= file_name %>, stub_model(<%= class_name %>,
       :new_record? => false<%= output_attributes.empty? ? '' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
       :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe <%= controller_class_name %>Controller do
   describe "routing" do

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? ? '))' : ',' %>
+    @<%= file_name %> = assign(:<%= 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 -%>
-   rendered.should contain(<%= attribute.default.inspect %>)
+    rendered.should contain(<%= attribute.default.inspect %>)
 <% end -%>
   end
 end

data/lib/rspec/rails.rb

@@ -1,7 +1,6 @@
 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/matchers'

data/lib/rspec/rails/adapters.rb

@@ -19,8 +19,8 @@ module RSpec
 
     module TestUnitAssertionAdapter
       extend ActiveSupport::Concern
-      def method_name 
-        @running_example
+      def method_name
+        @example
       end
 
       include Test::Unit::Assertions

data/lib/rspec/rails/example.rb

@@ -3,3 +3,4 @@ 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'
+require 'rspec/rails/example/routing_example_group'

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

@@ -36,6 +36,7 @@ module RSpec::Rails
   #   describe WidgetsController do
   #     describe "GET index" do
   #       fixtures :widgets
+  #
   #       it "assigns all widgets to @widgets" do
   #         get :index
   #         assigns(:widgets).should eq(Widget.all)
@@ -82,7 +83,8 @@ module RSpec::Rails
     include Webrat::Matchers
     include Webrat::Methods
     include RSpec::Matchers
-    include RSpec::Rails::ControllerSpecMatchers
+    include RSpec::Rails::Matchers::RedirectTo
+    include RSpec::Rails::Matchers::RenderTemplate
 
     module ClassMethods
       def controller_class

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

@@ -1,5 +1,6 @@
-require 'webrat'
+require 'action_view'
 require 'rspec/rails/view_assigns'
+require 'webrat'
 
 module RSpec::Rails
   # Extends ActionView::TestCase::Behavior
@@ -51,7 +52,7 @@ module RSpec::Rails
     private
 
       def _controller_path
-        running_example.example_group.describes.to_s.sub(/Helper/,'').underscore
+        example.example_group.describes.to_s.sub(/Helper/,'').underscore
       end
     end
 

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

@@ -1,3 +1,4 @@
+require 'action_mailer'
 require 'webrat'
 
 module RSpec::Rails

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

@@ -2,6 +2,18 @@ require 'action_dispatch'
 require 'webrat'
 
 module RSpec::Rails
+  # Extends ActionDispatch::Integration::Runner to work with RSpec.
+  #
+  # == Matchers
+  #
+  # In addition to the stock matchers from rspec-expectations, request
+  # specs add these matchers, which delegate to rails' assertions:
+  #
+  #   response.should render_template(*args)
+  #   => delegates to assert_template(*args)
+  #
+  #   response.should redirect_to(destination)
+  #   => delegates to assert_redirected_to(destination)
   module RequestExampleGroup
     extend ActiveSupport::Concern
 
@@ -11,6 +23,9 @@ module RSpec::Rails
     include Webrat::Matchers
     include Webrat::Methods
     include RSpec::Matchers
+    include RSpec::Rails::Matchers::RedirectTo
+    include RSpec::Rails::Matchers::RenderTemplate
+    include ActionController::TemplateAssertions
 
     module InstanceMethods
       def app

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

@@ -0,0 +1,25 @@
+require "action_dispatch/testing/assertions/routing"
+
+module RSpec::Rails
+  module RoutingExampleGroup
+    extend ActiveSupport::Concern
+
+    include RSpec::Rails::TestUnitAssertionAdapter
+    include ActionDispatch::Assertions::RoutingAssertions
+    include RSpec::Rails::RoutingSpecMatchers
+
+    module InstanceMethods
+      attr_reader :routes
+    end
+
+    included do
+      before do
+        @routes = ::Rails.application.routes
+      end
+    end
+
+    RSpec.configure do |c|
+      c.include self, :example_group => { :file_path => /\bspec\/routing\// }
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
-require 'webrat'
+require 'action_view'
 require 'rspec/rails/view_assigns'
+require 'webrat'
 
 module RSpec::Rails
   # Extends ActionView::TestCase::Behavior
@@ -26,13 +27,9 @@ module RSpec::Rails
     include ActionView::TestCase::Behavior
     include RSpec::Rails::ViewAssigns
     include Webrat::Matchers
+    include RSpec::Rails::Matchers::RenderTemplate
 
     module InstanceMethods
-      def response
-        RSpec.deprecate("response", "rendered")
-        rendered
-      end
-
       # :call-seq:
       #   render 
       #   render(:template => "widgets/new.html.erb")
@@ -52,6 +49,12 @@ module RSpec::Rails
       #     end
       #   end
       def render(options={}, local_assigns={}, &block)
+        # TODO - this is a temporary hack to achieve behaviour that is in rails edge
+        # as of http://github.com/rails/rails/commit/0e0df4b0c5df7fdd1daa5653c255c4737f5526fc,
+        # but is not part of the rails-3.0.0.beta4 release. This line can be removed as
+        # soon as either rails 3 beta5 or rc is released.
+        _assigns.each { |key, value| view.instance_variable_set("@#{key}", value) }
+
         options = {:template => _default_file_to_render} if Hash === options and options.empty?
         super(options, local_assigns, &block)
       end
@@ -77,10 +80,17 @@ module RSpec::Rails
         view
       end
 
+
+      # Deprecated. Use +rendered+ instead.
+      def response
+        RSpec.deprecate("response", "rendered")
+        rendered
+      end
+
     private
 
       def _default_file_to_render
-        running_example.example_group.top_level_description
+        example.example_group.top_level_description
       end
 
       def _controller_path
@@ -91,6 +101,10 @@ module RSpec::Rails
     included do
       before do
         controller.controller_path = _controller_path
+        # this won't be necessary if/when
+        # https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/4903
+        # is accepted and released
+        @request ||= controller.request
       end
     end