Permalink
Browse files

Upgrade RSpec and RR.

  • Loading branch information...
1 parent b7715d8 commit 50d0b0d428672c0187b308feb5074a2929a1e99c @mdub committed Mar 25, 2013
Showing with 9 additions and 10 deletions.
  1. +2 −2 Gemfile
  2. +4 −5 Rakefile
  3. +3 −3 spec/spec_helper.rb
View
@@ -4,8 +4,8 @@ gemspec
group :test do
gem "rake"
- gem "rspec", "~> 1.3.1"
- gem "rr", "~> 1.0"
+ gem "rspec", "~> 2.13.0"
+ gem "rr", "~> 1.0.4"
gem "rack-test"
gem "sinatra"
gem "rest-client"
View
@@ -1,13 +1,12 @@
require "rubygems"
require "rake"
-require "spec/rake/spectask"
-
task "default" => "spec"
-Spec::Rake::SpecTask.new do |t|
- t.spec_opts = ["--colour", "--format", "nested"]
- t.spec_files = FileList['spec/**/*_spec.rb']
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new do |t|
+ t.rspec_opts = ["--colour", "--format", "nested"]
end
require 'bundler'
View
@@ -1,9 +1,9 @@
require "rubygems"
-require "spec"
+require "rspec"
require "rr"
-Spec::Runner.configure do |config|
- config.mock_with RR::Adapters::Rspec
+RSpec.configure do |config|
+ config.mock_with :rr
end
require "test_apps"

0 comments on commit 50d0b0d

Please sign in to comment.