rspec-rails 2.6.0 → 2.6.1

data/.travis.yml

@@ -1,10 +1,11 @@
-script: "rake --trace 2>&1"
+script: "gemfiles/bin/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-3.1.0.rc1
   - gemfiles/rails-master
+bundler_args: "--binstubs"
 env:
   - CI=true

data/Rakefile

@@ -35,9 +35,7 @@ MSG
   end
 end
 
-require 'rake'
 require 'yaml'
-
 require 'rspec'
 require 'rspec/core/rake_task'
 
@@ -90,16 +88,11 @@ namespace :generate do
         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|
+          application_file = File.read("config/application.rb")
+          sh "rm config/application.rb"
+          File.open("config/application.rb","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
@@ -107,7 +100,7 @@ namespace :generate do
 
   desc "generate a bunch of stuff with generators"
   task :stuff do
-    in_example_app "rake rails:template LOCATION='../../templates/generate_stuff.rb'"
+    in_example_app "bin/rake rails:template LOCATION='../../templates/generate_stuff.rb'"
   end
 end
 
@@ -121,19 +114,19 @@ end
 
 namespace :db do
   task :migrate do
-    in_example_app "rake db:migrate"
+    in_example_app "bin/rake db:migrate"
   end
 
   namespace :test do
     task :prepare do
-      in_example_app "rake db:test:prepare"
+      in_example_app "bin/rake db:test:prepare"
     end
   end
 end
 
 desc "run a variety of specs against the generated app"
 task :smoke do
-  in_example_app "rake rails:template --trace LOCATION='../../templates/run_specs.rb'"
+  in_example_app "bin/rake rails:template --trace LOCATION='../../templates/run_specs.rb'"
 end
 
 desc 'clobber generated files'

data/Thorfile

@@ -1,14 +1,7 @@
 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
+    with(version, %w[bundle install --binstubs])
     unless version =~ /^\d\.\d\.\d/
       "bundle update rails".tap do |m|
         say m
@@ -19,6 +12,18 @@ class Gemfile < Thor
     `echo rails-#{version} > ./.gemfile`
   end
 
+  desc "with VERSION COMMAND", "executes COMMAND with the gemfile for VERSION"
+  def with(version, *command)
+    "gemfiles/rails-#{version}".tap do |gemfile|
+      ENV["BUNDLE_GEMFILE"] = File.expand_path(gemfile)
+      say "BUNDLE_GEMFILE=#{gemfile}"
+    end
+    command.join(' ').tap do |m|
+      say m
+      system m
+    end
+  end
+
   desc "which", "print out the configured gemfile"
   def which
     say `cat ./.gemfile`

data/features/.nav

@@ -4,6 +4,7 @@
 - Autotest.md (Autotest integration)
 - Changelog.md
 - Upgrade.md
+- RailsVersions.md (Rails versions)
 - request_specs:
   - request_spec.feature
 - model_specs:

data/features/Changelog.md

@@ -1,3 +1,14 @@
+### 2.6.1 / 2011-05-25
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.6.0...v2.6.1)
+
+This release is compatible with rails-3.1.0.rc1, but not rails-3.1.0.beta1
+
+* Bug fixes
+  * fix controller specs with anonymous controllers with around filters
+  * exclude spec directory from rcov metrics
+  * guard against calling prerequisites on nil default rake task (Jack Dempsey)
+
 ### 2.6.0 / 2011-05-12
 
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.5.0...v2.6.0)

data/features/RailsVersions.md

@@ -0,0 +1,4 @@
+    rails version | rspec-rails version
+    2.3           | 1.3.4
+    3.0           | >= 2.0
+    3.1           | >= 2.6

data/features/controller_specs/anonymous_controller.feature

@@ -76,3 +76,34 @@ Feature: anonymous controller
     """
     When I run `rspec spec`
     Then the examples should all pass
+
+  Scenario: regression with ApplicationController around_filters
+    Given a file named "spec/controllers/application_controller_around_filter_spec.rb" with:
+    """
+    require "spec_helper"
+
+    class ApplicationController < ActionController::Base
+      around_filter :some_around_filter
+
+      def some_around_filter
+        @callback_invoked = true
+        yield
+      end
+    end
+
+    describe ApplicationController do
+      controller do
+        def index
+          render :nothing => true
+        end
+      end
+
+      it "invokes the callback" do
+        get :index
+
+        assigns[:callback_invoked].should be_true
+      end
+    end
+    """
+    When I run `rspec spec`
+    Then the examples should all pass

data/features/helper_specs/helper_spec.feature

@@ -1,18 +1,27 @@
 Feature: helper spec
   
   Helper specs live in `spec/helpers`, or any example group with `:type =>
-  :helper`. In order to access the helper methods you can call them on the
-  `helper` object.
+  :helper`.
+
+  Helper specs expose a `helper` object, which includes the helper module being
+  specified, the `ApplicationHelper` module (if there is one) and all of the
+  helpers built into Rails. It does not include the other helper modules in
+  your app.
+
+  To access the helper methods you're specifying, simply call them directly
+  on the `helper` object.
+
+  NOTE: helper methods defined in controllers are not included.
   
-  Scenario: helper method that returns true
+  Scenario: helper method that returns a value
     Given a file named "spec/helpers/application_helper_spec.rb" with:
       """
       require "spec_helper"
       
       describe ApplicationHelper do
         describe "#page_title" do
-          it "returns true" do
-            helper.page_title.should be_true
+          it "returns the default title" do
+            helper.page_title.should eq("RSpec is your friend")
           end
         end
       end
@@ -21,7 +30,7 @@ Feature: helper spec
       """
       module ApplicationHelper
         def page_title
-          true
+          "RSpec is your friend"
         end
       end
       """

data/features/matchers/README.md

@@ -1,4 +1,18 @@
 rspec-rails offers a number of custom matchers, most of which are
 rspec-compatible wrappers for Rails' assertions.
 
+### redirects
 
+    # delegates to assert_redirected_to
+    response.should redirect_to(path)
+
+### templates
+
+    # delegates to assert_template
+    response.should render_template(template_name)
+
+### assigned objects
+
+    # passes if assigns(:widget) is an instance of Widget
+    # and it is not persisted
+    assigns(:widget).should be_a_new(Widget)

data/gemfiles/base.rb

@@ -14,6 +14,8 @@ module GemfileBase
         end
       end
 
+      gem 'rake', '0.8.7'
+      gem 'rdoc'
       gem 'sqlite3-ruby', :require => 'sqlite3'
       gem "cucumber", "~> 0.10.2"
       gem "aruba", "~> 0.3.6"

data/gemfiles/{rails-3.1.0.beta1 → rails-3.1.0.rc1}

@@ -2,4 +2,4 @@ require File.expand_path("../base.rb", __FILE__)
 
 extend GemfileBase
 
-gem "rails", "3.1.0.beta1"
+gem "rails", "3.1.0.rc1"

data/gemfiles/rails-master

@@ -3,5 +3,3 @@ require File.expand_path("../base.rb", __FILE__)
 extend GemfileBase
 
 gem "rails", :git => "git://github.com/rails/rails.git"
-gem "arel",  :git => "git://github.com/rails/arel.git"
-gem "rack",  :git => "git://github.com/rack/rack.git"

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

@@ -125,14 +125,14 @@ module RSpec::Rails
       # defined in +ApplicationController+, however, are accessible from within
       # the block.
       def controller(base_class = ApplicationController, &body)
-        base_class.dup.tap do |new_base|
-          def new_base.name; "StubResourcesController"; end
-          metadata[:example_group][:describes] = Class.new(new_base, &body)
+        metadata[:example_group][:describes] = Class.new(base_class, &body)
+        metadata[:example_group][:describes].singleton_class.class_eval do
+          def name; "AnonymousController" end
         end
 
         before do
           @orig_routes, @routes = @routes, ActionDispatch::Routing::RouteSet.new
-          @routes.draw { resources :stub_resources }
+          @routes.draw { resources :anonymous }
         end
 
         after do

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

@@ -1,6 +1,8 @@
 require 'rspec/core'
 require 'rspec/core/rake_task'
-Rake.application.instance_variable_get('@tasks')['default'].prerequisites.delete('test')
+if default = Rake.application.instance_variable_get('@tasks')['default']
+  default.prerequisites.delete('test')
+end
 
 spec_prereq = Rails.configuration.generators.options[:rails][:orm] == :active_record ?  "db:test:prepare" : :noop
 task :noop do; end
@@ -23,7 +25,7 @@ namespace :spec do
   RSpec::Core::RakeTask.new(:rcov => spec_prereq) do |t|
     t.rcov = true
     t.pattern = "./spec/**/*_spec.rb"
-    t.rcov_opts = '--exclude /gems/,/Library/,/usr/,lib/tasks,.bundle,config,/lib/rspec/,/lib/rspec-'
+    t.rcov_opts = '--exclude /gems/,/Library/,/usr/,lib/tasks,.bundle,config,/lib/rspec/,/lib/rspec-,spec'
   end
 
   task :statsetup do

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Rails # :nodoc:
     module Version # :nodoc:
-      STRING = '2.6.0'
+      STRING = '2.6.1'
     end
   end
 end

data/rspec-rails.gemspec

@@ -25,10 +25,10 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<activesupport>, ["~> 3.0"])
   s.add_runtime_dependency(%q<actionpack>, ["~> 3.0"])
   s.add_runtime_dependency(%q<railties>, ["~> 3.0"])
-  if RSpec::Rails::Version::STRING =~ /[a-zA-Z]+/
-    s.add_runtime_dependency "rspec", "= #{RSpec::Rails::Version::STRING}"
-  else
+  # if RSpec::Rails::Version::STRING =~ /[a-zA-Z]+/
+    # s.add_runtime_dependency "rspec", "= #{RSpec::Rails::Version::STRING}"
+  # else
     s.add_runtime_dependency "rspec", "~> #{RSpec::Rails::Version::STRING.split('.')[0..1].concat(['0']).join('.')}"
-  end
+  # end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 2
   - 6
-  - 0
-  version: 2.6.0
+  - 1
+  version: 2.6.1
 platform: ruby
 authors: 
 - David Chelimsky
@@ -15,11 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 -05:00
+date: 2011-05-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -29,12 +30,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  prerelease: false
-  type: :runtime
-  requirement: *id001
+  version_requirements: *id001
   name: activesupport
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -44,12 +45,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  prerelease: false
-  type: :runtime
-  requirement: *id002
+  version_requirements: *id002
   name: actionpack
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -59,12 +60,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  prerelease: false
-  type: :runtime
-  requirement: *id003
+  version_requirements: *id003
   name: railties
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,10 +76,9 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  prerelease: false
-  type: :runtime
-  requirement: *id004
+  version_requirements: *id004
   name: rspec
+  prerelease: false
 description: RSpec-2 for Rails-3
 email: dchelimsky@gmail.com
 executables: []
@@ -106,6 +106,7 @@ files:
 - features/Generators.md
 - features/GettingStarted.md
 - features/README.md
+- features/RailsVersions.md
 - features/Upgrade.md
 - features/controller_specs/README.md
 - features/controller_specs/anonymous_controller.feature
@@ -145,7 +146,7 @@ files:
 - gemfiles/rails-3.0.5
 - gemfiles/rails-3.0.6
 - gemfiles/rails-3.0.7
-- gemfiles/rails-3.1.0.beta1
+- gemfiles/rails-3.1.0.rc1
 - gemfiles/rails-master
 - lib/autotest/rails_rspec2.rb
 - lib/generators/rspec.rb
@@ -270,13 +271,14 @@ rubyforge_project: rspec
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.6.0
+summary: rspec-rails-2.6.1
 test_files: 
 - features/Autotest.md
 - features/Changelog.md
 - features/Generators.md
 - features/GettingStarted.md
 - features/README.md
+- features/RailsVersions.md
 - features/Upgrade.md
 - features/controller_specs/README.md
 - features/controller_specs/anonymous_controller.feature