Permalink
Browse files

Moved to RSpec 2.

  • Loading branch information...
1 parent 5a7cb69 commit 573080549d0ba42272ea46413c6e883be94e1055 @baldowl committed Sep 21, 2010
Showing with 7 additions and 13 deletions.
  1. +2 −0 .rspec
  2. +3 −5 Rakefile
  3. +1 −3 features/support/env.rb
  4. +0 −2 spec/spec.opts
  5. +1 −3 spec/spec_helper.rb
View
2 .rspec
@@ -0,0 +1,2 @@
+--colour
+--format documentation
View
@@ -1,6 +1,6 @@
require 'rake/clean'
require 'cucumber/rake/task'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
require 'rake/rdoctask'
require 'jeweler'
@@ -11,9 +11,7 @@ end
task :features => :check_dependencies
task :default => :features
-Spec::Rake::SpecTask.new do |t|
- t.spec_opts = %w(-O spec/spec.opts)
-end
+RSpec::Core::RakeTask.new
task :spec => :check_dependencies
task :default => :spec
@@ -38,7 +36,7 @@ Jeweler::Tasks.new do |gem|
gem.add_dependency 'rack', '>= 0.9'
gem.add_development_dependency 'cucumber', '>= 0.1.13'
gem.add_development_dependency 'rack-test'
- gem.add_development_dependency 'rspec', '>= 1.2.9'
+ gem.add_development_dependency 'rspec', '>= 2.0.0.beta.22'
gem.rdoc_options << '--line-numbers' << '--inline-source' << '--title' <<
"Rack::Csrf #{version}" << '--main' << 'README.rdoc'
gem.test_files.clear
View
@@ -1,7 +1,5 @@
require 'rubygems'
-require 'spec/expectations'
+require 'rspec'
require 'rack/test'
-$: << File.join(File.dirname(__FILE__), '../../lib')
-
require 'rack/csrf'
View
@@ -1,2 +0,0 @@
---colour
---format specdoc
View
@@ -1,6 +1,4 @@
require 'rubygems'
-require 'spec'
-
-$: << File.join(File.dirname(__FILE__), '../lib')
+require 'rspec'
require 'rack/csrf'

0 comments on commit 5730805

Please sign in to comment.