rspec-rails 2.0.0.beta.16 → 2.0.0.beta.17

data/Gemfile

@@ -3,14 +3,14 @@ source "http://rubygems.org"
 gem 'arel', :path => "./vendor/arel"
 gem 'rails', :path => "./vendor/rails"
 
+gem 'rspec-rails', :path => "."
 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 'aruba', ">= 0.2.0", :require => nil
 gem 'jeweler'
 gem 'webrat'
 gem 'sqlite3-ruby', :require => 'sqlite3'

data/README.markdown

@@ -2,12 +2,7 @@
 
 rspec-2 for rails-3 with lightweight extensions to each
 
-NOTICE: rspec-rails-2.0.0.beta.13 only works with rails-3.0.0.beta4 or higher.
-
-NOTICE: 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.
+NOTICE: rspec-rails-2.0.0.beta.17 only works with rails-3.0.0.beta4 or higher.
 
 ## Install
 
@@ -25,7 +20,7 @@ This installs the following gems:
 
 Add this line to the Gemfile:
 
-    gem "rspec-rails", ">= 2.0.0.beta.13"
+    gem "rspec-rails", ">= 2.0.0.beta.17"
 
 This will expose generators, including rspec:install. Now you can run: 
 
@@ -241,3 +236,14 @@ 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.
 
     { :get => "/widgets/1/edit" }.should_not be_routable
+
+## Contribute
+
+See [http://github.com/rspec/rspec-dev](http://github.com/rspec/rspec-dev)
+
+## Also see
+
+* [http://github.com/rspec/rspec](http://github.com/rspec/rspec)
+* [http://github.com/rspec/rspec-core](http://github.com/rspec/rspec-core)
+* [http://github.com/rspec/rspec-expectations](http://github.com/rspec/rspec-expectations)
+* [http://github.com/rspec/rspec-mocks](http://github.com/rspec/rspec-mocks)

data/Rakefile

@@ -23,9 +23,14 @@ require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 
 RSpec::Core::RakeTask.new(:spec)
-Cucumber::Rake::Task.new(:cucumber) do |t|
-  t.cucumber_opts = %w{--format progress}
+class Cucumber::Rake::Task::ForkedCucumberRunner
+  # When cucumber shells out, we still need it to run in the context of our
+  # bundle.
+  def run
+    sh "bundle exec #{RUBY} " + args.join(" ")
+  end
 end
+Cucumber::Rake::Task.new(:cucumber)
 
 begin
   require 'jeweler'
@@ -45,16 +50,33 @@ begin
 
   Thank you for installing #{gem.summary}!
 
-  This version of rspec-rails only works with 
-  versions of rails >= 3.0.0.pre.
+  This version of rspec-rails only works with versions of rails >= 3.0.0.beta.4.
+
+  To configure your app to use rspec-rails, add a declaration to your Gemfile.
+  If you are using Bundler's grouping feature in your Gemfile, be sure to include
+  rspec-rails in the :development group as well as the :test group so that you
+  can access its generators and rake tasks.
+
+    group :development, :test do
+      gem "rspec-rails", ">= #{RSpec::Rails::Version::STRING}"
+    end
 
-  Be sure to run the following command in each of your
-  Rails apps if you're upgrading:
+  Be sure to run the following command in each of your Rails apps if you're
+  upgrading:
 
     script/rails generate rspec:install
 
-  Also, be sure to look at Upgrade.markdown to see 
-  what might have changed since the last release.
+  Even if you've run it before, this ensures that you have the latest updates
+  to spec/spec_helper.rb and any other support files.
+
+  Previous versions of rspec-rails-2.0.0.beta installed files that are no
+  longer being used, so please remove these files if you have them:
+
+    lib/tasks/rspec.rake
+    config/initializers/rspec_generator.rb
+
+  Lastly, be sure to look at Upgrade.markdown to see what might have changed
+  since the last release.
 
 #{"*"*50}
 EOM

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.16
+2.0.0.beta.17

data/features/controller_specs/isolation_from_views.feature

@@ -6,7 +6,7 @@ Feature: do not render views
 
   NOTE: unlike rspec-rails-1.x, the template must exist.
 
-  Scenario: expect template that rendered by controller (passes)
+  Scenario: expect template that is rendered by controller action (passes)
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
       """
       require "spec_helper.rb"
@@ -16,20 +16,20 @@ Feature: do not render views
           it "renders the index template" do
             get :index
             response.should render_template("index")
-            response.body.should =~ /generated by RSpec/
+            response.body.should == ""
           end
           it "renders the widgets/index template" do
             get :index
             response.should render_template("widgets/index")
-            response.body.should =~ /generated by RSpec/
+            response.body.should == ""
           end
         end
       end
       """
     When I run "rspec ./spec"
-    Then I should see "2 examples, 0 failures"
+    Then the output should contain "2 examples, 0 failures"
 
-  Scenario: expect template that is not rendered by controller (fails)
+  Scenario: expect template that is not rendered by controller action (fails)
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
       """
       require "spec_helper.rb"
@@ -39,28 +39,10 @@ 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
       """
     When I run "rspec ./spec"
-    Then I should see "1 example, 1 failure"
+    Then the output should contain "1 example, 1 failure"
 
-  Scenario: set expectation about template content (fails with helpful message)
-    Given a file named "spec/controllers/widgets_controller_spec.rb" with:
-      """
-      require "spec_helper.rb"
-
-      describe WidgetsController do
-        describe "index" do
-          it "renders the 'new' template" do
-            get :index
-            response.should contain("foo")
-            response.body.should =~ /generated by RSpec/
-          end
-        end
-      end
-      """
-    When I run "rspec spec"
-    Then I should see "Template source generated by RSpec"

data/features/controller_specs/readers.feature

@@ -15,4 +15,4 @@ Feature: controller spec readers
       end
       """
     When I run "rspec ./spec"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"

data/features/controller_specs/render_views.feature

@@ -25,7 +25,7 @@ Feature: render views
       end
       """
     When I run "rspec spec"
-    Then I should see "2 examples, 0 failures"
+    Then the output should contain "2 examples, 0 failures"
 
   Scenario: expect template that does not exist and is rendered by controller (fails)
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
@@ -49,8 +49,8 @@ Feature: render views
       end
       """
     When I run "rspec spec"
-    Then I should see "1 example, 1 failure"
-    And I should see "Missing template"
+    Then the output should contain "1 example, 1 failure"
+    And the output should contain "Missing template"
 
   Scenario: render_views on and off in diff contexts
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
@@ -73,7 +73,7 @@ Feature: render views
           describe "index" do
             it "renders the RSpec generated template" do
               get :index
-              response.body.should =~ /generated by RSpec/
+              response.body.should == ""
             end
           end
         end
@@ -93,11 +93,11 @@ Feature: render views
           describe "index" do
             it "renders the RSpec generated template" do
               get :index
-              response.body.should =~ /generated by RSpec/
+              response.body.should == ""
             end
           end
         end
       end
       """
     When I run "rspec spec"
-    Then I should see "4 examples, 0 failures"
+    Then the output should contain "4 examples, 0 failures"

data/features/mailer_specs/url_helpers.feature

@@ -16,7 +16,7 @@ Feature: URL helpers in mailer examples
       end
       """
     When I run "rspec spec"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"
 
   Scenario: using URL helpers without default options
     Given a file named "config/initializers/mailer_defaults.rb" with:
@@ -35,4 +35,4 @@ Feature: URL helpers in mailer examples
       end
       """
     When I run "rspec spec"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"

data/features/matchers/be_routable_matcher.feature

@@ -17,7 +17,7 @@ Feature: be_routable matcher
       """
 
     When I run "rspec spec/routing/widgets_routing_spec.rb"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"
 
   Scenario: specify routeable route should not be routable (fails)
     Given a file named "spec/routing/widgets_routing_spec.rb" with:
@@ -32,7 +32,7 @@ Feature: be_routable matcher
       """
 
     When I run "rspec spec/routing/widgets_routing_spec.rb"
-    Then I should see "1 example, 1 failure"
+    Then the output should contain "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:
@@ -47,7 +47,7 @@ Feature: be_routable matcher
       """
 
     When I run "rspec spec/routing/widgets_routing_spec.rb"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"
 
   Scenario: specify non-routeable route should be routable (fails)
     Given a file named "spec/routing/widgets_routing_spec.rb" with:
@@ -62,7 +62,7 @@ Feature: be_routable matcher
       """
 
     When I run "rspec spec/routing/widgets_routing_spec.rb"
-    Then I should see "1 example, 1 failure"
+    Then the output should contain "1 example, 1 failure"
 
   Scenario: be_routable in a controller spec
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
@@ -77,4 +77,4 @@ Feature: be_routable matcher
       """
 
     When I run "rspec spec/controllers/widgets_controller_spec.rb"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"

data/features/matchers/new_record_matcher.feature

@@ -22,4 +22,4 @@ Feature: be_a_new matcher
       end
       """
     When I run "rspec spec/models/widget_spec.rb"
-    Then I should see "4 examples, 0 failures"
+    Then the output should contain "4 examples, 0 failures"

data/features/model_specs/errors_on.feature

@@ -29,4 +29,4 @@ Feature: errors_on
       end
       """
     When I run "rspec spec/models/widget_spec.rb"
-    Then I should see "4 examples, 0 failures"
+    Then the output should contain "4 examples, 0 failures"

data/features/model_specs/transactional_examples.feature

@@ -21,7 +21,7 @@ Feature: transactional examples
       end
       """
     When I run "rspec spec/models/widget_spec.rb"
-    Then I should see "3 examples, 0 failures"
+    Then the output should contain "3 examples, 0 failures"
 
   Scenario: run in transactions (explicit)
     Given a file named "spec/models/widget_spec.rb" with:
@@ -48,7 +48,7 @@ Feature: transactional examples
       end
       """
     When I run "rspec spec/models/widget_spec.rb"
-    Then I should see "3 examples, 0 failures"
+    Then the output should contain "3 examples, 0 failures"
 
   Scenario: disable transactions (explicit)
     Given a file named "spec/models/widget_spec.rb" with:
@@ -77,7 +77,7 @@ Feature: transactional examples
       end
       """
     When I run "rspec spec/models/widget_spec.rb"
-    Then I should see "3 examples, 0 failures"
+    Then the output should contain "3 examples, 0 failures"
 
   Scenario: run in transactions with fixture
     Given a file named "spec/models/thing_spec.rb" with:
@@ -97,7 +97,7 @@ Feature: transactional examples
         name: MyString
       """
     When I run "rspec spec/models/thing_spec.rb"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"
 
 
 

data/features/support/env.rb

@@ -1,22 +1,4 @@
-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/features/view_specs/view_spec.feature

@@ -22,7 +22,7 @@ Feature: view spec
       end
       """
     When I run "rspec spec/views"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"
 
   Scenario: passing spec with before and nesting
     Given a file named "spec/views/widgets/index.html.erb_spec.rb" with:
@@ -49,7 +49,7 @@ Feature: view spec
       end
       """
     When I run "rspec spec/views"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"
 
   Scenario: passing spec with explicit template rendering
     Given a file named "spec/views/widgets/widget.html.erb_spec.rb" with:
@@ -71,7 +71,7 @@ Feature: view spec
       <h2><%= @widget.name %></h2>
       """
     When I run "rspec spec/views"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"
 
   Scenario: passing spec with rendering of locals in a partial
     Given a file named "spec/views/widgets/_widget.html.erb_spec.rb" with:
@@ -93,7 +93,7 @@ Feature: view spec
       <h3><%= widget.name %></h3>
       """
     When I run "rspec spec/views"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"
 
   Scenario: passing spec with rendering of locals in an implicit partial
     Given a file named "spec/views/widgets/_widget.html.erb_spec.rb" with:
@@ -115,7 +115,7 @@ Feature: view spec
       <h3><%= widget.name %></h3>
       """
     When I run "rspec spec/views"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"
 
   Scenario: passing spec with rendering of text
     Given a file named "spec/views/widgets/direct.html.erb_spec.rb" with:
@@ -132,7 +132,7 @@ Feature: view spec
       end
       """
     When I run "rspec spec/views"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"
 
   Scenario: passing spec with rendering of Prototype helper update
     Given a file named "spec/views/widgets/prototype_update.html.erb_spec.rb" with:
@@ -151,4 +151,4 @@ Feature: view spec
       end
       """
     When I run "rspec spec/views"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"

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

@@ -3,13 +3,12 @@ require 'generators/rspec'
 module Rspec
   module Generators
     class HelperGenerator < Base
-      include Rails::Generators::ResourceHelpers
       class_option :helpers, :type => :boolean, :default => true
 
       def create_helper_files
         return unless options[:helpers]
 
-        template 'helper_spec.rb', File.join('spec/helpers', class_path, "#{table_name}_helper_spec.rb")
+        template 'helper_spec.rb', File.join('spec/helpers', class_path, "#{file_name}_helper_spec.rb")
       end
     end
   end

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 <%= controller_class_name %>Helper. For example:
+# the <%= class_name %>Helper. For example:
 # 
-# describe <%= controller_class_name %>Helper do
+# describe <%= 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 <%= controller_class_name %>Helper do
+describe <%= class_name %>Helper do
   pending "add some examples to (or delete) #{__FILE__}"
 end

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

@@ -19,20 +19,6 @@ DESC
         directory 'spec'
       end
 
-      def copy_lib_files
-        directory 'lib'
-      end
-
-      def copy_initializer_files
-        inside "config" do
-          empty_directory "initializers", :verbose => false
-
-          inside "initializers" do
-            template "rspec_generator.rb.tt", "rspec_generator.rb"
-          end
-        end
-      end
-
       def copy_autotest_files
         directory 'autotest'
       end

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

@@ -33,12 +33,9 @@ module Rspec
         copy_view :show
       end
 
-      def copy_helper_files
-        return unless options[:helper_specs]
-
-        template "helper_spec.rb",
-          File.join('spec/helpers', controller_class_path, "#{controller_file_name}_helper_spec.rb")
-
+      # Invoke the helper using the controller name (pluralized)
+      hook_for :helper, :as => :scaffold do |invoked|
+        invoke invoked, [ controller_name ]
       end
 
       def copy_routing_files

data/lib/rspec-rails.rb

@@ -3,6 +3,10 @@ module RSpec
     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/example.rb

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

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

@@ -96,6 +96,7 @@ module RSpec::Rails
     end
 
     included do
+      metadata[:type] = :controller
       before do
         @routes = ::Rails.application.routes
         ActionController::Base.allow_forgery_protection = false

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

@@ -56,6 +56,7 @@ module RSpec::Rails
     end
 
     included do
+      metadata[:type] = :helper
       before do
         controller.controller_path = _controller_path
       end

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

@@ -9,6 +9,7 @@ if defined?(ActionMailer)
       include RSpec::Matchers
 
       included do
+        metadata[:type] = :mailer
         include ::Rails.application.routes.url_helpers
         options = ::Rails.configuration.action_mailer.default_url_options
         options.each { |key, value| default_url_options[key] = value } if options

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

@@ -0,0 +1,14 @@
+module RSpec::Rails
+  module ModelExampleGroup
+    extend ActiveSupport::Concern
+    extend RSpec::Rails::ModuleInclusion
+
+    include RSpec::Matchers
+
+    included do
+      metadata[:type] = :model
+    end
+
+    RSpec.configure &include_self_when_dir_matches('spec','models')
+  end
+end

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

@@ -36,6 +36,8 @@ module RSpec::Rails
     end
 
     included do
+      metadata[:type] = :request
+
       before do
         @router = ::Rails.application.routes
       end

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

@@ -14,6 +14,8 @@ module RSpec::Rails
     end
 
     included do
+      metadata[:type] = :routing
+
       before do
         @routes = ::Rails.application.routes
       end

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

@@ -98,6 +98,8 @@ module RSpec::Rails
     end
 
     included do
+      metadata[:type] = :view
+
       before do
         controller.controller_path = _controller_path
         # this won't be necessary if/when

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

@@ -1,38 +1,10 @@
-begin
-  require 'rspec/core'
-  require 'rspec/core/rake_task'
-rescue MissingSourceFile
-  module RSpec
-    module Core
-      class RakeTask
-        def initialize(name)
-          task name do
-            # if rspec-rails is a configured gem, this will output helpful material and exit ...
-            require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
-
-            # ... otherwise, do this:
-            raise <<-MSG
-
-#{"*" * 80}
-*  You are trying to run an rspec rake task defined in
-*  #{__FILE__},
-*  but rspec can not be found in vendor/gems, vendor/plugins or system gems.
-#{"*" * 80}
-MSG
-          end
-        end
-      end
-    end
-  end
-end
-
-Rake.application.instance_variable_get('@tasks').delete('default')
-
+require 'rspec/core'
+require 'rspec/core/rake_task'
+Rake.application.instance_variable_get('@tasks')['default'].prerequisites.delete('test')
 spec_prereq = Rails.root.join('config', 'database.yml').exist? ? "db:test:prepare" : :noop
-task :noop do
-end
-
+task :noop do; end
 task :default => :spec
+
 task :stats => "spec:statsetup"
 
 desc "Run all specs in spec directory (excluding plugin specs)"

data/lib/rspec/rails/view_rendering.rb

@@ -32,7 +32,7 @@ module RSpec
         def find_all(*args)
           path_set.find_all(*args).collect do |template|
             ::ActionView::Template.new(
-              "Template source generated by RSpec.",
+              "",
               template.identifier,
               template.handler,
               {

data/rspec-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.beta.16"
+  s.version = "2.0.0.beta.17"
 
   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-07-06}
+  s.date = %q{2010-07-11}
   s.description = %q{RSpec-2 for Rails-3}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -47,8 +47,6 @@ Gem::Specification.new do |s|
      "lib/generators/rspec/install/install_generator.rb",
      "lib/generators/rspec/install/templates/.rspec",
      "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",
@@ -76,6 +74,7 @@ Gem::Specification.new do |s|
      "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/model_example_group.rb",
      "lib/rspec/rails/example/request_example_group.rb",
      "lib/rspec/rails/example/routing_example_group.rb",
      "lib/rspec/rails/example/view_example_group.rb",
@@ -92,6 +91,7 @@ Gem::Specification.new do |s|
      "lib/rspec/rails/module_inclusion.rb",
      "lib/rspec/rails/monkey.rb",
      "lib/rspec/rails/monkey/action_mailer/test_case.rb",
+     "lib/rspec/rails/tasks/rspec.rake",
      "lib/rspec/rails/version.rb",
      "lib/rspec/rails/view_assigns.rb",
      "lib/rspec/rails/view_rendering.rb",
@@ -99,6 +99,7 @@ Gem::Specification.new do |s|
      "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/model_example_group_spec.rb",
      "spec/rspec/rails/example/request_example_group_spec.rb",
      "spec/rspec/rails/example/routing_example_group_spec.rb",
      "spec/rspec/rails/example/view_example_group_spec.rb",
@@ -121,18 +122,35 @@ 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.16!
+  Thank you for installing rspec-rails-2.0.0.beta.17!
 
-  This version of rspec-rails only works with 
-  versions of rails >= 3.0.0.pre.
+  This version of rspec-rails only works with versions of rails >= 3.0.0.beta.4.
 
-  Be sure to run the following command in each of your
-  Rails apps if you're upgrading:
+  To configure your app to use rspec-rails, add a declaration to your Gemfile.
+  If you are using Bundler's grouping feature in your Gemfile, be sure to include
+  rspec-rails in the :development group as well as the :test group so that you
+  can access its generators and rake tasks.
+
+    group :development, :test do
+      gem "rspec-rails", ">= 2.0.0.beta.17"
+    end
+
+  Be sure to run the following command in each of your Rails apps if you're
+  upgrading:
 
     script/rails generate rspec:install
 
-  Also, be sure to look at Upgrade.markdown to see 
-  what might have changed since the last release.
+  Even if you've run it before, this ensures that you have the latest updates
+  to spec/spec_helper.rb and any other support files.
+
+  Previous versions of rspec-rails-2.0.0.beta installed files that are no
+  longer being used, so please remove these files if you have them:
+
+    lib/tasks/rspec.rake
+    config/initializers/rspec_generator.rb
+
+  Lastly, be sure to look at Upgrade.markdown to see what might have changed
+  since the last release.
 
 **************************************************
 }
@@ -140,11 +158,12 @@ 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.16}
+  s.summary = %q{rspec-rails-2.0.0.beta.17}
   s.test_files = [
     "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/model_example_group_spec.rb",
      "spec/rspec/rails/example/request_example_group_spec.rb",
      "spec/rspec/rails/example/routing_example_group_spec.rb",
      "spec/rspec/rails/example/view_example_group_spec.rb",

data/spec/rspec/rails/example/controller_example_group_spec.rb

@@ -11,5 +11,12 @@ module RSpec::Rails
       end
       group.included_modules.should include(RSpec::Rails::Matchers::RoutingMatchers)
     end
+
+    it "adds :type => :controller to the metadata" do
+      group = RSpec::Core::ExampleGroup.describe do
+        include ControllerExampleGroup
+      end
+      group.metadata[:type].should eq(:controller)
+    end
   end
 end

data/spec/rspec/rails/example/helper_example_group_spec.rb

@@ -14,6 +14,13 @@ module RSpec::Rails
       helper_spec.__send__(:_controller_path).should == "foos"
     end
 
+    it "adds :type => :helper to the metadata" do
+      group = RSpec::Core::ExampleGroup.describe do
+        include HelperExampleGroup
+      end
+      group.metadata[:type].should eq(:helper)
+    end
+
     describe "#helper" do
       it "returns the instance of AV::Base provided by AV::TC::Behavior" do
         helper_spec = Object.new.extend HelperExampleGroup::InstanceMethods

data/spec/rspec/rails/example/mailer_example_group_spec.rb

@@ -2,7 +2,6 @@ require "spec_helper"
 
 module RSpec::Rails
   describe MailerExampleGroup do
-
     module ::Rails; end
     before do
       Rails.stub_chain(:application, :routes, :url_helpers).and_return(Rails)
@@ -11,5 +10,12 @@ module RSpec::Rails
 
     it { should be_included_in_files_in('./spec/mailers/') }
     it { should be_included_in_files_in('.\\spec\\mailers\\') }
+
+    it "adds :type => :mailer to the metadata" do
+      group = RSpec::Core::ExampleGroup.describe do
+        include MailerExampleGroup
+      end
+      group.metadata[:type].should eq(:mailer)
+    end
   end
 end

data/spec/rspec/rails/example/model_example_group_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+module RSpec::Rails
+  describe ModelExampleGroup do
+    it { should be_included_in_files_in('./spec/models/') }
+    it { should be_included_in_files_in('.\\spec\\models\\') }
+
+    it "adds :type => :model to the metadata" do
+      group = RSpec::Core::ExampleGroup.describe do
+        include ModelExampleGroup
+      end
+      group.metadata[:type].should eq(:model)
+    end
+  end
+end

data/spec/rspec/rails/example/request_example_group_spec.rb

@@ -4,5 +4,12 @@ module RSpec::Rails
   describe RequestExampleGroup do
     it { should be_included_in_files_in('./spec/requests/') }
     it { should be_included_in_files_in('.\\spec\\requests\\') }
+
+    it "adds :type => :request to the metadata" do
+      group = RSpec::Core::ExampleGroup.describe do
+        include RequestExampleGroup
+      end
+      group.metadata[:type].should eq(:request)
+    end
   end
 end

data/spec/rspec/rails/example/routing_example_group_spec.rb

@@ -4,5 +4,12 @@ module RSpec::Rails
   describe RoutingExampleGroup do
     it { should be_included_in_files_in('./spec/routing/') }
     it { should be_included_in_files_in('.\\spec\\routing\\') }
+
+    it "adds :type => :routing to the metadata" do
+      group = RSpec::Core::ExampleGroup.describe do
+        include RoutingExampleGroup
+      end
+      group.metadata[:type].should eq(:routing)
+    end
   end
 end

data/spec/rspec/rails/example/view_example_group_spec.rb

@@ -5,6 +5,13 @@ module RSpec::Rails
     it { should be_included_in_files_in('./spec/views/') }
     it { should be_included_in_files_in('.\\spec\\views\\') }
 
+    it "adds :type => :view to the metadata" do
+      group = RSpec::Core::ExampleGroup.describe do
+        include ViewExampleGroup
+      end
+      group.metadata[:type].should eq(:view)
+    end
+
     describe "#render" do
       let(:view_spec) do
         Class.new do

data/spec/rspec/rails/matchers/render_template_spec.rb

@@ -26,7 +26,7 @@ describe "render_template" do
     end
   end
 
-  context "given a string" do
+  context "given a symbol" do
     it "converts to_s and delegates to assert_template" do
       self.should_receive(:assert_template).with("template_name", "this message")
       "response".should render_template(:template_name, "this message")

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-require 'bundler'
-Bundler.setup
-
 require 'active_record'
 require 'action_controller'
 require 'action_mailer'

data/templates/Gemfile

@@ -5,8 +5,10 @@ gem 'rails', :path => "../../vendor/rails"
 
 gem 'sqlite3-ruby', :require => 'sqlite3'
 
-gem "rspec-rails",        :path => "../../../rspec-rails"
-gem "rspec",              :path => "../../../rspec"
-gem "rspec-core",         :path => "../../../rspec-core"
-gem "rspec-expectations", :path => "../../../rspec-expectations"
-gem "rspec-mocks",        :path => "../../../rspec-mocks"
+group :development, :test do
+  gem "rspec-rails",        :path => "../../../rspec-rails"
+  gem "rspec",              :path => "../../../rspec"
+  gem "rspec-core",         :path => "../../../rspec-core"
+  gem "rspec-expectations", :path => "../../../rspec-expectations"
+  gem "rspec-mocks",        :path => "../../../rspec-mocks"
+end

data/templates/generate_stuff.rb

@@ -1,5 +1,6 @@
 generate('rspec:install')
-generate('controller wombats index')
+generate('controller wombats index') # plural
+generate('controller welcome index') # singular
 generate('integration_test widgets')
 generate('mailer Notifications signup')
 generate('model thing name:string')

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 62196419
+  hash: 62196417
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 16
-  version: 2.0.0.beta.16
+  - 17
+  version: 2.0.0.beta.17
 platform: ruby
 authors: 
 - David Chelimsky
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 -05:00
+date: 2010-07-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,8 +95,6 @@ files:
 - lib/generators/rspec/install/install_generator.rb
 - lib/generators/rspec/install/templates/.rspec
 - 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
@@ -124,6 +122,7 @@ files:
 - 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/model_example_group.rb
 - lib/rspec/rails/example/request_example_group.rb
 - lib/rspec/rails/example/routing_example_group.rb
 - lib/rspec/rails/example/view_example_group.rb
@@ -140,6 +139,7 @@ files:
 - lib/rspec/rails/module_inclusion.rb
 - lib/rspec/rails/monkey.rb
 - lib/rspec/rails/monkey/action_mailer/test_case.rb
+- lib/rspec/rails/tasks/rspec.rake
 - lib/rspec/rails/version.rb
 - lib/rspec/rails/view_assigns.rb
 - lib/rspec/rails/view_rendering.rb
@@ -147,6 +147,7 @@ files:
 - 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/model_example_group_spec.rb
 - spec/rspec/rails/example/request_example_group_spec.rb
 - spec/rspec/rails/example/routing_example_group_spec.rb
 - spec/rspec/rails/example/view_example_group_spec.rb
@@ -172,18 +173,35 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.16!
+    Thank you for installing rspec-rails-2.0.0.beta.17!
   
-    This version of rspec-rails only works with 
-    versions of rails >= 3.0.0.pre.
+    This version of rspec-rails only works with versions of rails >= 3.0.0.beta.4.
   
-    Be sure to run the following command in each of your
-    Rails apps if you're upgrading:
+    To configure your app to use rspec-rails, add a declaration to your Gemfile.
+    If you are using Bundler's grouping feature in your Gemfile, be sure to include
+    rspec-rails in the :development group as well as the :test group so that you
+    can access its generators and rake tasks.
+  
+      group :development, :test do
+        gem "rspec-rails", ">= 2.0.0.beta.17"
+      end
+  
+    Be sure to run the following command in each of your Rails apps if you're
+    upgrading:
   
       script/rails generate rspec:install
   
-    Also, be sure to look at Upgrade.markdown to see 
-    what might have changed since the last release.
+    Even if you've run it before, this ensures that you have the latest updates
+    to spec/spec_helper.rb and any other support files.
+  
+    Previous versions of rspec-rails-2.0.0.beta installed files that are no
+    longer being used, so please remove these files if you have them:
+  
+      lib/tasks/rspec.rake
+      config/initializers/rspec_generator.rb
+  
+    Lastly, be sure to look at Upgrade.markdown to see what might have changed
+    since the last release.
   
   **************************************************
 
@@ -217,11 +235,12 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.16
+summary: rspec-rails-2.0.0.beta.17
 test_files: 
 - 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/model_example_group_spec.rb
 - spec/rspec/rails/example/request_example_group_spec.rb
 - spec/rspec/rails/example/routing_example_group_spec.rb
 - spec/rspec/rails/example/view_example_group_spec.rb

data/lib/generators/rspec/install/templates/config/initializers/rspec_generator.rb.tt

@@ -1,6 +0,0 @@
-<%= app_name %>.configure do
-  config.generators do |g|
-    g.integration_tool :rspec
-    g.test_framework   :rspec
-  end
-end if defined? <%= app_name %>