Got all specs to pass with rspec 2

2 files changed, 7 insertions, 9 deletions

diff --git a/Rakefile b/Rakefile
index e0d2360..aed54e1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -20,14 +20,12 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d1d2c0b..c2ee368 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,9 +1,9 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'evernote'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'yaml'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   
 end