rspec-rails 2.0.0.beta.20 → 2.0.0.beta.22

data/Gemfile

@@ -11,10 +11,11 @@ gem 'rspec', :path => "../rspec"
 
 gem 'cucumber'
 gem 'aruba', ">= 0.2.0", :require => nil
-gem 'jeweler'
 gem 'webrat', ">= 0.7.2.beta.1"
 gem 'sqlite3-ruby', :require => 'sqlite3'
 
+gem 'autotest'
+
 case RUBY_VERSION
 when /^1\.9/
   gem 'ruby-debug19'

data/History.md

@@ -0,0 +1,33 @@
+## rspec-rails release history (incomplete)
+
+### 2.0.0.beta.22 / 2010-09-12
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.0.beta.20...v2.0.0.beta.22)
+
+* Enhancements
+  * autotest mapping improvements (Andreas Neuhaus)
+
+* Bug fixes
+  * delegate flunk to assertion delegate
+
+### 2.0.0.beta.20 / 2010-08-24
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.0.beta.19...v2.0.0.beta.20)
+
+* Enhancements
+  * infer controller and action path_params in view specs
+  * more cucumber features (Justin Ko)
+  * clean up spec helper (Andre Arko)
+  * render views in controller specs if controller class is not
+    ActionController::Base
+  * routing specs can access named routes
+  * add assign(name, value) to helper specs (Justin Ko)
+  * stub_model supports primary keys other than id (Justin Ko)
+  * encapsulate Test::Unit and/or MiniTest assertions in a separate object
+  * support choice between Webrat/Capybara (Justin Ko)
+    * removed hard dependency on Webrat
+  * support specs for 'abstract' subclasses of ActionController::Base (Mike Gehard)
+  * be_a_new matcher supports args (Justin Ko)
+
+* Bug fixes
+  * support T::U components in mailer and request specs (Brasten Sager)

data/README.markdown

@@ -2,26 +2,24 @@
 
 rspec-2 for rails-3 with lightweight extensions to each
 
-NOTICE: rspec-rails-2.0.0.beta.17 only works with rails-3.0.0.beta4 or higher.
-
 ## Install
 
     gem install rspec-rails --pre
 
 This installs the following gems:
 
-* rspec
-* rspec-core
-* rspec-expectations
-* rspec-mocks
-* rspec-rails
+    rspec
+    rspec-core
+    rspec-expectations
+    rspec-mocks
+    rspec-rails
 
 ## Configure:
 
 Add `rspec-rails` to the `:test` and `:development` groups in the Gemfile:
 
     group :test, :development do
-      gem "rspec-rails", ">= 2.0.0.beta.19"
+      gem "rspec-rails", ">= 2.0.0.beta.22"
     end
 
 It needs to be in the `:development` group to expose generators and rake
@@ -32,11 +30,32 @@ Now you can run:
     script/rails generate rspec:install
 
 This adds the spec directory and some skeleton files, including
-the "rake spec" task. Note that this is the only rspec generator you'll
-actually see. That's because RSpec is registered with Rails as the test
-framework, so whenever you generate application components like models,
+the "rake spec" task. 
+
+### Generators
+
+If you type `script/rails generate`, the only RSpec generator you'll actually
+see is `rspec:install`. That's because RSpec is registered with Rails as the
+test framework, so whenever you generate application components like models,
 controllers, etc, RSpec specs are generated instead of Test::Unit tests.
 
+Note that the generators are there to help you get started, but they are no
+substitute for writing your own examples, and they are only guaranteed to work
+out of the box for the default scenario (`ActiveRecord` + `Webrat`).
+
+### Autotest
+
+The `rspec:install` generator creates an `./autotest/discover.rb` file, which
+tells Autotest that you're using RSpec and Rails. You'll also need to add the
+autotest (not autotest-rails) gem to your Gemfile:
+
+    gem "autotest"
+
+At this point, if all of the gems in your Gemfile are installed in system
+gems, you can just type `autotest`. If, however, Bundler is managing any gems
+for you directly (i.e. you've got `:git` or `:path` attributes in the `Gemfile`),
+you'll need to run `bundle exec autotest`.
+
 ### Webrat and Capybara
 
 You can choose between webrat or capybara for simulating a browser, automating
@@ -50,8 +69,9 @@ Note that Capybara matchers are not available in view or helper specs.
 
 ## Living on edge
 
-If you prefer to exploit bundler's support for pointing a gem at a github repo,
-be sure to do so for all five of the relevant rspec gems:
+Bundler makes it a snap to use the latest code for any gem your app depends on. For
+rspec-rails, you'll need to point bundler to the git repositories for `rspec-rails`
+and the other rspec related gems it depends on:
 
     gem "rspec-rails",        :git => "git://github.com/rspec/rspec-rails.git"
     gem "rspec",              :git => "git://github.com/rspec/rspec.git"
@@ -59,9 +79,13 @@ be sure to do so for all five of the relevant rspec gems:
     gem "rspec-expectations", :git => "git://github.com/rspec/rspec-expectations.git"
     gem "rspec-mocks",        :git => "git://github.com/rspec/rspec-mocks.git"
 
-Keep in mind that each of these repos is under active development, which means
-that its very likely that you'll pull from these repos and they won't play nice
-together. If playing nice is important to you, stick to the published gems.
+Run `bundle install` and you'll have whatever is in git right now. Any time you
+want to update to a newer head, just run `bundle update`.
+
+Keep in mind that each of these codebases is under active development, which
+means that its entirely possible that you'll pull from these repos and they won't
+play nice together. If playing nice is important to you, stick to the published
+gems.
 
 ## Backwards compatibility
 
@@ -213,6 +237,10 @@ Routing specs live in spec/routing.
       end
     end
 
+### * Upgrade note
+
+`route_for` from rspec-rails-1.x is gone. Use `route_to` and `be_routable` instead.
+
 # Helper specs
 
 Helper specs live in spec/helpers, and mix in ActionView::TestCase::Behavior.

data/Rakefile

@@ -10,14 +10,12 @@ MESSAGE
 end
 require "bundler"
 Bundler.setup
+Bundler::GemHelper.install_tasks
 
 require 'rake'
 require 'yaml'
 
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
-
 require 'rake/rdoctask'
-require 'rspec/rails/version'
 require 'rspec'
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
@@ -32,71 +30,13 @@ class Cucumber::Rake::Task::ForkedCucumberRunner
 end
 Cucumber::Rake::Task.new(:cucumber)
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "rspec-rails"
-    gem.version = RSpec::Rails::Version::STRING
-    gem.summary = "rspec-rails-#{RSpec::Rails::Version::STRING}"
-    gem.description = "RSpec-2 for Rails-3"
-    gem.email = "dchelimsky@gmail.com;chad.humphries@gmail.com"
-    gem.homepage = "http://github.com/rspec/rspec-rails"
-    gem.authors = ["David Chelimsky", "Chad Humphries"]
-    gem.rubyforge_project = "rspec"
-    gem.add_dependency "rspec", RSpec::Rails::Version::STRING
-    gem.post_install_message = <<-EOM
-#{"*"*50}
-
-  Thank you for installing #{gem.summary}!
-
-  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:
-
-    script/rails generate rspec:install
-
-  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
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-namespace :gem do
-  desc "push to gemcutter"
-  task :push => :build do
-    system "gem push pkg/rspec-rails-#{RSpec::Rails::Version::STRING}.gem"
-  end
-end
-
 namespace :generate do
   desc "generate a fresh app with rspec installed"
   task :app do |t|
     unless File.directory?('./tmp/example_app')
       sh "bundle exec rails new ./tmp/example_app"
       sh "cp ./templates/Gemfile ./tmp/example_app/"
+      sh "cp ./specs.watchr ./tmp/example_app/"
     end
   end
 

data/lib/autotest/rails_rspec2.rb

@@ -25,55 +25,60 @@ $:.push(*Dir["vendor/rails/*/lib"])
 require 'active_support/core_ext'
 require 'autotest/rspec2'
 
-Autotest.add_hook :initialize do |at|
-  %w{config/ coverage/ db/ doc/ log/ public/ script/ tmp/ vendor/rails vendor/plugins vendor/gems}.each do |exception|
-    at.add_exception("^#{exception}")
-  end
+class Autotest::RailsRspec2 < Autotest::Rspec2
 
-  at.clear_mappings
+  def initialize
+    super
+    setup_rails_rspec2_mappings
+  end
 
-  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|mailers|lib)/.*rb$%) { |filename, _|
-    filename
-  }
-  at.add_mapping(%r%^app/models/(.*)\.rb$%) { |_, m|
-    ["spec/models/#{m[1]}_spec.rb"]
-  }
-  at.add_mapping(%r%^app/views/(.*)$%) { |_, m|
-    at.files_matching %r%^spec/views/#{m[1]}_spec.rb$%
-  }
-  at.add_mapping(%r%^app/controllers/(.*)\.rb$%) { |_, m|
-    if m[1] == "application"
-      at.files_matching %r%^spec/controllers/.*_spec\.rb$%
-    else
-      ["spec/controllers/#{m[1]}_spec.rb"]
-    end
-  }
-  at.add_mapping(%r%^app/helpers/(.*)_helper\.rb$%) { |_, m|
-    if m[1] == "application" then
-      at.files_matching(%r%^spec/(views|helpers)/.*_spec\.rb$%)
-    else
-      ["spec/helpers/#{m[1]}_helper_spec.rb"] + at.files_matching(%r%^spec\/views\/#{m[1]}/.*_spec\.rb$%)
+  def setup_rails_rspec2_mappings
+    %w{config/ coverage/ db/ doc/ log/ public/ script/ tmp/ vendor/rails vendor/plugins vendor/gems}.each do |exception|
+      add_exception(/^([\.\/]*)?#{exception}/)
     end
-  }
-  at.add_mapping(%r%^config/routes\.rb$%) {
-    at.files_matching %r%^spec/(controllers|routing|views|helpers)/.*_spec\.rb$%
-  }
-  at.add_mapping(%r%^config/database\.yml$%) { |_, m|
-    at.files_matching %r%^spec/models/.*_spec\.rb$%
-  }
-  at.add_mapping(%r%^(spec/(spec_helper|shared/.*)|config/(boot|environment(s/test)?))\.rb$%) {
-    at.files_matching %r%^spec/(models|controllers|routing|views|helpers)/.*_spec\.rb$%
-  }
-  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
+    clear_mappings
+
+    add_mapping(%r%^(test|spec)/fixtures/(.*).yml$%) { |_, m|
+      ["spec/models/#{m[2].singularize}_spec.rb"] + files_matching(%r%^spec\/views\/#{m[2]}/.*_spec\.rb$%)
+    }
+    add_mapping(%r%^spec/(models|controllers|routing|views|helpers|mailers|requests|lib)/.*rb$%) { |filename, _|
+      filename
+    }
+    add_mapping(%r%^app/models/(.*)\.rb$%) { |_, m|
+      ["spec/models/#{m[1]}_spec.rb"]
+    }
+    add_mapping(%r%^app/views/(.*)$%) { |_, m|
+      files_matching %r%^spec/views/#{m[1]}_spec.rb$%
+    }
+    add_mapping(%r%^app/controllers/(.*)\.rb$%) { |_, m|
+      if m[1] == "application"
+        files_matching %r%^spec/controllers/.*_spec\.rb$%
+      else
+        ["spec/controllers/#{m[1]}_spec.rb"]
+      end
+    }
+    add_mapping(%r%^app/helpers/(.*)_helper\.rb$%) { |_, m|
+      if m[1] == "application" then
+        files_matching(%r%^spec/(views|helpers)/.*_spec\.rb$%)
+      else
+        ["spec/helpers/#{m[1]}_helper_spec.rb"] + files_matching(%r%^spec\/views\/#{m[1]}/.*_spec\.rb$%)
+      end
+    }
+    add_mapping(%r%^config/routes\.rb$%) {
+      files_matching %r%^spec/(controllers|routing|views|helpers)/.*_spec\.rb$%
+    }
+    add_mapping(%r%^config/database\.yml$%) { |_, m|
+      files_matching %r%^spec/models/.*_spec\.rb$%
+    }
+    add_mapping(%r%^(spec/(spec_helper|shared/.*)|config/(boot|environment(s/test)?))\.rb$%) {
+      files_matching %r%^spec/(models|controllers|routing|views|helpers)/.*_spec\.rb$%
+    }
+    add_mapping(%r%^lib/(.*)\.rb$%) { |_, m|
+      ["spec/lib/#{m[1]}_spec.rb"]
+    }
+    add_mapping(%r%^app/mailers/(.*)\.rb$%) { |_, m|
+      ["spec/mailers/#{m[1]}_spec.rb"]
+    }
+  end
 end

data/lib/generators/rspec/controller/controller_generator.rb

@@ -6,8 +6,8 @@ module Rspec
       argument :actions, :type => :array, :default => [], :banner => "action action"
 
       class_option :template_engine, :desc => "Template engine to generate view files"
-      class_option :controllers, :type => :boolean, :default => true
-      class_option :views,       :type => :boolean, :default => true
+      class_option :controller_specs, :type => :boolean, :default => true
+      class_option :view_specs,       :type => :boolean, :default => true
 
       def create_controller_files
         return unless options[:controllers]

data/lib/generators/rspec/install/templates/spec/spec_helper.rb

@@ -17,10 +17,11 @@ RSpec.configure do |config|
   # config.mock_with :rr
   config.mock_with :rspec
 
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, comment the following line or assign false
+  # examples within a transaction, remove the following line or assign false
   # instead of true.
   config.use_transactional_fixtures = true
 end

data/lib/rspec/rails.rb

@@ -1,3 +1,13 @@
+module RSpec
+  module Rails
+    class << self
+      def using_active_record?
+        ::Rails.configuration.generators.options[:rails][:orm] == :active_record
+      end
+    end
+  end
+end
+
 require 'rspec/core'
 require 'rspec/rails/extensions'
 require 'rspec/rails/view_rendering'

data/lib/rspec/rails/adapters.rb

@@ -32,7 +32,7 @@ module RSpec
 
       module ClassMethods
         def assertion_method_names
-          Test::Unit::Assertions.public_instance_methods.select{|m| m.to_s =~ /^assert/} +
+          Test::Unit::Assertions.public_instance_methods.select{|m| m.to_s =~ /^(assert|flunk)/} +
             [:build_message]
         end
 

data/lib/rspec/rails/extensions/active_record/base.rb

@@ -1,6 +1,6 @@
-if defined?(ActiveRecord::Base)
-  module RSpec
-    module Rails
+module RSpec
+  module Rails
+    if using_active_record?
       module Extensions
         module ActiveRecord
           module ClassMethods
@@ -33,12 +33,12 @@ if defined?(ActiveRecord::Base)
           end
         end
       end
-    end
-  end
 
-  class ActiveRecord::Base #:nodoc:
-    extend  RSpec::Rails::Extensions::ActiveRecord::ClassMethods
-    include RSpec::Rails::Extensions::ActiveRecord::InstanceMethods
+      class ::ActiveRecord::Base #:nodoc:
+        extend  RSpec::Rails::Extensions::ActiveRecord::ClassMethods
+        include RSpec::Rails::Extensions::ActiveRecord::InstanceMethods
+      end
+    end
   end
 end
 

data/lib/rspec/rails/fixture_support.rb

@@ -1,33 +1,30 @@
-if defined?(ActiveRecord)
-  module RSpec
-    module Rails
+module RSpec
+  module Rails
+    if using_active_record?
       module FixtureSupport
         extend ActiveSupport::Concern
 
         include RSpec::Rails::SetupAndTeardownAdapter
         include RSpec::Rails::TestUnitAssertionAdapter
+        include ActiveRecord::TestFixtures
 
         included do
-          if RSpec.configuration.use_transactional_fixtures
-            # TODO - figure out how to move this outside the included block
-            include ActiveRecord::TestFixtures
-
-            self.fixture_path = RSpec.configuration.fixture_path
-            self.use_transactional_fixtures = RSpec.configuration.use_transactional_fixtures
-            self.use_instantiated_fixtures  = RSpec.configuration.use_instantiated_fixtures
-            fixtures RSpec.configuration.global_fixtures if RSpec.configuration.global_fixtures
-          end
+          self.fixture_path = RSpec.configuration.fixture_path
+          self.use_transactional_fixtures = RSpec.configuration.use_transactional_fixtures
+          self.use_instantiated_fixtures  = RSpec.configuration.use_instantiated_fixtures
+          fixtures RSpec.configuration.global_fixtures if RSpec.configuration.global_fixtures
         end
       end
-    end
-  end
 
-  RSpec.configure do |c|
-    c.include RSpec::Rails::FixtureSupport
-    c.add_setting :use_transactional_fixtures
-    c.add_setting :use_transactional_examples, :alias => :use_transactional_fixtures
-    c.add_setting :use_instantiated_fixtures
-    c.add_setting :global_fixtures
-    c.add_setting :fixture_path
+      RSpec.configure do |c|
+        c.include RSpec::Rails::FixtureSupport
+        c.add_setting :use_transactional_fixtures
+        c.add_setting :use_transactional_examples, :alias => :use_transactional_fixtures
+        c.add_setting :use_instantiated_fixtures
+        c.add_setting :global_fixtures
+        c.add_setting :fixture_path
+      end
+    end
   end
 end
+

data/lib/rspec/rails/mocks.rb

@@ -88,6 +88,9 @@ EOM
           def @object.instance_of?(other)
             other == #{model_class}
           end
+          def @object.respond_to?(method_name)
+            #{model_class}.respond_to?(:column_names) && #{model_class}.column_names.include?(method_name.to_s) || super
+          end
           def @object.class
             #{model_class}
           end

data/lib/rspec/rails/tasks/rspec.rake

@@ -1,7 +1,8 @@
 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
+
+spec_prereq = Rails.configuration.generators.options[:rails][:orm] == :active_record ?  "db:test:prepare" : :noop
 task :noop do; end
 task :default => :spec
 

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Rails # :nodoc:
     module Version # :nodoc:
-      STRING = File.readlines(File.expand_path('../../../../VERSION', __FILE__)).first
+      STRING = '2.0.0.beta.22'
     end
   end
 end

data/rspec-rails.gemspec

@@ -1,138 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require "rspec/rails/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{rspec-rails}
-  s.version = "2.0.0.beta.20"
-
-  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-08-24}
-  s.description = %q{RSpec-2 for Rails-3}
-  s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
-  s.extra_rdoc_files = [
-    "README.markdown"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "Gemfile",
-     "Gotchas.markdown",
-     "README.markdown",
-     "Rakefile",
-     "Upgrade.markdown",
-     "VERSION",
-     "autotest/discover.rb",
-     "cucumber.yml",
-     "features/README.markdown",
-     "features/controller_specs/anonymous_controller.feature",
-     "features/controller_specs/isolation_from_views.feature",
-     "features/controller_specs/readers.feature",
-     "features/controller_specs/render_views.feature",
-     "features/helper_specs/helper_spec.feature",
-     "features/mailer_specs/url_helpers.feature",
-     "features/matchers/be_routable_matcher.feature",
-     "features/matchers/new_record_matcher.feature",
-     "features/matchers/redirect_to_matcher.feature",
-     "features/matchers/render_template_matcher.feature",
-     "features/mocks/mock_model.feature",
-     "features/mocks/stub_model.feature",
-     "features/model_specs/errors_on.feature",
-     "features/model_specs/transactional_examples.feature",
-     "features/routing_specs/access_to_named_routes.feature",
-     "features/step_definitions/model_steps.rb",
-     "features/support/env.rb",
-     "features/view_specs/inferred_controller_path.feature",
-     "features/view_specs/view_spec.feature",
-     "lib/autotest/rails_rspec2.rb",
-     "lib/generators/rspec.rb",
-     "lib/generators/rspec/controller/controller_generator.rb",
-     "lib/generators/rspec/controller/templates/controller_spec.rb",
-     "lib/generators/rspec/controller/templates/view_spec.rb",
-     "lib/generators/rspec/helper/helper_generator.rb",
-     "lib/generators/rspec/helper/templates/helper_spec.rb",
-     "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/spec/spec_helper.rb",
-     "lib/generators/rspec/integration/integration_generator.rb",
-     "lib/generators/rspec/integration/templates/request_spec.rb",
-     "lib/generators/rspec/mailer/mailer_generator.rb",
-     "lib/generators/rspec/mailer/templates/fixture",
-     "lib/generators/rspec/mailer/templates/mailer_spec.rb",
-     "lib/generators/rspec/model/model_generator.rb",
-     "lib/generators/rspec/model/templates/fixtures.yml",
-     "lib/generators/rspec/model/templates/model_spec.rb",
-     "lib/generators/rspec/observer/observer_generator.rb",
-     "lib/generators/rspec/observer/templates/observer_spec.rb",
-     "lib/generators/rspec/scaffold/scaffold_generator.rb",
-     "lib/generators/rspec/scaffold/templates/controller_spec.rb",
-     "lib/generators/rspec/scaffold/templates/edit_spec.rb",
-     "lib/generators/rspec/scaffold/templates/index_spec.rb",
-     "lib/generators/rspec/scaffold/templates/new_spec.rb",
-     "lib/generators/rspec/scaffold/templates/routing_spec.rb",
-     "lib/generators/rspec/scaffold/templates/show_spec.rb",
-     "lib/generators/rspec/view/templates/view_spec.rb",
-     "lib/generators/rspec/view/view_generator.rb",
-     "lib/rspec-rails.rb",
-     "lib/rspec/rails.rb",
-     "lib/rspec/rails/adapters.rb",
-     "lib/rspec/rails/browser_simulators.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/model_example_group.rb",
-     "lib/rspec/rails/example/rails_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",
-     "lib/rspec/rails/extensions.rb",
-     "lib/rspec/rails/extensions/active_record/base.rb",
-     "lib/rspec/rails/fixture_support.rb",
-     "lib/rspec/rails/matchers.rb",
-     "lib/rspec/rails/matchers/be_a_new.rb",
-     "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_matchers.rb",
-     "lib/rspec/rails/mocks.rb",
-     "lib/rspec/rails/module_inclusion.rb",
-     "lib/rspec/rails/tasks/rspec.rake",
-     "lib/rspec/rails/version.rb",
-     "lib/rspec/rails/view_assigns.rb",
-     "lib/rspec/rails/view_rendering.rb",
-     "rspec-rails.gemspec",
-     "spec/rspec/rails/assertion_adapter_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/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",
-     "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/matchers/route_to_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/spec_helper.rb",
-     "spec/support/helpers.rb",
-     "specs.watchr",
-     "templates/Gemfile",
-     "templates/generate_stuff.rb",
-     "templates/run_specs.rb"
-  ]
-  s.homepage = %q{http://github.com/rspec/rspec-rails}
-  s.post_install_message = %q{**************************************************
-
-  Thank you for installing rspec-rails-2.0.0.beta.20!
+  s.name        = "rspec-rails"
+  s.version     = RSpec::Rails::Version::STRING
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["David Chelimsky", "Chad Humphries"]
+  s.email       = "dchelimsky@gmail.com;chad.humphries@gmail.com"
+  s.homepage    = "http://github.com/rspec/rspec-rails"
+  s.summary     = "rspec-rails-#{RSpec::Rails::Version::STRING}"
+  s.description = "RSpec-2 for Rails-3"
+
+  s.rubygems_version   = "1.3.7"
+  s.rubyforge_project  = "rspec"
+
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
+  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.extra_rdoc_files = [ "README.markdown" ]
+  s.rdoc_options     = ["--charset=UTF-8"]
+  s.require_path     = "lib"
+
+  s.post_install_message = %Q{**************************************************
+
+  Thank you for installing #{s.summary}!
 
   This version of rspec-rails only works with versions of rails >= 3.0.0.beta.4.
 
@@ -142,7 +34,7 @@ Gem::Specification.new do |s|
   can access its generators and rake tasks.
 
     group :development, :test do
-      gem "rspec-rails", ">= 2.0.0.beta.20"
+      gem "rspec-rails", ">= #{RSpec::Rails::Version::STRING}"
     end
 
   Be sure to run the following command in each of your Rails apps if you're
@@ -164,44 +56,7 @@ Gem::Specification.new do |s|
 
 **************************************************
 }
-  s.rdoc_options = ["--charset=UTF-8"]
-  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.20}
-  s.test_files = [
-    "spec/rspec/rails/assertion_adapter_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/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",
-     "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/matchers/route_to_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/spec_helper.rb",
-     "spec/support/helpers.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.20"])
-    else
-      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.20"])
-    end
-  else
-    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.20"])
-  end
+
+  s.add_runtime_dependency "rspec", RSpec::Rails::Version::STRING
 end
 

data/spec/autotest/rails_rspec2_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+require "autotest/rails_rspec2"
+
+describe Autotest::RailsRspec2 do
+  before(:each) do
+    rails_rspec2_autotest = Autotest::RailsRspec2.new
+    @re = rails_rspec2_autotest.exceptions
+  end
+
+  it "should match './log/test.log'" do
+    @re.should match('./log/test.log')
+  end
+
+  it "should match 'log/test.log'" do
+    @re.should match('log/test.log')
+  end
+
+  it "should not match './spec/models/user_spec.rb'" do
+    @re.should_not match('./spec/models/user_spec.rb')
+  end
+
+  it "should not match 'spec/models/user_spec.rb'" do
+    @re.should_not match('spec/models/user_spec.rb')
+  end
+end

data/spec/rspec/rails/assertion_adapter_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe RSpec::Rails::TestUnitAssertionAdapter do
   include RSpec::Rails::TestUnitAssertionAdapter
 
-  Test::Unit::Assertions.public_instance_methods.select{|m| m.to_s =~ /^assert/}.each do |m|
+  Test::Unit::Assertions.public_instance_methods.select{|m| m.to_s =~ /^(assert|flunk)/}.each do |m|
     if m.to_s == "assert_equal"
       it "exposes #{m} to host examples" do
         assert_equal 3,3

data/spec/rspec/rails/fixture_support_spec.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+module RSpec::Rails
+  describe FixtureSupport do
+    context "with use_transactional_fixtures set to false" do
+      it "still supports fixture_path" do
+        RSpec.configuration.stub(:use_transactional_fixtures) { false }
+        group = RSpec::Core::ExampleGroup.describe do
+          include FixtureSupport
+        end
+
+        group.should respond_to(:fixture_path)
+        group.should respond_to(:fixture_path=)
+      end
+    end
+  end
+end

data/spec/rspec/rails/mocks/ar_classes.rb

@@ -12,6 +12,10 @@ module NoConnections
   end
 end
 
+class NonActiveRecordModel
+  extend ActiveModel::Naming
+end
+
 class MockableModel < ActiveRecord::Base
   include NoConnections
   has_one :associated_model

data/spec/rspec/rails/mocks/mock_model_spec.rb

@@ -140,6 +140,28 @@ describe "mock_model(RealModel)" do
     end
   end
 
+  describe "#respond_to?" do
+    context "with an ActiveRecord model" do
+      before(:each) do
+        MockableModel.stub(:column_names).and_return(["column_a", "column_b"])
+        @model = mock_model(MockableModel)
+      end
+      it "says it will respond_to?(key) if RealModel has the attribute 'key'" do
+        @model.respond_to?("column_a").should be(true)
+      end
+      it "does not say it will respond_to?(key) if RealModel does not have the attribute 'key'" do
+        @model.respond_to?("column_c").should be(false)
+      end
+    end
+
+    context "with a non-ActiveRecord model" do
+      it "responds as normal" do
+        model = NonActiveRecordModel.new
+        model.should respond_to(:to_param)
+      end
+    end
+  end
+
   describe "#destroyed?" do
     context "default" do
       it "returns false" do

data/spec/spec_helper.rb

@@ -1,6 +1,10 @@
-require 'active_record'
-require 'action_controller'
-require 'action_mailer'
+require 'rails/all'
+
+module RSpecRails
+  class Application < ::Rails::Application
+  end
+end
+
 require 'rspec/rails'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

data/templates/Gemfile

@@ -13,4 +13,6 @@ group :development, :test do
   gem "rspec-mocks",        :path => "../../../rspec-mocks"
   gem "rcov"
   gem "webrat"
+  gem "autotest"
+  gem "watchr"
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 20
-  version: 2.0.0.beta.20
+  - 22
+  version: 2.0.0.beta.22
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 -05:00
+date: 2010-09-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 20
-        version: 2.0.0.beta.20
+        - 22
+        version: 2.0.0.beta.22
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -50,10 +50,10 @@ files:
 - .gitignore
 - Gemfile
 - Gotchas.markdown
+- History.md
 - README.markdown
 - Rakefile
 - Upgrade.markdown
-- VERSION
 - autotest/discover.rb
 - cucumber.yml
 - features/README.markdown
@@ -135,6 +135,7 @@ files:
 - lib/rspec/rails/view_assigns.rb
 - lib/rspec/rails/view_rendering.rb
 - rspec-rails.gemspec
+- spec/autotest/rails_rspec2_spec.rb
 - spec/rspec/rails/assertion_adapter_spec.rb
 - spec/rspec/rails/example/controller_example_group_spec.rb
 - spec/rspec/rails/example/helper_example_group_spec.rb
@@ -144,6 +145,7 @@ files:
 - spec/rspec/rails/example/routing_example_group_spec.rb
 - spec/rspec/rails/example/view_example_group_spec.rb
 - spec/rspec/rails/example/view_rendering_spec.rb
+- spec/rspec/rails/fixture_support_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
@@ -165,7 +167,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.20!
+    Thank you for installing rspec-rails-2.0.0.beta.22!
   
     This version of rspec-rails only works with versions of rails >= 3.0.0.beta.4.
   
@@ -175,7 +177,7 @@ post_install_message: |
     can access its generators and rake tasks.
   
       group :development, :test do
-        gem "rspec-rails", ">= 2.0.0.beta.20"
+        gem "rspec-rails", ">= 2.0.0.beta.22"
       end
   
     Be sure to run the following command in each of your Rails apps if you're
@@ -206,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4009655746568462970
+      hash: 4218695540923363031
       segments: 
       - 0
       version: "0"
@@ -226,8 +228,29 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.20
+summary: rspec-rails-2.0.0.beta.22
 test_files: 
+- features/README.markdown
+- features/controller_specs/anonymous_controller.feature
+- features/controller_specs/isolation_from_views.feature
+- features/controller_specs/readers.feature
+- features/controller_specs/render_views.feature
+- features/helper_specs/helper_spec.feature
+- features/mailer_specs/url_helpers.feature
+- features/matchers/be_routable_matcher.feature
+- features/matchers/new_record_matcher.feature
+- features/matchers/redirect_to_matcher.feature
+- features/matchers/render_template_matcher.feature
+- features/mocks/mock_model.feature
+- features/mocks/stub_model.feature
+- features/model_specs/errors_on.feature
+- features/model_specs/transactional_examples.feature
+- features/routing_specs/access_to_named_routes.feature
+- features/step_definitions/model_steps.rb
+- features/support/env.rb
+- features/view_specs/inferred_controller_path.feature
+- features/view_specs/view_spec.feature
+- spec/autotest/rails_rspec2_spec.rb
 - spec/rspec/rails/assertion_adapter_spec.rb
 - spec/rspec/rails/example/controller_example_group_spec.rb
 - spec/rspec/rails/example/helper_example_group_spec.rb
@@ -237,6 +260,7 @@ test_files:
 - spec/rspec/rails/example/routing_example_group_spec.rb
 - spec/rspec/rails/example/view_example_group_spec.rb
 - spec/rspec/rails/example/view_rendering_spec.rb
+- spec/rspec/rails/fixture_support_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

data/VERSION

@@ -1 +0,0 @@
-2.0.0.beta.20