prep for 2.6.0

marcgg · May 12, 2011 · 9a0d207 · 9a0d207
1 parent a6cd192
commit 9a0d207
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 23 deletions.
diff --git a/features/Changelog.md b/features/Changelog.md
@@ -1,16 +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)
-  * 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
@@ -19,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
 

diff --git a/features/Generators.md b/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).
diff --git a/features/routing_specs/route_to_matcher.feature b/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
 

diff --git a/lib/rspec/rails/version.rb b/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