rspec-rails 2.4.1 → 2.5.0

data/.gitignore

@@ -6,3 +6,4 @@ doc
 vendor
 .bundle
 Gemfile.lock
+Gemfile

data/Gemfile-3-0-stable

@@ -0,0 +1,6 @@
+instance_eval(File.read("./Gemfile-base"))
+
+gem "rails", :git => "https://github.com/rails/rails.git", :branch => "3-0-stable"
+gem "arel",  :git => "https://github.com/rails/arel.git"
+gem "rack",  :git => "git://github.com/rack/rack.git"
+

data/Gemfile-3.0.0

@@ -0,0 +1,3 @@
+instance_eval(File.read("./Gemfile-base"))
+
+gem "rails", "3.0.0"

data/Gemfile-3.0.3

@@ -0,0 +1,3 @@
+instance_eval(File.read("./Gemfile-base"))
+
+gem "rails", "3.0.3"

data/{Gemfile → Gemfile-base}

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-%w[rspec rspec-core rspec-expectations rspec-mocks].each do |lib|
+%w[rspec rspec-core rspec-expectations rspec-mocks rspec-rails].each do |lib|
   library_path = File.expand_path("../../#{lib}", __FILE__)
   if File.exist?(library_path)
     gem lib, :path => library_path
@@ -9,14 +9,16 @@ source "http://rubygems.org"
   end
 end
 
+gem 'sqlite3-ruby', :require => 'sqlite3'
 gem "rake", "0.8.7"
-gem "cucumber", "0.9.4"
+gem "cucumber", "0.10.0"
 gem "aruba", "0.2.2"
 gem "rcov", "0.9.9"
 gem "relish", "0.2.0"
 gem "guard-rspec", "0.1.9"
 gem "growl", "1.0.3"
 gem "ZenTest", "~> 4.4.2"
+gem "webrat", "0.7.2"
 
 if RUBY_PLATFORM =~ /darwin/
   gem "autotest-fsevent", "~> 0.2.4"
@@ -34,9 +36,3 @@ end
 platforms :jruby do
   gem "jruby-openssl"
 end
-
-#### rspec-rails only
-gem "rails", :path => File.expand_path("../vendor/rails", __FILE__)
-gem "rack", :git => "git://github.com/rack/rack.git"
-gem 'webrat', "0.7.2"
-gem 'sqlite3-ruby', :require => 'sqlite3'

data/Gemfile-master

@@ -0,0 +1,5 @@
+instance_eval(File.read("./Gemfile-base"))
+
+gem "rails", :git => "https://github.com/rails/rails.git"
+gem "arel",  :git => "https://github.com/rails/arel.git"
+gem "rack",  :git => "https://github.com/rack/rack.git"

data/History.md

@@ -1,114 +1 @@
-## rspec-rails-2 release history
-
-### 2.4.1 / 2011-01-03
-
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.4.0...2.4.1)
-
-* Bug fixes
-  * fixed bug caused by including some Rails modules before RSpec's
-    RailsExampleGroup
-
-### 2.4.0 / 2011-01-02
-
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.3.1...2.4.0)
-
-* Enhancements
-  * include ApplicationHelper in helper object in helper specs
-  * include request spec extensions in files in spec/integration
-  * include controller spec extensions in groups that use :type => :controller
-    * same for :model, :view, :helper, :mailer, :request, :routing
-
-* Bug fixes
-  * restore global config.render_views so you only need to say it once
-  * support overriding render_views in nested groups
-  * matchers that delegate to Rails' assertions capture
-    ActiveSupport::TestCase::Assertion (so they work properly now with
-    should_not in Ruby 1.8.7 and 1.9.1)
-
-* Deprecations
-  * include_self_when_dir_matches
-
-### 2.3.1 / 2010-12-16
-
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.3.0...v2.3.1)
-
-* Bug fixes
-  * respond_to? correctly handles 2 args
-  * scaffold generator no longer fails on autotest directory
-
-### 2.3.0 / 2010-12-12
-
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.2.1...v2.3.0)
-
-* Changes
-  * Generator no longer generates autotest/autodiscover.rb, as it is no longer
-    needed (as of rspec-core-2.3.0)
-
-### 2.2.1 / 2010-12-01
-
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.2.0...v2.2.1)
-
-* Bug fixes
-  * Depend on railties, activesupport, and actionpack instead of rails (Piotr
-    Solnica)
-  * Got webrat integration working properly across different types of specs
-
-* Deprecations
-  * --webrat-matchers flag for generators is deprecated. use --webrat instead.
-
-### 2.2.0 / 2010-11-28
-
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.1.0...v2.2.0)
-
-* Enhancements
-  * Added stub_template in view specs
-
-* Bug fixes
-  * Properly include helpers in views (Jonathan del Strother)
-  * Fix bug in which method missing led to a stack overflow
-  * Fix stack overflow in request specs with open_session
-  * Fix stack overflow in any spec when method_missing was invoked
-  * Add gem dependency on rails ~> 3.0.0 (ensures bundler won't install
-    rspec-rails-2 with rails-2 apps).
-
-### 2.1.0 / 2010-11-07
-
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.1...v2.1.0)
-
-* Enhancements
-  * Move errors_on to ActiveModel to support other AM-compliant ORMs
-
-* Bug fixes
-  * Check for presence of ActiveRecord instead of checking Rails config
-    (gets rspec out of the way of multiple ORMs in the same app)
-
-### 2.0.1 / 2010-10-15
-
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.0...v2.0.1)
-
-* Enhancements
-  * Add option to not generate request spec (--skip-request-specs)
-
-* Bug fixes
-  * Updated the mock_[model] method generated in controller specs so it adds
-    any stubs submitted each time it is called.
-  * Fixed bug where view assigns weren't making it to the view in view specs in Rails-3.0.1.
-    (Emanuele Vicentini)
-
-### 2.0.0 / 2010-10-10
-
-[full changelog](https://github.com/rspec/rspec-rails/compare/ea6bdef...v2.0.0)
-
-* Enhancements
-  * ControllerExampleGroup uses controller as the implicit subject by default (Paul Rosania)
-  * autotest mapping improvements (Andreas Neuhaus)
-  * more cucumber features (Justin Ko)
-  * clean up spec helper (Andre Arko)
-  * add assign(name, value) to helper specs (Justin Ko)
-  * stub_model supports primary keys other than id (Justin Ko)
-  * support choice between Webrat/Capybara (Justin Ko)
-  * 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)
+See features/Changelog.md

data/README.md

@@ -9,7 +9,7 @@ NOTE: rspec-2 does _not_ support rails-2. Use rspec-rails-1.3.x for rails-2.
 The [Cucumber features](http://relishapp.com/rspec/rspec-rails) are the
 most comprehensive and up-to-date docs for end-users.
 
-The [RDoc](http://rubydoc.info/gems/rspec-rails/2.3.0/frames) provides additional
+The [RDoc](http://rubydoc.info/gems/rspec-rails/2.4.0/frames) provides additional
 information for contributors and/or extenders.
 
 All of the documentation is open source and a work in progress. If you find it
@@ -34,7 +34,7 @@ This installs the following gems:
 Add `rspec-rails` to the `:test` and `:development` groups in the Gemfile:
 
     group :test, :development do
-      gem "rspec-rails", "~> 2.0.1"
+      gem "rspec-rails", "~> 2.4"
     end
 
 It needs to be in the `:development` group to expose generators and rake

data/Rakefile

@@ -1,10 +1,12 @@
-unless File.directory?("vendor/rails")
+unless File.exist?('./Gemfile')
   raise <<-MESSAGE
-You need to clone the rails git repository into ./vendor before you can use any
-of the rake tasks.
-
-    git clone git://github.com/rails/rails.git vendor/rails
+Could not find a Gemfile. Please run any of:
+  thor rails:use 3-0-stable
+  thor rails:use master
+  thor rails:use 3.0.0
+  thor rails:use 3.0.3
 
+And then run 'bundle install'
 MESSAGE
 end
 require "bundler"
@@ -54,8 +56,8 @@ namespace :generate do
   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/"
+      sh "cp ./templates/Gemfile-base ./tmp/example_app/"
+      sh "cp ./Gemfile ./tmp/example_app/"
     end
   end
 

data/Thorfile

@@ -15,4 +15,11 @@ class Rails < Thor
       `git fetch`
     end
   end
+
+  desc "use VERSION", "copies the appropriate Gemfile to Gemfile"
+  def use(version)
+    `cp ./Gemfile-#{version} ./Gemfile` 
+    `rm ./Gemfile.lock`
+    system "bundle install"
+  end
 end

data/Upgrade.md

@@ -1,63 +1 @@
-# rspec-rails-2.3.0
-
-## autotest integration
-
-Add a .rspec file to the project's root directory (if not already there) to
-tell RSpec to tell Autotest to use RSpec's specialized Autotest class.
-
-NOTE that rspec-core-2.0, 2.1, and 2.2 required an autotest/discover.rb file in
-the project's root directory. This worked with some, but not all versions of
-autotest and/or the autotest command that ships with ZenTest. This new approach
-will work regardless of which version of autotest/ZenTest you are using.
-
-## Webrat and Capybara
-
-Earlier 2.0.0.beta versions depended on Webrat. As of
-rspec-rails-2.0.0.beta.20, this dependency and offers you a choice of using
-webrat or capybara. Just add the library of your choice to your Gemfile.
-
-## Controller specs
-
-### islation from view templates
-
-By default, controller specs do _not_ render view templates. This keeps
-controller specs isolated from the content of views and their requirements.
-
-NOTE that the template must exist, but it will not be rendered.  This is
-different from rspec-rails-1.x, in which the template didn't need to exist, but
-ActionController makes a number of new decisions in Rails 3 based on the
-existence of the template. To keep the RSpec code free of monkey patches, and
-to keep the rspec user experience simpler, we decided that this would be a fair
-trade-off.
-
-## View specs
-
-### view.should render_template
-
-Rails changed the way it renders partials, so to set an expectation that a
-partial gets rendered, you need 
-
-    render
-    view.should render_template(:partial => "widget/_row")
-
-### stub_template
-
-Introduced in rspec-rails-2.2, simulates the presence of view templates on the
-file system. This supports isolation from partials rendered by the vew template
-that is the subject of a view example:
-
-    stub_template "widgets/_widget.html.erb" => "This Content"
-
-### as_new_record
-
-Earlier versions of the view generators generated stub_model with `:new_record?
-=> true`. That is no longer recognized in rspec-rails-2, so you need to change
-this:
-  
-    stub_model(Widget, :new_record? => true)
-
-to this:
-
-    stub_model(Widget).as_new_record
-
-Generators in 2.0.0 final release will do the latter.
+See features/Upgrade.md

data/features/.nav

@@ -1,8 +1,9 @@
-- GettingStarted.md (Getting started)
-- Upgrade.md
-- Generators.md (Rails generators)
-- Autotest.md (Autotest integration)
+- GettingStarted.md (Start from scratch)
+- Generators.md (Generators)
 - transactional_examples.feature
+- Autotest.md (Autotest integration)
+- Changelog.md
+- Upgrade.md
 - model_specs:
   - errors_on.feature
 - controller_specs:

data/features/Autotest.md

@@ -1,10 +1,17 @@
-The rspec:install generator creates a .rspec file, which tells RSpec to tell
-Autotest that you're using RSpec and Rails. You'll also need to add the ZenTest
-gem to your Gemfile:
+The `rspec:install` generator creates a `.rspec` file, which tells RSpec to
+tell Autotest that you're using RSpec. You'll also need to add the ZenTest and
+autotest-rails gems to your Gemfile:
 
-    gem "ZenTest"
+    gem "ZenTest", "~> 4.4.2"
+    gem "autotest-rails", "~> 4.1.0"
+
+If all of the gems in your Gemfile are installed in system gems, you can just
+type
+
+    autotest
+
+If Bundler is managing any gems for you directly (i.e. you've got `:git` or
+`:path` attributes in the Gemfile), however, you may need to run
+
+    bundle exec 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.

data/features/Changelog.md

@@ -0,0 +1,127 @@
+### 2.5.0 / 2011-02-05
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.4.1...v2.5.0)
+
+* Enhancements
+  * use index_helper instead of table_name when generating specs (Reza
+    Primardiansyah)
+ 
+* Bug fixes
+  * fixed bug in which `render_views` in a nested group set the value in its
+    parent group.
+  * only include MailerExampleGroup when it is defiend (Steve Sloan)
+  * mock_model.as_null_object.attribute.blank? returns false (Randy Schmidt)
+  * fix typo in request specs (Paco Guzman)
+
+### 2.4.1 / 2011-01-03
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.4.0...v2.4.1)
+
+* Bug fixes
+  * fixed bug caused by including some Rails modules before RSpec's
+    RailsExampleGroup
+
+### 2.4.0 / 2011-01-02
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.3.1...v2.4.0)
+
+* Enhancements
+  * include ApplicationHelper in helper object in helper specs
+  * include request spec extensions in files in spec/integration
+  * include controller spec extensions in groups that use :type => :controller
+    * same for :model, :view, :helper, :mailer, :request, :routing
+
+* Bug fixes
+  * restore global config.render_views so you only need to say it once
+  * support overriding render_views in nested groups
+  * matchers that delegate to Rails' assertions capture
+    ActiveSupport::TestCase::Assertion (so they work properly now with
+    should_not in Ruby 1.8.7 and 1.9.1)
+
+* Deprecations
+  * include_self_when_dir_matches
+
+### 2.3.1 / 2010-12-16
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.3.0...v2.3.1)
+
+* Bug fixes
+  * respond_to? correctly handles 2 args
+  * scaffold generator no longer fails on autotest directory
+
+### 2.3.0 / 2010-12-12
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.2.1...v2.3.0)
+
+* Changes
+  * Generator no longer generates autotest/autodiscover.rb, as it is no longer
+    needed (as of rspec-core-2.3.0)
+
+### 2.2.1 / 2010-12-01
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.2.0...v2.2.1)
+
+* Bug fixes
+  * Depend on railties, activesupport, and actionpack instead of rails (Piotr
+    Solnica)
+  * Got webrat integration working properly across different types of specs
+
+* Deprecations
+  * --webrat-matchers flag for generators is deprecated. use --webrat instead.
+
+### 2.2.0 / 2010-11-28
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.1.0...v2.2.0)
+
+* Enhancements
+  * Added stub_template in view specs
+
+* Bug fixes
+  * Properly include helpers in views (Jonathan del Strother)
+  * Fix bug in which method missing led to a stack overflow
+  * Fix stack overflow in request specs with open_session
+  * Fix stack overflow in any spec when method_missing was invoked
+  * Add gem dependency on rails ~> 3.0.0 (ensures bundler won't install
+    rspec-rails-2 with rails-2 apps).
+
+### 2.1.0 / 2010-11-07
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.1...v2.1.0)
+
+* Enhancements
+  * Move errors_on to ActiveModel to support other AM-compliant ORMs
+
+* Bug fixes
+  * Check for presence of ActiveRecord instead of checking Rails config
+    (gets rspec out of the way of multiple ORMs in the same app)
+
+### 2.0.1 / 2010-10-15
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.0...v2.0.1)
+
+* Enhancements
+  * Add option to not generate request spec (--skip-request-specs)
+
+* Bug fixes
+  * Updated the mock_[model] method generated in controller specs so it adds
+    any stubs submitted each time it is called.
+  * Fixed bug where view assigns weren't making it to the view in view specs in Rails-3.0.1.
+    (Emanuele Vicentini)
+
+### 2.0.0 / 2010-10-10
+
+[full changelog](https://github.com/rspec/rspec-rails/compare/ea6bdef...v2.0.0)
+
+* Enhancements
+  * ControllerExampleGroup uses controller as the implicit subject by default (Paul Rosania)
+  * autotest mapping improvements (Andreas Neuhaus)
+  * more cucumber features (Justin Ko)
+  * clean up spec helper (Andre Arko)
+  * add assign(name, value) to helper specs (Justin Ko)
+  * stub_model supports primary keys other than id (Justin Ko)
+  * support choice between Webrat/Capybara (Justin Ko)
+  * 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)