Merge commit 'd9b8f2a'

1 files changed, 8 insertions, 6 deletions

diff --git a/Rakefile b/Rakefile
index ba939be..9d7d906 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,8 +4,8 @@ $: << File.expand_path('lib')
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
 
 require 'rubygems'
-require 'spec'
-require 'spec/rake/spectask'
+require 'rspec'
+require 'rspec/core/rake_task'
 begin
     require 'rcov'
 rescue LoadError
@@ -62,12 +62,14 @@ task :default do
     sh %{rake -T}
 end
 
-Spec::Rake::SpecTask.new(:spec) do |t|
-    t.spec_files = FileList['spec/**/*.rb']
+RSpec::Core::RakeTask.new do |t|
+    t.pattern ='spec/{unit,integration}/**/*_spec.rb'
+    t.fail_on_error = false
 end
 
-Spec::Rake::SpecTask.new('spec:rcov') do |t|
-    t.spec_files = FileList['spec/**/*.rb']
+RSpec::Core::RakeTask.new('spec:rcov') do |t|
+    t.pattern ='spec/{unit,integration}/**/*_spec.rb'
+    t.fail_on_error = false
     if defined?(Rcov)
         t.rcov = true
         t.rcov_opts = ['--exclude', 'spec/*,test/*,results/*,/usr/lib/*,/usr/local/lib/*,gems/*']