mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-21 17:50:13 +01:00
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
This commit is contained in:
parent
6d11ebd1b0
commit
35ae5fc431
394 changed files with 15184 additions and 9936 deletions
13
vendor/plugins/rspec-rails/spec/spec_helper.rb
vendored
13
vendor/plugins/rspec-rails/spec/spec_helper.rb
vendored
|
|
@ -12,7 +12,12 @@ require File.expand_path("#{dir}/../spec_resources/helpers/more_explicit_helper"
|
|||
require File.expand_path("#{dir}/../spec_resources/helpers/view_spec_helper")
|
||||
require File.expand_path("#{dir}/../spec_resources/helpers/plugin_application_helper")
|
||||
|
||||
ActionController::Routing.controller_paths << "#{dir}/../spec_resources/controllers"
|
||||
extra_controller_paths = File.expand_path("#{dir}/../spec_resources/controllers")
|
||||
|
||||
unless ActionController::Routing.controller_paths.include?(extra_controller_paths)
|
||||
ActionController::Routing.instance_eval {@possible_controllers = nil}
|
||||
ActionController::Routing.controller_paths << extra_controller_paths
|
||||
end
|
||||
|
||||
module Spec
|
||||
module Rails
|
||||
|
|
@ -38,6 +43,12 @@ class Proc
|
|||
end
|
||||
end
|
||||
|
||||
Spec::Runner.configure do |config|
|
||||
config.before(:each, :type => :controller) do
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
ActionController::Routing::Routes.draw do |map|
|
||||
map.resources :rspec_on_rails_specs
|
||||
map.connect 'custom_route', :controller => 'custom_route_spec', :action => 'custom_route'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue