rspec-rails 2.0.0.rc → 2.0.0

data/Gemfile

@@ -9,8 +9,8 @@ gem 'rspec-expectations', :path => "../rspec-expectations"
 gem 'rspec-mocks', :path => "../rspec-mocks"
 gem 'rspec', :path => "../rspec"
 
-gem 'cucumber'
-gem 'aruba', ">= 0.2.0", :require => nil
+gem 'cucumber', '~> 0.9.2'
+gem 'aruba', "~> 0.2.3", :require => nil
 gem 'webrat', ">= 0.7.2.beta.1"
 gem 'sqlite3-ruby', :require => 'sqlite3'
 

data/History.md

@@ -1,5 +1,13 @@
 ## rspec-rails release history (incomplete)
 
+### 2.0.0 / 2010-10-10
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.0.rc...v2.0.0)
+
+* Changes
+  * route_to matcher delegates to assert_recognizes instead of assert_routing
+  * update generators to use as_new_record instead of :new_record => true
+
 ### 2.0.0.rc / 2010-10-05
 
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.0.beta.22...v2.0.0.rc)

data/Rakefile

@@ -20,7 +20,6 @@ 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.
@@ -28,8 +27,37 @@ class Cucumber::Rake::Task::ForkedCucumberRunner
     sh "bundle exec #{RUBY} " + args.join(" ")
   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
+
 Cucumber::Rake::Task.new(:cucumber)
 
+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
+
+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
+
 namespace :generate do
   desc "generate a fresh app with rspec installed"
   task :app do |t|
@@ -85,5 +113,11 @@ namespace :clobber do
   end
 end
 
-task :default => [:spec, "clobber:app", "generate:app", "generate:stuff", :cucumber, :smoke]
+desc "Push cukes to relishapp using the relish-client-gem"
+task :relish, :version do |t, args|
+  raise "rake relish[VERSION]" unless args[:version]
+  sh "bundle exec relish --organization rspec --project rspec-rails -v #{args[:version]} push"
+end
+
+task :default => [:spec, "clobber:app", "generate:app", "generate:stuff", :smoke, :cucumber]
 

data/Upgrade.markdown

@@ -1,11 +1,10 @@
-# Changes in beta.20
-
-### Webrat or Capybara
+# Upgrade to rspec-rails-2
 
-rspec-rails-2.0.0.beta.20 removes the dependency and offers you a choice of
-using webrat or capybara. Just add the library of your choice to your Gemfile.
+## Webrat and Capybara
 
-# Upgrade to rspec-rails-2
+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
 
@@ -29,3 +28,17 @@ partial gets rendered:
     render
     view.should render_template(:partial => "widget/_row")
 
+## as_new_record
+
+Earlier versions of the view generators generated stub_model with `:new_record?
+=> true`. As of rspec-rails-2.0.0.rc, that is no longer recognized, 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.
+

data/features/README.markdown

@@ -1,12 +1,17 @@
-# Cucumber features
+rspec-rails extends Rails' built-in testing framework to support rspec examples
+for requests, controllers, models, views, and helpers.
 
-RSpec is specified using both RSpec and
-[Cucumber](http://github.com/aslakhellesoy/cucumber). Cucumber provides
-_executable documentation_.  This means that the _.feature_ files below this
-directory serve as specification, documentation _and_ regression tests of the
-behaviour.
+## Rails-3
+
+rspec-rails-2 supports rails-3.0.0 and later. For earlier versions of Rails,
+you need [rspec-rails-1.3](http://rspec.info).
 
 ## Issues
 
-If you find this documentation incomplete or confusing, please [submit an
-issue](http://github.com/rspec/rspec-rails/issues).
+The documentation for rspec-rails is a work in progress. We'll be adding
+Cucumber features over time, and clarifying existing ones.  If you have
+specific features you'd like to see added, find the existing documentation
+incomplete or confusing, or, better yet, wish to write a missing Cucumber
+feature yourself, please [submit an
+issue](http://github.com/rspec/rspec-rails/issues) or a [pull
+request](http://github.com/rspec/rspec-rails).

data/lib/autotest/rails_rspec2.rb

@@ -71,7 +71,7 @@ class Autotest::RailsRspec2 < Autotest::Rspec2
     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$%) {
+    add_mapping(%r%^(spec/(spec_helper|support/.*)|config/(boot|environment(s/test)?))\.rb$%) {
       files_matching %r%^spec/(models|controllers|routing|views|helpers)/.*_spec\.rb$%
     }
     add_mapping(%r%^lib/(.*)\.rb$%) { |_, m|

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

@@ -3,13 +3,11 @@ require 'spec_helper'
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "<%= table_name %>/new.html.<%= options[:template_engine] %>" do
   before(:each) do
-    assign(:<%= file_name %>, stub_model(<%= class_name %>,
-      :new_record? => true<%= output_attributes.empty? ? '' : ',' %>
+    assign(:<%= file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? ').as_new_record)' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
       :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
-    ))
-  end
+<%= !output_attributes.empty? ? "    ).as_new_record)\n  end" : "  end" %>
 
   it "renders new <%= file_name %> form" do
     render

data/lib/rspec/rails.rb

@@ -8,6 +8,11 @@ module RSpec
   end
 end
 
+RSpec::configure do |c|
+  c.backtrace_clean_patterns << /vendor\//
+  c.backtrace_clean_patterns << /lib\/rspec\/rails/
+end
+
 require 'rspec/core'
 require 'rspec/rails/extensions'
 require 'rspec/rails/view_rendering'

data/lib/rspec/rails/matchers/routing_matchers.rb

@@ -5,7 +5,7 @@ module RSpec::Rails::Matchers
     matcher :route_to do |route_options|
       match_unless_raises Test::Unit::AssertionFailedError do |path|
         assertion_path = { :method => path.keys.first, :path => path.values.first }
-        assert_routing(assertion_path, route_options)
+        assert_recognizes(route_options, assertion_path)
       end
 
       failure_message_for_should do

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Rails # :nodoc:
     module Version # :nodoc:
-      STRING = '2.0.0.rc'
+      STRING = '2.0.0'
     end
   end
 end

data/rspec-rails.gemspec

@@ -45,8 +45,8 @@ Gem::Specification.new do |s|
   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:
+  Beta versions of rspec-rails-2 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

data/spec/autotest/rails_rspec2_spec.rb

@@ -2,24 +2,40 @@ 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
+  let(:rails_rspec2_autotest) { Autotest::RailsRspec2.new }
 
-  it "should match 'log/test.log'" do
-    @re.should match('log/test.log')
-  end
+  describe 'exceptions' do
+    let(:exceptions_regexp) { rails_rspec2_autotest.exceptions }
+
+    it "should match './log/test.log'" do
+      exceptions_regexp.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')
+    it "should match 'log/test.log'" do
+      exceptions_regexp.should match('log/test.log')
+    end
+
+    it "should not match './spec/models/user_spec.rb'" do
+      exceptions_regexp.should_not match('./spec/models/user_spec.rb')
+    end
+
+    it "should not match 'spec/models/user_spec.rb'" do
+      exceptions_regexp.should_not match('spec/models/user_spec.rb')
+    end
   end
 
-  it "should not match 'spec/models/user_spec.rb'" do
-    @re.should_not match('spec/models/user_spec.rb')
+  describe 'mappings' do
+    before do
+      rails_rspec2_autotest.find_order = %w(
+        spec/models/user_spec.rb
+        spec/support/blueprints.rb
+      )
+    end
+
+    it 'runs model specs when support files change' do
+      rails_rspec2_autotest.test_files_for('spec/support/blueprints.rb').should(
+        include('spec/models/user_spec.rb'))
+    end
   end
 end

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

@@ -3,8 +3,8 @@ require "spec_helper"
 describe "route_to" do
   include RSpec::Rails::Matchers::RoutingMatchers
 
-  it "uses failure message from assert_routing" do
-    self.stub!(:assert_routing).and_raise(
+  it "uses failure message from assert_recognizes" do
+    self.stub!(:assert_recognizes).and_raise(
       Test::Unit::AssertionFailedError.new("this message"))
     expect do
       {"this" => "path"}.should route_to("these" => "options")

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 7712058
-  prerelease: true
+  prerelease: false
   segments: 
   - 2
   - 0
   - 0
-  - rc
-  version: 2.0.0.rc
+  version: 2.0.0
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,26 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -05:00
+date: 2010-10-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: rspec
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7712058
         segments: 
         - 2
         - 0
         - 0
-        - rc
-        version: 2.0.0.rc
-  requirement: *id001
+        version: 2.0.0
   type: :runtime
-  name: rspec
   prerelease: false
+  version_requirements: *id001
 description: RSpec-2 for Rails-3
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
@@ -49,7 +45,6 @@ files:
 - .document
 - .gitignore
 - Gemfile
-- Gotchas.markdown
 - History.md
 - README.markdown
 - Rakefile
@@ -170,7 +165,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.rc!
+    Thank you for installing rspec-rails-2.0.0!
   
     This version of rspec-rails only works with versions of rails >= 3.0.0
   
@@ -180,7 +175,7 @@ post_install_message: |
     can access its generators and rake tasks.
   
       group :development, :test do
-        gem "rspec-rails", ">= 2.0.0.rc"
+        gem "rspec-rails", ">= 2.0.0"
       end
   
     Be sure to run the following command in each of your Rails apps if you're
@@ -191,8 +186,8 @@ post_install_message: |
     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:
+    Beta versions of rspec-rails-2 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
@@ -211,28 +206,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 4170741284803000716
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 4170741284803000716
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.rc
+summary: rspec-rails-2.0.0
 test_files: 
 - features/README.markdown
 - features/controller_specs/anonymous_controller.feature

data/Gotchas.markdown

@@ -1,14 +0,0 @@
-# Gotchas
-
-## Name conflicts with upstream dependencies
-
-Examples in rspec-rails mix in Rails' assertion modules, which mix in assertion
-libraries from Minitest (if available) or Test::Unit. This makes it easy to
-accidentally override a method defined in one of those upstream modules in an
-example.
-
-For example, if you have a model named `Message`, and you define a `message`
-method (using `def message` or `let(:message)` in an example group, it will
-override Minitest's `message` method, which is used internally by Minitest, and
-is also a public API of Minitest. In this case, you would need to use a
-different method name or work with instance variables instead of methods.