diff --git a/spec/spec.opts b/.rspec similarity index 100% rename from spec/spec.opts rename to .rspec diff --git a/lib/v8/cli.rb b/lib/v8/cli.rb index 265f83a..4e1dd41 100644 --- a/lib/v8/cli.rb +++ b/lib/v8/cli.rb @@ -57,17 +57,17 @@ module V8 puts e.backtrace(:javascript) rescue StandardError => e puts e - end + end end def self.test begin require 'rubygems' - require 'spec' - parser = ::Spec::Runner::OptionParser.new($stderr, $stdout) - parser.order!([File.dirname(__FILE__) + '/../../spec/']) - ::Spec::Runner.use(parser.options) - exit parser.options.run_examples + require 'rspec' + ARGV.clear + ARGV << File.dirname(__FILE__) + '/../../spec/' + ::RSpec::Core::Runner.autorun + exit(0) rescue LoadError => e puts "selftest requires rspec to be installed (gem install rspec)" exit(1) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ef51bf7..5a3b4b5 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,10 +1,10 @@ begin - require 'spec' + require 'rspec' rescue LoadError require 'rubygems' unless ENV['NO_RUBYGEMS'] gem 'rspec' - require 'spec' + require 'rspec' end # diff --git a/tasks/spec.rake b/tasks/spec.rake deleted file mode 100644 index 3fae9ba..0000000 --- a/tasks/spec.rake +++ /dev/null @@ -1,10 +0,0 @@ -begin - require 'spec/rake/spectask' - Spec::Rake::SpecTask.new(:spec) do |spec| - spec.libs << 'lib' << 'spec' - spec.spec_files = FileList['spec/**/*_spec.rb'] - end - task :spec => :compile -rescue LoadError => e - puts "unable to run specs from rake. gem install rspec" -end