Skip to content

Commit 9e14579

Browse files
committed
Update to RSpec 2.0 compatible bits.
1 parent 521c035 commit 9e14579

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Rakefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ require 'rake/gempackagetask'
22
require 'date'
33

44
begin
5-
require 'spec/rake/spectask'
6-
Spec::Rake::SpecTask.new
5+
gem 'rspec'
6+
require 'rspec/core/rake_task'
7+
desc "Runs Java Integration Specs"
8+
RSpec::Core::RakeTask.new
79
task :default => :spec
810
rescue LoadError
911
task :default do
10-
puts "rspec 1.3.0 or higher is not installed; skipping jruby-launcher specs"
12+
puts "rspec 2.0.0 or higher is not installed; skipping jruby-launcher specs"
1113
end
1214
end
1315

spec/spec_helper.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'spec'
1+
require 'rspec'
22
require 'rbconfig'
33
require 'fileutils'
44

@@ -60,7 +60,7 @@ def with_environment(pairs = {})
6060
end
6161
end
6262

63-
Spec::Runner.configure do |config|
63+
RSpec.configure do |config|
6464
config.before(:all) do
6565
JRubyLauncherHelper.check_executable_built
6666
# clear environment for better control

0 commit comments

Comments
 (0)