rspec-rails 2.0.0.beta.22 → 2.6.0

data/.gitignore

@@ -1,8 +1,14 @@
 tmp
-pkg
-.bundle
-rspec-rails-
 doc
+pkg
 vendor
-.bundle
+!lib/rspec/rails/vendor
+*.gem
+Gemfile
 Gemfile.lock
+gemfiles/*.lock
+gemfiles/bin/*
+bin
+.rvmrc
+*.rbc
+.gemfile

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -0,0 +1,10 @@
+script: "rake --trace 2>&1"
+rvm:
+  - 1.8.7
+  - 1.9.2
+gemfile:
+  - gemfiles/rails-3.0.7
+  - gemfiles/rails-3.1.0.beta1
+  - gemfiles/rails-master
+env:
+  - CI=true

data/History.md

@@ -1,33 +1 @@
-## 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)
+See features/Changelog.md

data/License.txt

@@ -0,0 +1,23 @@
+(The MIT License)
+
+Copyright (c) 2009 David Chelimsky
+Copyright (c) 2005 The RSpec Development Team
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/{README.markdown → README.md}

@@ -2,9 +2,26 @@
 
 rspec-2 for rails-3 with lightweight extensions to each
 
+[![build status](http://travis-ci.org/rspec/rspec-rails.png)](http://travis-ci.org/rspec/rspec-rails)
+
+NOTE: rspec-2 does _not_ support rails-2. Use rspec-rails-1.3.x for rails-2.
+
+## Documentation
+
+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.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
+lacking or confusing, you can help improve it by submitting requests and
+patches to the [rspec-rails issue
+tracker](https://github.com/rspec/rspec-rails/issues).
+
 ## Install
 
-    gem install rspec-rails --pre
+    gem install rspec-rails
 
 This installs the following gems:
 
@@ -19,7 +36,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.0.beta.22"
+      gem "rspec-rails", "~> 2.4"
     end
 
 It needs to be in the `:development` group to expose generators and rake
@@ -45,7 +62,7 @@ out of the box for the default scenario (`ActiveRecord` + `Webrat`).
 
 ### Autotest
 
-The `rspec:install` generator creates an `./autotest/discover.rb` file, which
+The `rspec:install` generator creates an `.rspec` 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:
 
@@ -99,8 +116,6 @@ not send you to the doctor with a migraine.
 
 See http://github.com/rspec/rspec-rails/issues
 
-Also see [Gotchas.markdown](http://github.com/rspec/rspec-rails/blob/master/Gotchas.markdown)
-
 # Request Specs
 
 Request specs live in spec/requests.
@@ -129,8 +144,8 @@ You can use RSpec expectations/matchers or Test::Unit assertions.
 ## `render_views`
 By default, controller specs do not render views.  This supports specifying
 controllers without concern for whether the views they render work correctly
-(NOTE: the template must exist, unlike rspec-rails-1. See Upgrade.markdown for
-more information about this). If you prefer to render the views (a la Rails'
+(NOTE: the template must exist, unlike rspec-rails-1. See Upgrade.md for more
+information about this). If you prefer to render the views (a la Rails'
 functional tests), you can use the `render_views` declaration in each example
 group:
 
@@ -182,6 +197,11 @@ This means that most of the time you don't need to set these values. When
 spec'ing a partial that is included across different controllers, you _may_
 need to override these values before rendering the view.
 
+To provide a layout for the render, you'll need to specify _both_ the template
+and the layout explicitly.  For example:
+
+    render :template => "events/show", :layout => "layouts/application"
+
 ## `assign(key, val)`
 
 Use this to assign values to instance variables in the view:

data/README_DEV.md

@@ -0,0 +1,43 @@
+# Information for rspec-rails developers
+
+rspec-rails lives in a complicated ecosystem. We need to run it against
+multiple versions of rails and multiple versions of Ruby as well. There are
+several tools already available to manage running against multiple versions of
+Ruby (e.g. rvm), and there are even some multi-rails tools (e.g. multi-rails)
+but we haven't found one that does exactly what we need here, so we've rolled
+our own.
+
+## The short version
+
+thor rails:use 3.0.6
+rake
+
+## The long version
+
+### thor rails:use
+
+The `thor rails:use` task accepts any released version of rails, or either the
+3-0-stable or master branches.
+
+    thor rails:use master
+    thor rails:use 3-0-stable
+    thor rails:use 3.0.6
+    thor rails:use 3.0.5
+    thor rails:use 3.0.4
+    thor rails:use 3.0.3
+    thor rails:use 3.0.2
+    thor rails:use 3.0.1
+    thor rails:use 3.0.0
+
+It then does several things:
+
+* generates a .gemfile file with the version listed. This is used internally by
+  assorted rake tasks.
+* installs the bundle using the appropriate file in the gemfiles directory
+** this includes binstubs, which are stored in ./gemfiles/bin
+* symlinks the gemfiles/bin directory to ./bin (in the project root) to support
+  running bin/rspec from the project root
+
+At any time, if you want to change rails versions, run `thor rails:use` with a
+new version number. To play it safe, you probably want to also run `rake
+clobber` to delete all the code generated by the previous rails version.

data/Rakefile

@@ -1,74 +1,139 @@
-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.
+require 'pathname'
+ENV["BUNDLE_GEMFILE"] ||= begin
+                            version = if File.exist?("./.gemfile")
+                                        File.read("./.gemfile").chomp
+                                      else
+                                        "rails-3.0.7"
+                                      end
+                            File.expand_path("../gemfiles/#{version}", __FILE__)
+                          end
+puts "Using gemfile: #{ENV["BUNDLE_GEMFILE"].gsub(Pathname.new(__FILE__).dirname.to_s,'').sub(/^\//,'')}"
+require "bundler"
+begin
+  Bundler.setup
+rescue
+  if ENV["CI"]
+    sh "bundle install"
+    Bundler.setup
+  else
+    raise "You need to install a bundle first. Try 'thor gemfile:use 3.0.7'"
+  end
+end
+Bundler::GemHelper.install_tasks
 
-    git clone git://github.com/rails/arel.git  vendor/arel
-    git clone git://github.com/rails/rails.git vendor/rails
+task :build => :raise_if_psych_is_defined
 
-MESSAGE
+task :raise_if_psych_is_defined do
+  if defined?(Psych)
+    raise <<-MSG
+===============================================================================
+Gems compiled in Ruby environments with Psych loaded are incompatible with Ruby
+environments that don't have Psych loaded. Try building this gem in Ruby 1.8.7
+instead.
+===============================================================================
+MSG
+  end
 end
-require "bundler"
-Bundler.setup
-Bundler::GemHelper.install_tasks
 
 require 'rake'
 require 'yaml'
 
-require 'rake/rdoctask'
 require 'rspec'
 require 'rspec/core/rake_task'
-require 'cucumber/rake/task'
-
-RSpec::Core::RakeTask.new(:spec)
-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(" ")
+
+begin
+  require 'cucumber/rake/task'
+
+  Cucumber::Rake::Task.new(:cucumber)
+
+  namespace :cucumber do
+    desc "Run cucumber features using rcov"
+    Cucumber::Rake::Task.new :rcov => :cleanup_rcov_files do |t|
+      t.cucumber_opts = %w{--format progress}
+      t.rcov = true
+      t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
+      t.rcov_opts << %[--text-report --sort coverage --aggregate coverage.data]
+    end
+  end
+rescue LoadError
+  puts "unable to load cucumber, some tasks unavailable"
+  task :cucumber do
+    # no-op
+  end
+end
+task :cleanup_rcov_files do
+  rm_rf 'coverage.data'
+end
+
+desc "Run all examples"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = %w[--color]
+end
+
+
+namespace :spec do
+  desc "Run all examples using rcov"
+  RSpec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
+    t.rcov = true
+    t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,features"]
+    t.rcov_opts << %[--text-report --sort coverage --no-html --aggregate coverage.data]
   end
 end
-Cucumber::Rake::Task.new(:cucumber)
 
 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/"
+      sh "rails new ./tmp/example_app --skip-javascript --skip-gemfile --skip-git"
+      bindir = File.expand_path("gemfiles/bin")
+      if test ?d, bindir
+        Dir.chdir("./tmp/example_app") do
+          sh "rm -rf test"
+          sh "ln -s #{bindir}"
+          application_filename = "config/application.rb"
+          application_file = File.read(application_filename)
+          sh "rm #{application_filename}"
+          puts "rewrite #{application_filename} with config.assets.enabled = false"
+          File.open(application_filename, "w") do |f|
+            f.write application_file.gsub("config.assets.enabled = true","config.assets.enabled = false")
+          end
+          "config/initializers/wrap_parameters.rb".tap do |f|
+            sh "rm #{f}" if test ?f, f
+          end
+        end
+      end
     end
   end
 
   desc "generate a bunch of stuff with generators"
   task :stuff do
-    Dir.chdir("./tmp/example_app/") do
-      sh "rake rails:template LOCATION='../../templates/generate_stuff.rb'"
+    in_example_app "rake rails:template LOCATION='../../templates/generate_stuff.rb'"
+  end
+end
+
+def in_example_app(command)
+  Dir.chdir("./tmp/example_app/") do
+    Bundler.with_clean_env do
+      sh command
     end
   end
 end
 
 namespace :db do
   task :migrate do
-    Dir.chdir("./tmp/example_app/") do
-      sh "rake db:migrate"
-    end
+    in_example_app "rake db:migrate"
   end
 
   namespace :test do
     task :prepare do
-      Dir.chdir("./tmp/example_app/") do
-        sh "rake db:test:prepare"
-      end
+      in_example_app "rake db:test:prepare"
     end
   end
 end
 
 desc "run a variety of specs against the generated app"
 task :smoke do
-  Dir.chdir("./tmp/example_app/") do
-    sh "rake rails:template LOCATION='../../templates/run_specs.rb'"
-  end
+  in_example_app "rake rails:template --trace LOCATION='../../templates/run_specs.rb'"
 end
 
 desc 'clobber generated files'
@@ -85,5 +150,10 @@ namespace :clobber do
   end
 end
 
-task :default => [:spec, "clobber:app", "generate:app", "generate:stuff", :cucumber, :smoke]
+desc "Push docs/cukes to relishapp using the relish-client-gem"
+task :relish, :version do |t, args|
+  raise "rake relish[VERSION]" unless args[:version]
+  sh "relish push rspec/rspec-rails:#{args[:version]}"
+end
 
+task :default => [:spec, "clobber:app", "generate:app", "generate:stuff", :smoke, :cucumber]

data/Thorfile

@@ -0,0 +1,40 @@
+class Gemfile < Thor
+  desc "use VERSION", "installs the bundle using gemfiles/rails-VERSION"
+  def use(version)
+    "gemfiles/rails-#{version}".tap do |gemfile|
+      ENV["BUNDLE_GEMFILE"] = File.expand_path(gemfile)
+      say "Using #{gemfile}"
+    end
+    "bundle install --binstubs".tap do |m|
+      say m
+      system m
+    end
+    unless version =~ /^\d\.\d\.\d/
+      "bundle update rails".tap do |m|
+        say m
+        system m
+      end
+    end
+    say `ln -s gemfiles/bin` unless File.exist?('bin')
+    `echo rails-#{version} > ./.gemfile`
+  end
+
+  desc "which", "print out the configured gemfile"
+  def which
+    say `cat ./.gemfile`
+  end
+
+  desc "list", "list the available options for 'thor gemfile:use'"
+  def list
+    all = `ls gemfiles`.chomp.split.grep(/^rails/).reject {|i| i =~ /lock$/}
+
+    versions = all.grep(/^rails-\d\.\d/)
+    branches = all - versions
+
+    puts "releases:"
+    versions.sort.reverse.each {|i| puts i}
+    puts
+    puts "branches:"
+    branches.sort.reverse.each {|i| puts i}
+  end
+end

data/Upgrade.md

@@ -0,0 +1 @@
+See features/Upgrade.md

data/features/.nav

@@ -0,0 +1,34 @@
+- GettingStarted.md (Start from scratch)
+- Generators.md (Generators)
+- transactional_examples.feature
+- Autotest.md (Autotest integration)
+- Changelog.md
+- Upgrade.md
+- request_specs:
+  - request_spec.feature
+- model_specs:
+  - errors_on.feature
+- controller_specs:
+  - controller_spec.feature
+  - isolation_from_views.feature
+  - render_views.feature
+  - anonymous_controller.feature
+- helper_specs:
+  - helper_spec.feature
+- mailer_specs:
+  - url_helpers.feature
+- routing_specs:
+  - route_to_matcher.feature
+  - be_routable_matcher.feature
+  - named_routes.feature
+- view_specs:
+  - view_spec.feature
+  - stub_template.feature
+  - inferred_controller_path.feature
+- matchers:
+  - new_record_matcher.feature
+  - render_template_matcher.feature
+  - redirect_to_matcher.feature
+- mocks:
+  - mock_model.feature
+  - stub_model.feature

data/features/Autotest.md

@@ -0,0 +1,24 @@
+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", "~> 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
+
+If you do, you require Autotest's bundler plugin in a `.autotest` file in the
+project root directory or your home directory:
+
+    require "autotest/bundler"
+
+Now you can just type `autotest`, it should prefix the generated shell command
+with `bundle exec`.

data/features/Changelog.md

@@ -0,0 +1,151 @@
+### 2.6.0 / 2011-05-12
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.5.0...v2.6.0)
+
+* Enhancements
+  * rails 3 shortcuts for routing specs (Joe Fiorini)
+  * support nested resources in generators (Tim McEwan)
+  * require 'rspec/rails/mocks' to use `mock_model` without requiring the whole
+    rails framework
+  * Update the controller spec generated by the rails scaffold generator:
+    * Add documentation to the generated spec
+    * Use `any_instance` to avoid stubbing finders
+    * Use real objects instead of `mock_model`
+  * Update capybara integration to work with capy 0.4 and 1.0.0.beta
+  * Decorate paths passed to `[append|prepend]_view_paths` with empty templates
+    unless rendering views. (Mark Turner)
+
+* Bug fixes
+  * fix typo in "rake spec:statsetup" (Curtis Schofield)
+  * expose named routes in anonymous controller specs (Andy Lindeman)
+  * error when generating namespaced scaffold resources (Andy Lindeman)
+  * Fix load order issue w/ Capybara (oleg dashevskii)
+  * Fix monkey patches that broke due to internal changes in rails-3.1.0.beta1
+
+### 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 defined (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)

data/features/Generators.md

@@ -0,0 +1,8 @@
+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 with Rails' defaults (ActiveRecord, no Capybara or Webrat).