mirror of
https://github.com/TracksApp/tracks.git
synced 2026-03-14 08:26:16 +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
|
|
@ -2,25 +2,14 @@ require 'spec/runner/option_parser'
|
|||
|
||||
module Spec
|
||||
module Runner
|
||||
# Facade to run specs without having to fork a new ruby process (using `spec ...`)
|
||||
class CommandLine
|
||||
class << self
|
||||
# Runs specs. +argv+ is the commandline args as per the spec commandline API, +err+
|
||||
# and +out+ are the streams output will be written to.
|
||||
def run(instance_rspec_options)
|
||||
# NOTE - this call to init_rspec_options is not spec'd, but neither is any of this
|
||||
# swapping of $rspec_options. That is all here to enable rspec to run against itself
|
||||
# and maintain coverage in a single process. Therefore, DO NOT mess with this stuff
|
||||
# unless you know what you are doing!
|
||||
init_rspec_options(instance_rspec_options)
|
||||
orig_rspec_options = rspec_options
|
||||
begin
|
||||
$rspec_options = instance_rspec_options
|
||||
return $rspec_options.run_examples
|
||||
ensure
|
||||
::Spec.run = true
|
||||
$rspec_options = orig_rspec_options
|
||||
end
|
||||
def run(tmp_options=Spec::Runner.options)
|
||||
orig_options = Spec::Runner.options
|
||||
Spec::Runner.use tmp_options
|
||||
tmp_options.run_examples
|
||||
ensure
|
||||
Spec::Runner.use orig_options
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue