Fix failing tests after moving to latest Rails.

DouweM · Dec 7, 2011 · a6e2477 · a6e2477
1 parent 7245836
commit a6e2477
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -31,11 +31,14 @@ GEM
       multi_json (~> 1.0)
     arel (2.2.1)
     builder (3.0.0)
+    columnize (0.3.5)
     erubis (2.7.0)
     has_scope (0.5.1)
     hike (1.2.1)
     i18n (0.6.0)
     json (1.6.3)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -71,9 +74,15 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
+    rbx-require-relative (0.0.5)
     rdoc (3.11)
       json (~> 1.4)
     responders (0.6.4)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -93,3 +102,4 @@ DEPENDENCIES
   mocha
   rails (= 3.1.2)
   responders (~> 0.6.0)
+  ruby-debug
diff --git a/test/nested_model_with_shallow_test.rb b/test/nested_model_with_shallow_test.rb
@@ -59,15 +59,15 @@ def test_assigns_subfaculty_and_speciality_and_group_on_edit
 
   def test_expose_a_newly_create_group_with_speciality
     Speciality.expects(:find).with('37').twice.returns(mock_speciality)
-    Plan::Group.expects(:build).with({'these' => :params}).returns(mock_group(:save => true))
-    post :create, :speciality_id => '37', :group => {:these => :params}
+    Plan::Group.expects(:build).with({'these' => 'params'}).returns(mock_group(:save => true))
+    post :create, :speciality_id => '37', :group => {'these' => 'params'}
     assert_equal mock_group, assigns(:group)
   end
 
   def test_expose_a_update_group_with_speciality
     should_find_parents
-    mock_group.expects(:update_attributes).with('these' => :params).returns(true)
-    post :update, :id => 'forty_two', :group => {:these => :params}
+    mock_group.expects(:update_attributes).with('these' => 'params').returns(true)
+    post :update, :id => 'forty_two', :group => {'these' => 'params'}
     assert_equal mock_group, assigns(:group)
   end
 

diff --git a/test/url_helpers_test.rb b/test/url_helpers_test.rb
@@ -126,8 +126,7 @@ class ImageButtonsController < ButtonsController
 # Create a TestHelper module with some helpers
 class UrlHelpersTest < ActiveSupport::TestCase
   def mock_polymorphic(controller, route)
-    controller.expects(:url_for).with(:no=>"no")
-    controller._routes.url_helpers.expects("hash_for_#{route}").returns({:no=>"no"})    
+    controller.expects(route)
   end
 
   def test_url_helpers_on_simple_inherited_resource