Permalink
Browse files

Upgraded to Rspec 2.3!

  • Loading branch information...
1 parent 68d5f07 commit 8522a493d4a08a2e076ff70561c124c41460d298 Michael Edgar committed Dec 16, 2010
Showing with 9 additions and 8 deletions.
  1. 0 spec/spec.opts → .rspec
  2. +4 −5 Rakefile
  3. +5 −3 spec/spec_helper.rb
View
0 spec/spec.opts → .rspec
File renamed without changes.
View
9 Rakefile
@@ -10,7 +10,7 @@ begin
gem.email = 'michael.j.edgar@dartmouth.edu'
gem.homepage = 'http://github.com/michaeledgar/wool'
gem.authors = ['Michael Edgar']
- gem.add_development_dependency 'rspec', '>= 1.2.9'
+ gem.add_development_dependency 'rspec', '~> 2.3'
gem.add_development_dependency 'yard', '>= 0'
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
end
@@ -19,10 +19,9 @@ rescue LoadError
puts 'Jeweler (or a dependency) not available. Install it with: 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 = FileList['spec/**/*_spec.rb']
end
task :rcov => :default
View
8 spec/spec_helper.rb
@@ -4,8 +4,8 @@
require 'simplecov-gem-adapter'
SimpleCov.start 'gem'
require 'wool'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
require 'stringio'
@@ -66,8 +66,10 @@ def correct_to(input, output, *args)
end
end
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
config.include(Wool::RSpec::Matchers)
+ config.filter_run :focus => true
+ config.run_all_when_everything_filtered = true
end
def with_examples(*args)

0 comments on commit 8522a49

Please sign in to comment.