Permalink
Browse files

Update to RSpec 2.0

  • Loading branch information...
1 parent 3ce1202 commit 7665f687d9e950996ce2e3cd0f9abd86d103777e Michael Bleigh committed Jan 27, 2011
Showing with 19 additions and 15 deletions.
  1. +2 −0 .rspec
  2. +1 −1 Gemfile
  3. +10 −2 Gemfile.lock
  4. +3 −9 Rakefile
  5. +3 −3 spec/spec_helper.rb
View
2 .rspec
@@ -0,0 +1,2 @@
+--colour
+--format=nested
View
@@ -8,5 +8,5 @@ group :development do
end
group :test do
- gem 'rspec'
+ gem 'rspec', '~> 2.0'
end
View
@@ -1,6 +1,7 @@
GEM
remote: http://rubygems.org/
specs:
+ diff-lcs (1.1.2)
gemcutter (0.6.1)
git (1.2.5)
jeweler (1.4.0)
@@ -10,7 +11,14 @@ GEM
json (1.4.3)
json_pure (1.4.3)
rake (0.8.7)
- rspec (1.3.0)
+ rspec (2.4.0)
+ rspec-core (~> 2.4.0)
+ rspec-expectations (~> 2.4.0)
+ rspec-mocks (~> 2.4.0)
+ rspec-core (2.4.0)
+ rspec-expectations (2.4.0)
+ diff-lcs (~> 1.1.2)
+ rspec-mocks (2.4.0)
rubyforge (2.0.4)
json_pure (>= 1.1.7)
@@ -21,4 +29,4 @@ DEPENDENCIES
jeweler
json
rake
- rspec
+ rspec (~> 2.0)
View
@@ -18,16 +18,10 @@ 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']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
- spec.libs << 'lib' << 'spec'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new do |spec|
+ # spec.libs << 'lib' << 'spec'
spec.pattern = 'spec/**/*_spec.rb'
- spec.rcov = true
end
task :default => :spec
View
@@ -5,9 +5,9 @@
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
require 'hashie'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
end

0 comments on commit 7665f68

Please sign in to comment.