Update rspec-rails

jfirebaugh · Aug 3, 2013 · 6cab37f · 6cab37f
1 parent c590995
commit 6cab37f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 gemspec
+
 gem "sprockets-rails"
+gem "activemodel" # https://github.com/rspec/rspec-rails/pull/798
diff --git a/konacha.gemspec b/konacha.gemspec
@@ -27,7 +27,7 @@ the asset pipeline and engines.}
   gem.add_dependency "colorize"
 
   gem.add_development_dependency "jquery-rails"
-  gem.add_development_dependency "rspec-rails", "~> 2.12"
+  gem.add_development_dependency "rspec-rails", "~> 2.14"
   gem.add_development_dependency "capybara-firebug", "~> 1.1"
   gem.add_development_dependency "coffee-script"
   gem.add_development_dependency "ejs"

diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb
@@ -2,7 +2,6 @@
 
 require "action_controller/railtie"
 require "action_view/railtie"
-require "active_model/railtie" # https://github.com/rspec/rspec-rails/pull/642
 require "sprockets/railtie"
 
 if defined?(Bundler)

diff --git a/spec/runner_spec.rb b/spec/runner_spec.rb
@@ -140,7 +140,7 @@
         subject.reporter.should_receive(:process_mocha_event).with(pass)
         subject.reporter.should_receive(:process_mocha_event).with(pending)
         subject.reporter.should_receive(:process_mocha_event).with(end_event)
-        subject.reporter.should_receive(:process_mocha_event).any_number_of_times
+        subject.reporter.stub(:process_mocha_event)
         subject.run
       end