rspec-rails 2.6.0.rc6 → 2.6.0

data/.travis.yml

@@ -4,7 +4,7 @@ rvm:
   - 1.9.2
 gemfile:
   - gemfiles/rails-3.0.7
-  - gemfiles/rails-3-0-stable
   - gemfiles/rails-3.1.0.beta1
+  - gemfiles/rails-master
 env:
   - CI=true

data/Rakefile

@@ -16,11 +16,25 @@ rescue
     sh "bundle install"
     Bundler.setup
   else
-    raise "You need to install a bundle first. Try 'thor rails:use 3.0.7'"
+    raise "You need to install a bundle first. Try 'thor gemfile:use 3.0.7'"
   end
 end
 Bundler::GemHelper.install_tasks
 
+task :build => :raise_if_psych_is_defined
+
+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 'rake'
 require 'yaml'
 
@@ -70,11 +84,22 @@ namespace :generate do
   desc "generate a fresh app with rspec installed"
   task :app do |t|
     unless File.directory?('./tmp/example_app')
-      sh "rails new ./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

data/Thorfile

@@ -1,10 +1,40 @@
-class Rails < Thor
+class Gemfile < Thor
   desc "use VERSION", "installs the bundle using gemfiles/rails-VERSION"
   def use(version)
-    gemfile = "--gemfile gemfiles/rails-#{version}"
-    say `bundle install #{gemfile} --binstubs`
-    say `bundle #{gemfile} update rails` unless version =~ /^\d\.\d\.\d$/
+    "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/features/Changelog.md

@@ -1,17 +1,12 @@
-### 2.6.0.rc6 / 2011-05-06
+### 2.6.0 / 2011-05-12
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.6.0.rc4...v2.6.0.rc6)
-
-* Bug fixes
-  * Fix load order issue w/ Capybara (oleg dashevskii)
-  * Relax the dependencies on rails gems to >= 3.0 (Joel Moss)
-  * Fix monkey patches that broke due to internal changes in rails-3.1.0.beta1
-
-### 2.6.0.rc4 / 2011-05-01
-
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.6.0.rc2...v2.6.0.rc4)
+[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
@@ -20,20 +15,12 @@
   * Decorate paths passed to `[append|prepend]_view_paths` with empty templates
     unless rendering views. (Mark Turner)
 
-### 2.6.0.rc2 / 2011-04-18
-
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.5.0...v2.6.0.rc2)
-
-* Enhancments
-  * 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
-
 * 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
 

data/features/Generators.md

@@ -5,4 +5,4 @@ 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).
+out of the box for with Rails' defaults (ActiveRecord, no Capybara or Webrat).

data/features/matchers/redirect_to_matcher.feature

@@ -1,7 +1,7 @@
 Feature: redirect_to matcher
 
-  The `redirect_to` matcher is used to specify that the redirect called in the
-  latest action ended with the intended behaviour. Essentially, it delegates to
+  The `redirect_to` matcher is used to specify that a request redirects to a
+  given template or action.  It delegates to
   [`assert_redirected_to`](http://api.rubyonrails.org/classes/ActionDispatch/Assertions/ResponseAssertions.html#method-i-assert_redirected_to).
 
   It is available in controller specs (spec/controllers) and request

data/features/matchers/render_template_matcher.feature

@@ -1,10 +1,13 @@
 Feature: render_template matcher
 
-  This matcher just delegates to the Rails assertion method
-  "assert_template". For complete info on the available options,
-  please take a look at the Rails documentation.
+  The `render_template` matcher is used to specify that a request renders a
+  given template.  It delegates to
+  [`assert_template`](http://api.rubyonrails.org/classes/ActionController/TemplateAssertions.html#method-i-assert_template)
 
-  This method is available in spec/controllers and spec/requests.
+  It is available in controller specs (spec/controllers) and request
+  specs (spec/requests).
+
+  NOTE: use `redirect_to(:action => 'new')` for redirects, not `render_template`.
 
   Scenario: render_template with three possible options
     Given a file named "spec/controllers/gadgets_spec.rb" with:
@@ -12,12 +15,12 @@ Feature: render_template matcher
       require "spec_helper"
 
       describe GadgetsController do
-        describe "#index" do
+        describe "GET #index" do
           subject { get :index }
 
-          specify { should render_template(:index) }
-          specify { should render_template("index") }
-          specify { should render_template("gadgets/index") }
+          it { should render_template(:index) }
+          it { should render_template("index") }
+          it { should render_template("gadgets/index") }
         end
       end
       """

data/features/routing_specs/route_to_matcher.feature

@@ -4,7 +4,7 @@ Feature: route_to matcher
   It is most valuable when specifying routes other than standard RESTful
   routes.
 
-      get("/").should route_to("welcome#index")
+      get("/").should route_to("welcome#index") # new in 2.6.0
 
       or
 

data/gemfiles/rails-3.1.0.beta1

@@ -3,14 +3,3 @@ require File.expand_path("../base.rb", __FILE__)
 extend GemfileBase
 
 gem "rails", "3.1.0.beta1"
-
-# From the Gemfile generated by 'rails new ....'
-gem 'sass'
-gem 'coffee-script'
-gem 'uglifier'
-gem 'jquery-rails'
-
-group :test do
-  # Pretty printed test output
-  gem 'turn', :require => false
-end

data/lib/rspec/rails/version.rb

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

data/rspec-rails.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |s|
   s.rdoc_options     = ["--charset=UTF-8"]
   s.require_path     = "lib"
 
-  s.add_runtime_dependency(%q<activesupport>, [">= 3.0"])
-  s.add_runtime_dependency(%q<actionpack>, [">= 3.0"])
-  s.add_runtime_dependency(%q<railties>, [">= 3.0"])
+  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

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 15424057
-  prerelease: 6
+  hash: 23
+  prerelease: 
   segments: 
   - 2
   - 6
   - 0
-  - rc
-  - 6
-  version: 2.6.0.rc6
+  version: 2.6.0
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,14 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 -05:00
+date: 2011-05-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -39,7 +37,7 @@ dependencies:
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -54,7 +52,7 @@ dependencies:
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -69,16 +67,14 @@ dependencies:
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424057
+        hash: 23
         segments: 
         - 2
         - 6
         - 0
-        - rc
-        - 6
-        version: 2.6.0.rc6
+        version: 2.6.0
   prerelease: false
   type: :runtime
   requirement: *id004
@@ -262,21 +258,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: rspec
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.6.0.rc6
+summary: rspec-rails-2.6.0
 test_files: 
 - features/Autotest.md
 - features/Changelog.md