Permalink
Browse files

updating to rspec 2.x

  • Loading branch information...
1 parent b92a1bc commit f8a569f05e286cdc657bf6d26bc0a306cc28b40f Emmanuel Oga committed Feb 24, 2011
Showing with 7 additions and 13 deletions.
  1. +3 −9 Rakefile
  2. +1 −1 spec/firering/data/message_spec.rb
  3. +3 −3 spec/spec_helper.rb
View
@@ -43,17 +43,11 @@ end
#
#############################################################################
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
-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'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+ spec.ruby_opts = '-I lib'
spec.pattern = 'spec/**/*_spec.rb'
- spec.rcov = true
end
task :default => :spec
@@ -39,7 +39,7 @@
message.should be_text
message.room_id.should == 177718
message.created_at.should == Time.parse("2009/06/02 21:20:32 +0000")
- message.body.should == "q: should i add :case_sensitive =\u003E false to the validation of title name? Looks harmless but who knows..."
+ message.body.should == "q: should i add :case_sensitive => false to the validation of title name? Looks harmless but who knows..."
message.id.should == 134405854
message.user_id.should == 415731
View
@@ -2,12 +2,12 @@
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
require 'firering'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
require 'fixtures/load_server'
require 'support/helpers'
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
config.include Helpers
config.before :all do

0 comments on commit f8a569f

Please sign in to comment.