Next step in upgrading Tracks to Rails 2.2. Some highlights:

* Ran rake rails:update
* Added old actionwebservice framework
* Updated RSpec and RSpec-Rails
* Removed asset_packager plugin (not compatible, Scott no longer maintaining), and replaced with bundle_fu. See the bundle_fu README for more info.
* Hacks to UJS and ARTS plugins, which are no longer supported. Probably should move off both UJS and RJS.
* Hack to flashobject_helper plugin (upgrade to Rails 2.2-compatible version if/when it comes out.)
* Hack to skinny-spec plugin, for Rails 2.2 compatibility. Should check for official release.
* Hacks to resource_feeder plugin, for Rails 2.2 compatibility. Should check for official release (not likely) or move off it.
* Addressed some deprecation warnings. More to come.
* My mobile mime type hackery is no longer necessary with new Rails features. Yay!
* Updated environment.rb.tmpl with changes

TODO:
* Restore view specs marked pending
* Fix failing integration tests.
* Try selenium tests.
* Investigate OpenID support.
* Address deprecation warnings.
* Consider moving parts of environment.rb to initializers
* Address annoying config.gem warning about highline gem

vendor/plugins/rspec-rails/spec_resources/controllers/controller_spec_controller.rb

@@ -1,4 +1,12 @@
 class ControllerSpecController < ActionController::Base
+  before_filter :raise_error, :only => :action_with_skipped_before_filter
+  
+  def raise_error
+    raise "from a before filter"
+  end
+  
+  skip_before_filter :raise_error
+  
   if ['edge','2.0.0'].include?(ENV['RSPEC_RAILS_VERSION'])
     set_view_path [File.join(File.dirname(__FILE__), "..", "views")]
   else
@@ -27,6 +35,16 @@ class ControllerSpecController < ActionController::Base
     session[:session_key] = "session value"
   end
       
+  def action_which_gets_cookie
+    raise "expected #{params[:expected].inspect}, got #{cookies[:cookie_key].inspect}" unless (cookies[:cookie_key] == params[:expected])
+    render :text => ""
+  end
+      
+  def action_which_sets_cookie
+    cookies['cookie_key'] = params[:value]
+    render :text => ""
+  end
+      
   def action_with_partial
     render :partial => "controller_spec/partial"
   end
@@ -44,7 +62,6 @@ class ControllerSpecController < ActionController::Base
   end
 
   def action_setting_the_assigns_hash
-    assigns['direct_assigns_key'] = :direct_assigns_key_value
     @indirect_assigns_key = :indirect_assigns_key_value
   end
   
@@ -64,5 +81,19 @@ class ControllerSpecController < ActionController::Base
                             :partial => 'non_existent_partial'
     end
   end
+  
+  def action_with_skipped_before_filter
+    render :text => ""
+  end
+  
+  def action_that_assigns_false_to_a_variable
+    @a_variable = false
+    render :text => ""
+  end
 end
 
+class ControllerInheritingFromApplicationControllerController < ApplicationController
+  def action_with_inherited_before_filter
+    render :text => ""
+  end
+end

vendor/plugins/rspec-rails/spec_resources/controllers/render_spec_controller.rb

@@ -23,4 +23,8 @@ class RenderSpecController < ApplicationController
   def action_that_renders_nothing
     render :nothing => true
   end
+  
+  def action_with_alternate_layout
+    render :layout => 'simple'
+  end
 end