Permalink
Browse files

updated to rspec 2.0.0

  • Loading branch information...
1 parent aaffea4 commit f577da1d5e191abe5d90402735c7532e2be6f6f5 @hagenburger hagenburger committed with chriseppstein Oct 13, 2010
Showing with 9 additions and 19 deletions.
  1. +2 −0 .rspec
  2. +1 −1 Gemfile
  3. +4 −8 Rakefile
  4. +0 −4 spec/spec.opts
  5. +2 −6 spec/spec_helper.rb
View
2 .rspec
@@ -0,0 +1,2 @@
+--colour
+--format s
View
@@ -2,7 +2,7 @@ source :rubygems
gem "compass", :path => "."
gem "cucumber"
-gem "rspec"
+gem "rspec", "~>2.0.0"
gem "rails", "~>3.0.0.rc"
gem "compass-validator", "3.0.0"
gem "css_parser"
View
@@ -30,15 +30,11 @@ To run with an alternate version of Haml & Sass, make test/haml a symlink to tha
END
begin
- require 'spec/rake/spectask'
- Spec::Rake::SpecTask.new(:spec) do |spec|
- spec.libs << 'lib' << 'spec'
- spec.spec_files = FileList['spec/**/*_spec.rb']
- end
+ require 'rspec/core/rake_task'
+
+ RSpec::Core::RakeTask.new(:spec)
- Spec::Rake::SpecTask.new(:rcov) do |spec|
- spec.libs << 'lib' << 'spec'
- spec.pattern = 'spec/**/*_spec.rb'
+ RSpec::Core::RakeTask.new(:rcov) do |spec|
spec.rcov = true
end
View
@@ -1,4 +0,0 @@
---colour
---format s
---loadby mtime
---reverse
View
@@ -3,12 +3,8 @@
require 'rubygems'
require 'compass'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
IMAGES_TMP_PATH = File.join(File.dirname(__FILE__), 'images-tmp')
Compass::Sprites.images_path = IMAGES_TMP_PATH
-
-Spec::Runner.configure do |config|
-
-end

0 comments on commit f577da1

Please sign in to comment.