fix a test failure in controller_generator_test

rails · Oct 17, 2012 · 8b574f4 · 8b574f4
1 parent 75b6714
commit 8b574f4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -31,6 +31,9 @@ GEM
     i18n (0.6.1)
     journey (1.0.4)
     json (1.7.5)
+    metaclass (0.0.1)
+    mocha (0.12.0)
+      metaclass (~> 0.0.1)
     multi_json (1.3.6)
     rack (1.4.1)
     rack-cache (1.2)
@@ -60,5 +63,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  mocha
   rake
   strong_parameters!
diff --git a/strong_parameters.gemspec b/strong_parameters.gemspec
@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.add_dependency "railties", ">= 3.1", "< 4.0"
 
   s.add_development_dependency "rake"
+  s.add_development_dependency "mocha"
 end
diff --git a/test/controller_generator_test.rb b/test/controller_generator_test.rb
@@ -8,6 +8,7 @@ class StrongParametersControllerGeneratorTest < Rails::Generators::TestCase
   setup :prepare_destination
 
   def test_controller_content
+    Rails.stubs(:application).returns(nil)
     run_generator
 
     assert_file "app/controllers/users_controller.rb" do |content|

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -3,6 +3,7 @@
 
 require 'test/unit'
 require 'strong_parameters'
+require 'mocha'
 
 module ActionController
   SharedTestRoutes = ActionDispatch::Routing::RouteSet.new