Permalink
Browse files

RSpec 2.4

  • Loading branch information...
1 parent f2f4a81 commit 2b862ec34347176daa3331c9253b99fa529bea86 @atd atd committed Feb 2, 2011
Showing with 4 additions and 12 deletions.
  1. +1 −0 .rspec
  2. +1 −4 Rakefile
  3. +1 −1 social_stream.gemspec
  4. +1 −7 spec/spec_helper.rb
View
1 .rspec
@@ -0,0 +1 @@
+--color
View
@@ -4,17 +4,14 @@ require 'rake/rdoctask'
require 'rubygems'
-require 'rspec/core'
require 'rspec/core/rake_task'
require 'bundler'
require File.join(File.dirname(__FILE__), 'lib', 'social_stream', 'version')
-Rspec::Core::RakeTask.new(:spec) do |t|
- t.rspec_opts = ["--color"]
-end
+RSpec::Core::RakeTask.new(:spec)
task :default => :spec
View
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
if RUBY_VERSION < '1.9'
s.add_development_dependency('ruby-debug', '~> 0.10.3')
end
- s.add_development_dependency('rspec-rails', '~> 2.0.0')
+ s.add_development_dependency('rspec-rails', '~> 2.4.1')
s.add_development_dependency('factory_girl', '~> 1.3.2')
s.add_development_dependency('forgery', '~> 0.3.6')
end
View
@@ -2,7 +2,6 @@
ENV["RAILS_ENV"] = "test"
require File.expand_path("../dummy/config/environment.rb", __FILE__)
-require "rails/test_help"
require "rspec/rails"
ActionMailer::Base.delivery_method = :test
@@ -29,12 +28,7 @@
require 'factory_girl'
Dir["#{File.dirname(__FILE__)}/factories/*.rb"].each {|f| require f}
-Rspec.configure do |config|
- # Remove this line if you don't want Rspec's should and should_not
- # methods or matchers
- require 'rspec/expectations'
- config.include Rspec::Matchers
-
+RSpec.configure do |config|
# == Mock Framework
config.mock_with :rspec
end

0 comments on commit 2b862ec

Please sign in to comment.