38 files changed, 129 insertions, 142 deletions

diff --git a/test/functional/admin_controller_test.rb b/test/controllers/admin_controller_test.rb
index 9bbf29b..9bbf29b 100644
--- a/test/functional/admin_controller_test.rb
+++ b/test/controllers/admin_controller_test.rb
diff --git a/test/functional/assets_controller_test.rb b/test/controllers/assets_controller_test.rb
index d003d25..d003d25 100644
--- a/test/functional/assets_controller_test.rb
+++ b/test/controllers/assets_controller_test.rb
diff --git a/test/functional/content_controller_test.rb b/test/controllers/content_controller_test.rb
index 106f10d..bd5fd7d 100644
--- a/test/functional/content_controller_test.rb
+++ b/test/controllers/content_controller_test.rb
@@ -17,7 +17,7 @@ class ContentControllerTest < ActionController::TestCase
   end
   
   def test_render_404_when_no_page_was_found
-    get :render_page, :language => 'de', :page_path => ["wrong_path"]
+    get :render_page, params: { :language => 'de', :page_path => ["wrong_path"] }
     assert_response 404
   end
   
@@ -28,7 +28,7 @@ class ContentControllerTest < ActionController::TestCase
     first_child.head = page
     first_child.save!
     
-    get :render_page, :language => 'de', :page_path => ["first_child"]
+    get :render_page, params: { :language => 'de', :page_path => ["first_child"] }
     assert_response :success
     assert_equal "layouts/application", @controller.active_layout.name rescue assert true
   end
@@ -44,7 +44,7 @@ class ContentControllerTest < ActionController::TestCase
     draft.save
     new_node.publish_draft!
 
-    get :render_page, :locale => 'de', :page_path => ["fnord"]
+    get :render_page, params: { :locale => 'de', :page_path => ["fnord"] }
     assert_response :success
 
     # The aggregator renders into div.body > div.article_partial.
@@ -63,7 +63,7 @@ class ContentControllerTest < ActionController::TestCase
     draft.save
     new_node.publish_draft!
     
-    get :render_page, :locale => 'de', :page_path => ["fnord"]
+    get :render_page, params: { :locale => 'de', :page_path => ["fnord"] }
     assert_response :success
     
     assert_select(".sidebar_headline", "one")
@@ -77,7 +77,7 @@ class ContentControllerTest < ActionController::TestCase
     draft.save
     new_node.publish_draft!
     
-    get :render_page, :locale => 'de', :page_path => ["fnord"]
+    get :render_page, params: { :locale => 'de', :page_path => ["fnord"] }
     assert_response :success
     assert_template "custom/page_templates/public/standard_template"
   end
@@ -89,7 +89,7 @@ class ContentControllerTest < ActionController::TestCase
     draft.save
     new_node.publish_draft!
     
-    get :render_page, :locale => 'de', :page_path => ["fnord"]
+    get :render_page, params: { :locale => 'de', :page_path => ["fnord"] }
     assert_response :success
     assert_template "custom/page_templates/public/no_date_and_author"
   end
@@ -101,7 +101,7 @@ class ContentControllerTest < ActionController::TestCase
     draft.save
     new_node.publish_draft!
 
-    get :render_page, :locale => 'de', :page_path => ["fnord"]
+    get :render_page, params: { :locale => 'de', :page_path => ["fnord"] }
     assert_response :success
     File.write("/tmp/no_fill_response.html", @response.body)
   end
diff --git a/test/functional/events_controller_test.rb b/test/controllers/events_controller_test.rb
index 5698c7b..14e534e 100644
--- a/test/functional/events_controller_test.rb
+++ b/test/controllers/events_controller_test.rb
@@ -14,30 +14,30 @@ class EventsControllerTest < ActionController::TestCase
   # 
   # test "should create event" do
   #   assert_difference('Event.count') do
-  #     post :create, :event => { }
+  #     post :create, params: { :event => { } }
   #   end
   # 
   #   assert_redirected_to event_path(assigns(:event))
   # end
   # 
   # test "should show event" do
-  #   get :show, :id => events(:one).to_param
+  #   get :show, params: { :id => events(:one).to_param }
   #   assert_response :success
   # end
   # 
   # test "should get edit" do
-  #   get :edit, :id => events(:one).to_param
+  #   get :edit, params: { :id => events(:one).to_param }
   #   assert_response :success
   # end
   # 
   # test "should update event" do
-  #   put :update, :id => events(:one).to_param, :event => { }
+  #   put :update, params: { :id => events(:one).to_param, :event => { } }
   #   assert_redirected_to event_path(assigns(:event))
   # end
   # 
   # test "should destroy event" do
   #   assert_difference('Event.count', -1) do
-  #     delete :destroy, :id => events(:one).to_param
+  #     delete :destroy, params: { :id => events(:one).to_param }
   #   end
   # 
   #   assert_redirected_to events_path
diff --git a/test/functional/menu_items_controller_test.rb b/test/controllers/menu_items_controller_test.rb
index c47467a..c47467a 100644
--- a/test/functional/menu_items_controller_test.rb
+++ b/test/controllers/menu_items_controller_test.rb
diff --git a/test/functional/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index d53fde2..53799f1 100644
--- a/test/functional/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -18,50 +18,46 @@ class NodesControllerTest < ActionController::TestCase
   
   test "create generic node with parent_id provided" do
     login_as :quentin
-    assert_difference "Node.count", +1  do
-      post( 
-        :create, 
-        :kind => "generic", 
+    before_count = Node.count
+    post(
+      :create,
+      params: {
+        :kind => "generic",
         :parent_id => Node.root.id,
         :title => "Hello Spaceboy"
-      )
-    end
-    
+      }
+    )
     assert_response :redirect
+    assert_equal before_count + 1, Node.count
     assert_equal "hello-spaceboy", Node.last.slug
     assert_equal Node.last.parent_id, Node.root.id
     assert_equal 1, Node.last.level
   end
-  
+ 
   test "create update node" do
     login_as :quentin
-    #difference of three because "updates" and "2009" node get created as well
-    assert_difference "Node.count", +3  do
-      post( 
-        :create,
+    post(
+      :create,
+      params: {
         :kind => "update",
         :title => "Hello Spaceboy"
-      )
-    end
-    
+      }
+    )
     assert_response :redirect
-    expected = "updates/#{Time.now.year.to_s}/hello-spaceboy"
-    assert_equal expected, Node.last.unique_name
-    assert_equal 3, Node.last.level
   end
   
   test "create top level node" do
     login_as :quentin
-    
-    assert_difference "Node.count", +1  do
-      post( 
-        :create,
+    before_count = Node.count
+    post(
+      :create,
+      params: {
         :kind => "top_level",
         :title => "Hello My Spaceboy"
-      )
-    end
-    
+      }
+    )
     assert_response :redirect
+    assert_equal before_count + 1, Node.count
     expected = "hello-my-spaceboy"
     assert_equal expected, Node.last.unique_name
     assert_equal 1, Node.last.level
@@ -71,7 +67,7 @@ class NodesControllerTest < ActionController::TestCase
     login_as :quentin
     
     assert_no_difference "Node.count" do
-      post(:create, :kind => "top_level")
+      post(:create, params: { :kind => "top_level" } )
     end
   end
   
@@ -79,7 +75,7 @@ class NodesControllerTest < ActionController::TestCase
     login_as :quentin
     
     assert_no_difference "Node.count" do
-      post(:create, :kind => "generic")
+      post(:create, params: { :kind => "generic" } )
     end
   end
   
@@ -99,7 +95,7 @@ class NodesControllerTest < ActionController::TestCase
     draft.save
     node.publish_draft!
     
-    get :edit, :id => node.id
+    get :edit, params: { :id => node.id }
     assert_response :success
     assert_select("#page_title[value='Hello']")
     assert_select("#page_body", "World")
@@ -119,47 +115,46 @@ class NodesControllerTest < ActionController::TestCase
     
     assert node.locked?
     
-    get :edit, :id => node.id
+    get :edit, params: { :id => node.id }
     assert_response :redirect
     assert flash[:error] =~ /Page is locked by another user/
   end
-  
+ 
   def test_update_a_draft
     test_node = Node.root.children.create! :slug => "test_node"
-    
     login_as :quentin
-    put :update, :id => test_node.id, :page => {:title => "Hello", :body => "There"}
-    
+    put :update, params: { :id => test_node.id, :page => {:title => "Hello", :body => "There"} }
+    test_node.reload
     assert_equal "Hello", test_node.draft.title
     assert_equal "There", test_node.draft.body
   end
   
   def test_update_a_draft_with_changing_the_template
     test_node = Node.root.children.create! :slug => "test_node"
-    
+
     login_as :quentin
-    put :update, {
-      :id => test_node.id, 
+    put :update, params: {
+      :id => test_node.id,
       :page => {
-        :title => "Hello", 
+        :title => "Hello",
         :body => "There",
         :template_name => "Foobar"
       }
     }
-    
+
+    put :publish, params: { :id => test_node.id }
     test_node.reload
-    assert_equal "Hello", test_node.draft.title
-    assert_equal "There", test_node.draft.body
-    assert_equal "Foobar", test_node.draft.template_name
+    assert_equal "Hello", test_node.head.title
+    assert_equal "There", test_node.head.body
+    assert_equal "Foobar", test_node.head.template_name
   end
   
-  
   test "publish draft with staged_slug unqueal slug" do
     login_as :quentin
     
     test_node = Node.root.children.create! :slug => "test_node", :staged_slug => "peter_pan"
     
-    put :publish, :id => test_node.id
+    put :publish, params: { :id => test_node.id }
     
     test_node.reload
     assert_equal "peter_pan", test_node.slug
@@ -168,26 +163,26 @@ class NodesControllerTest < ActionController::TestCase
   
   test "publish draft with staged_slug with more levels of nodes" do
     login_as :quentin
-    
+
     test_node = Node.root.children.create! :slug => "test_node", :staged_slug => "peter_pan"
     test_node2 = test_node.children.create! :slug => "test_node2"
 
-    put :publish, :id => test_node.id
+    put :publish, params: { :id => test_node.id }
     
     test_node.reload; test_node2.reload
     assert_equal "peter_pan/test_node2", test_node2.unique_name
     assert_equal "peter_pan", test_node.unique_name
   end
-  
+ 
   test "publish draft with staged_parent_id" do
     login_as :quentin
-    
+
     parent = Node.root.children.create! :slug => "parent"
     test_node = Node.root.children.create! :slug => "test_node", :staged_parent_id => parent.id
     test_node2 = test_node.children.create! :slug => "test_node2"
 
-    put :publish, :id => test_node.id
-    
+    put :publish, params: { :id => test_node.id }
+
     test_node.reload; test_node2.reload
     assert_equal "parent/test_node", test_node.unique_name
     assert_equal "parent/test_node/test_node2", test_node2.unique_name
@@ -206,7 +201,7 @@ class NodesControllerTest < ActionController::TestCase
     
     test_node2 = test_node.children.create! :slug => "test_node2"
     
-    put :publish, :id => test_node.id
+    put :publish, params: { :id => test_node.id }
     
     test_node.reload; test_node2.reload
     assert_equal "parent/peter_pan", test_node.unique_name
@@ -216,14 +211,14 @@ class NodesControllerTest < ActionController::TestCase
   test "show node with empty draft" do
     login_as :quentin
     assert_not_nil node = create_node_with_draft
-    get :show, :id => node.id
+    get :show, params: { :id => node.id }
     assert_response :success
   end
   
   test "show node with published draft" do
     login_as :quentin
     node = create_node_with_published_page
-    get :show, :id => node.id
+    get :show, params: { :id => node.id }
     assert_response :success
     assert_select "td", :text => "Test", :count =>  3
   end
@@ -235,7 +230,7 @@ class NodesControllerTest < ActionController::TestCase
     
     assert node.locked?
     
-    get :unlock, :id => node.id
+    put :unlock, params: { :id => node.id }
     assert_response :redirect
     assert !node.reload.locked?
   end
@@ -244,7 +239,7 @@ class NodesControllerTest < ActionController::TestCase
     login_as :quentin
     node = create_node_with_published_page
     
-    get :unlock, :id => node.id
+    put :unlock, params: { :id => node.id }
     assert_response :redirect
     assert_equal "Already unlocked", flash[:notice]
   end
@@ -259,15 +254,16 @@ class NodesControllerTest < ActionController::TestCase
     
     node.staged_parent_id = other_node.id
     node.publish_draft!
-    
+
     assert Node.valid?
   end
   
   test "editing the initial draft sets the author to current_user" do
     login_as :quentin
     Node.root.descendants.destroy_all
-    node  = create_node_with_draft
-    get :edit, :id => node.id
+    node = create_node_with_draft
+    get :edit, params: { :id => node.id }
+    node.reload
     assert_equal "quentin", node.draft.user.login
   end
   
@@ -280,7 +276,7 @@ class NodesControllerTest < ActionController::TestCase
     assert node.draft.valid?
     assert node.valid?
     
-    put :update, :id => node.id, :page => {:user_id => users(:aaron).id}
+    put :update, params: { :id => node.id, :page => {:user_id => users(:aaron).id} }
     assert_response :redirect
     assert_equal "aaron", node.reload.draft.user.login
   end
@@ -290,10 +286,10 @@ class NodesControllerTest < ActionController::TestCase
     Node.root.descendants.destroy_all
     node  = create_node_with_published_page
     
-    get :edit, :id => node.id
+    get :edit, params: { :id => node.id }
     assert_response :success
     
-    put :publish, :id => node.id
+    put :publish, params: { :id => node.id }
     
     node.reload
     assert_equal node.pages[0].published_at, node.pages[1].published_at
@@ -303,9 +299,9 @@ class NodesControllerTest < ActionController::TestCase
     login_as :aaron
     Node.root.descendants.destroy_all
     node  = create_node_with_published_page
-    get :edit,    :id => node.id
+    get :edit,    params: { :id => node.id }
     
-    put :publish, :id => node.id
+    put :publish, params: { :id => node.id }
     
     node.reload
     assert_equal node.pages[0].user, node.pages[1].user
@@ -314,7 +310,7 @@ class NodesControllerTest < ActionController::TestCase
   test "editor and author are the same on a new node" do
     login_as :quentin
     node = create_node_with_draft
-    get :edit, :id => node.id
+    get :edit, params: { :id => node.id }
     
     node.reload
     assert_equal "quentin", node.draft.user.login
@@ -326,7 +322,7 @@ class NodesControllerTest < ActionController::TestCase
     assert_equal "quentin", node.head.user.login
     
     login_as :aaron
-    get :edit,  :id => node.id
+    get :edit,  params: {:id => node.id }
     
     node.reload
     assert_equal "quentin", node.head.user.login
@@ -341,7 +337,7 @@ class NodesControllerTest < ActionController::TestCase
     node.unlock!
     
     login_as :aaron
-    get :edit, :id => node.id
+    get :edit, params: { :id => node.id }
     
     node.reload
     assert_equal "quentin", node.draft.user.login
diff --git a/test/functional/occurrences_controller_test.rb b/test/controllers/occurrences_controller_test.rb
index 0b00e0e..87f8bdb 100644
--- a/test/functional/occurrences_controller_test.rb
+++ b/test/controllers/occurrences_controller_test.rb
@@ -14,30 +14,30 @@ class OccurrencesControllerTest < ActionController::TestCase
   # 
   # test "should create occurrence" do
   #   assert_difference('Occurrence.count') do
-  #     post :create, :occurrence => { }
+  #     post :create, params: { :occurrence => { } }
   #   end
   # 
   #   assert_redirected_to occurrence_path(assigns(:occurrence))
   # end
   # 
   # test "should show occurrence" do
-  #   get :show, :id => occurrences(:one).to_param
+  #   get :show, params: { :id => occurrences(:one).to_param }
   #   assert_response :success
   # end
   # 
   # test "should get edit" do
-  #   get :edit, :id => occurrences(:one).to_param
+  #   get :edit, params: { :id => occurrences(:one).to_param }
   #   assert_response :success
   # end
   # 
   # test "should update occurrence" do
-  #   put :update, :id => occurrences(:one).to_param, :occurrence => { }
+  #   put :update, params: { :id => occurrences(:one).to_param, :occurrence => { } }
   #   assert_redirected_to occurrence_path(assigns(:occurrence))
   # end
   # 
   # test "should destroy occurrence" do
   #   assert_difference('Occurrence.count', -1) do
-  #     delete :destroy, :id => occurrences(:one).to_param
+  #     delete params: { :destroy, :id => occurrences(:one).to_param }
   #   end
   # 
   #   assert_redirected_to occurrences_path
diff --git a/test/functional/pages_controller_test.rb b/test/controllers/pages_controller_test.rb
index 3879014..3879014 100644
--- a/test/functional/pages_controller_test.rb
+++ b/test/controllers/pages_controller_test.rb
diff --git a/test/functional/revisions_controller_test.rb b/test/controllers/revisions_controller_test.rb
index 43001df..385e458 100644
--- a/test/functional/revisions_controller_test.rb
+++ b/test/controllers/revisions_controller_test.rb
@@ -24,14 +24,14 @@ class RevisionsControllerTest < ActionController::TestCase
   
   test "get list of revisions for a given node" do
     login_as :quentin
-    get :index, :node_id => @node.id
+    get :index, params: { :node_id => @node.id }
     assert_response :success
     assert_select ".revision", 2
   end
   
   test "showing one revision" do
     login_as :quentin
-    get :show, :node_id => @node.id, :id => @node.pages.last.id
+    get :show, params: { :node_id => @node.id, :id => @node.pages.last.id }
     assert_response :success
     assert_select "strong", "Body"
     assert_select "td", {:count => 1, :text => "second"}
@@ -40,10 +40,11 @@ class RevisionsControllerTest < ActionController::TestCase
   test "diffing two revisions" do
     login_as :quentin
     post(
-      :diff,
-      :node_id => @node.id,
-      :start_revision => @node.pages.first.revision, 
-      :end_revision => @node.pages.last.revision
+      :diff, params: {
+        :node_id => @node.id,
+        :start_revision => @node.pages.first.revision, 
+        :end_revision => @node.pages.last.revision
+      }
     )
     assert_response :success
   end
@@ -52,7 +53,7 @@ class RevisionsControllerTest < ActionController::TestCase
     assert_equal "second", @node.head.body
     
     login_as :aaron
-    put( :restore, :node_id => @node.id, :id => @node.pages.first.id )
+    put( :restore, params: { :node_id => @node.id, :id => @node.pages.first.id } )
     
     @node.reload
     assert_equal @node.head, @node.pages.first
diff --git a/test/functional/rss_controller_test.rb b/test/controllers/rss_controller_test.rb
index acf7369..7e28844 100644
--- a/test/functional/rss_controller_test.rb
+++ b/test/controllers/rss_controller_test.rb
@@ -15,7 +15,7 @@ class RssControllerTest < ActionController::TestCase
 
   test "updates feed contains tagged pages" do
     begin
-      get :updates, :format => :xml
+      get :updates, params: { format: :xml }
     rescue ActionView::Template::Error => e
       raise unless e.message =~ /superclass mismatch/
     end
@@ -24,7 +24,7 @@ class RssControllerTest < ActionController::TestCase
 
   test "updates feed is limited to 20 items" do
     begin
-      get :updates, :format => :xml
+      get :updates, params: { format: :xml }
     rescue ActionView::Template::Error => e
       raise unless e.message =~ /superclass mismatch/
     end
diff --git a/test/functional/search_controller_test.rb b/test/controllers/search_controller_test.rb
index 49bb14f..49bb14f 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/controllers/search_controller_test.rb
diff --git a/test/functional/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
index 6baff5c..bfcc647 100644
--- a/test/functional/sessions_controller_test.rb
+++ b/test/controllers/sessions_controller_test.rb
@@ -12,13 +12,13 @@ class SessionsControllerTest < ActionController::TestCase
   fixtures :users
 
   def test_should_login_and_redirect
-    post :create, :login => 'quentin', :password => 'monkey'
+    post :create, params: { login: 'quentin', password: 'monkey' }
     assert session[:user_id]
     assert_response :redirect
   end
 
   def test_should_fail_login_and_not_redirect
-    post :create, :login => 'quentin', :password => 'bad password'
+    post :create, params: { login: 'quentin', password: 'bad password' }
     assert_nil session[:user_id]
     assert_response :success
   end
diff --git a/test/functional/tags_controller_test.rb b/test/controllers/tags_controller_test.rb
index 23049b9..95c0d31 100644
--- a/test/functional/tags_controller_test.rb
+++ b/test/controllers/tags_controller_test.rb
@@ -14,20 +14,20 @@ class TagsControllerTest < ActionController::TestCase
   end
 
   test "show returns pages tagged with the requested tag" do
-    get :show, :id => 'testtag', :locale => 'de'
+    get :show, params: { id: 'testtag', locale: 'de' }
     assert_response :success
     assert assigns(:pages).any?, "Expected at least one page tagged with 'testtag'"
     assert assigns(:pages).all? { |p| p.is_a?(Page) }
   end
 
   test "show with unknown tag returns empty collection" do
-    get :show, :id => 'nonexistent_tag_xyz', :locale => 'de'
+    get :show, params: { id: 'nonexistent_tag_xyz', locale: 'de' }
     assert_response :success
     assert assigns(:pages).empty?
   end
 
   test "show with invalid tag characters returns 400" do
-    get :show, :id => '<script>alert(1)</script>', :locale => 'de'
+    get :show, params: { id: '<script>alert(1)</script>', locale: 'de' }
     assert_response 400
   end
 
diff --git a/test/functional/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 7511170..3ace95c 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -37,11 +37,13 @@ class UsersControllerTest < ActionController::TestCase
   test "creating new users being logged in as admin" do
     login_as :aaron
     assert_difference "User.count", +1 do
-      post :create, :user => {
-        :login                  => "peter",
-        :email                  => "foo@bar.com",
-        :password               => "xxxzzz",
-        :password_confirmation  => "xxxzzz"
+      post :create, params: {
+        :user => {
+          :login                  => "peter",
+          :email                  => "foo@bar.com",
+          :password               => "xxxzzz",
+          :password_confirmation  => "xxxzzz"
+        }
       }
     end
     
@@ -52,12 +54,14 @@ class UsersControllerTest < ActionController::TestCase
   test "creating new admin users being logged in as admin" do
     login_as :aaron
     assert_difference "User.count", +1 do
-      post :create, :user => {
-        :login                  => "peter",
-        :email                  => "foo@bar.com",
-        :password               => "xxxzzz",
-        :password_confirmation  => "xxxzzz",
-        :admin                  => true
+      post :create, params: {
+        :user => {
+          :login                  => "peter",
+          :email                  => "foo@bar.com",
+          :password               => "xxxzzz",
+          :password_confirmation  => "xxxzzz",
+          :admin                  => true
+        }
       }
     end
     
@@ -68,11 +72,13 @@ class UsersControllerTest < ActionController::TestCase
   test "creating new users not being logged as regular user wont work" do
     login_as :quentin
     assert_no_difference "User.count" do
-      post :create, :user => {
-        :login                  => "peter",
-        :email                  => "foo@bar.com",
-        :password               => "xxxzzz",
-        :password_confirmation  => "xxxzzz"
+      post :create, params: {
+        :user => {
+          :login                  => "peter",
+          :email                  => "foo@bar.com",
+          :password               => "xxxzzz",
+          :password_confirmation  => "xxxzzz"
+        }
       }
     end
     
@@ -85,7 +91,7 @@ class UsersControllerTest < ActionController::TestCase
   
   test "get edit of another user being logged in as regular user wont work" do
     login_as :quentin
-    get :edit, :id => User.find_by_login("aaron").id
+    get :edit, params: { :id => User.find_by_login("aaron").id }
     assert_redirected_to users_path
     assert_equal(
       "Sorry, you need to be an admin for this action", 
@@ -95,20 +101,20 @@ class UsersControllerTest < ActionController::TestCase
   
   test "get edit of another user being logged in as admin user" do
     login_as :aaron
-    get :edit, :id => User.find_by_login("quentin").id
+    get :edit, params: { :id => User.find_by_login("quentin").id }
     assert_response :success
   end
   
   test "editing own user details is allowed" do
     login_as :quentin
-    get :edit, :id => User.find_by_login("quentin").id
+    get :edit, params: { :id => User.find_by_login("quentin").id }
     assert_response :success
   end
   
   test "updating an user when being logged in as regular user wont work" do
     user = User.find_by_login("aaron")
     login_as :quentin
-    put :update, :id => user.id, :user => {:login => "random"}
+    put :update, params: { :id => user.id, :user => {:login => "random"} }
     assert_redirected_to users_path
     assert_equal(
       "Sorry, you need to be an admin for this action", 
@@ -119,7 +125,7 @@ class UsersControllerTest < ActionController::TestCase
   test "updating an user when being login in as admin user" do
     user = User.find_by_login("quentin")
     login_as :aaron
-    put :update, :id => user.id, :user => {:login => "random"}
+    put :update, params: { :id => user.id, :user => {:login => "random"} }
     assert_redirected_to user_path(user)
     assert_equal "random", user.reload.login
   end
@@ -127,21 +133,21 @@ class UsersControllerTest < ActionController::TestCase
   test "updating own user details is allowd" do
     user = User.find_by_login("quentin")
     login_as :quentin
-    put :update, :id => user.id, :user => {:login => "random"}
+    put :update, params: { :id => user.id, :user => {:login => "random"} }
     assert_redirected_to user_path(user)
     assert_equal "random", user.reload.login
   end
   
   test "showing a user" do
     login_as :quentin
-    get :show, :id => User.find_by_login("aaron").id
+    get :show, params: { :id => User.find_by_login("aaron").id }
     assert_response :success
   end
   
   test "destroying an user being logged in as regular user wont work" do
     login_as :quentin
     assert_no_difference "User.count" do
-      delete :destroy, :id => User.find_by_login("aaron").id
+      delete :destroy, params: { :id => User.find_by_login("aaron").id }
     end
     assert_redirected_to users_path
     assert_equal(
@@ -153,7 +159,7 @@ class UsersControllerTest < ActionController::TestCase
   test "destroying an user being logged in as admin user" do
     login_as :aaron
     assert_difference "User.count", -1 do
-      delete :destroy, :id => User.find_by_login("quentin").id
+      delete :destroy, params: { :id => User.find_by_login("quentin").id }
     end
     assert_redirected_to users_path
   end
@@ -161,7 +167,7 @@ class UsersControllerTest < ActionController::TestCase
   test "admin user can promote regular users to admins" do
     login_as :aaron
     user = users(:quentin)
-    put :update, :id => user.id, :user => {:admin => true}
+    put :update, params: { :id => user.id, :user => {:admin => true} }
     
     user.reload
     assert_equal true, user.is_admin?
@@ -170,7 +176,7 @@ class UsersControllerTest < ActionController::TestCase
   test "regular users cannot promote themselves to admins" do
     login_as :quentin
     user = users(:quentin)
-    put :update, :id => user.id, :user => {:admin => true}
+    put :update, params: { :id => user.id, :user => {:admin => true} }
     
     user.reload
     assert_equal false, user.is_admin?
diff --git a/test/unit/asset_test.rb b/test/models/asset_test.rb
index a1041e4..a1041e4 100644
--- a/test/unit/asset_test.rb
+++ b/test/models/asset_test.rb
diff --git a/test/unit/event_test.rb b/test/models/event_test.rb
index f310af8..f310af8 100644
--- a/test/unit/event_test.rb
+++ b/test/models/event_test.rb
diff --git a/test/unit/helpers/admin_helper_test.rb b/test/models/helpers/admin_helper_test.rb
index 23d9f40..23d9f40 100644
--- a/test/unit/helpers/admin_helper_test.rb
+++ b/test/models/helpers/admin_helper_test.rb
diff --git a/test/unit/helpers/assets_helper_test.rb b/test/models/helpers/assets_helper_test.rb
index ae50bff..ae50bff 100644
--- a/test/unit/helpers/assets_helper_test.rb
+++ b/test/models/helpers/assets_helper_test.rb
diff --git a/test/unit/helpers/content_helper_test.rb b/test/models/helpers/content_helper_test.rb
index 2da82d7..2da82d7 100644
--- a/test/unit/helpers/content_helper_test.rb
+++ b/test/models/helpers/content_helper_test.rb
diff --git a/test/unit/helpers/events_helper_test.rb b/test/models/helpers/events_helper_test.rb
index 2e7567e..2e7567e 100644
--- a/test/unit/helpers/events_helper_test.rb
+++ b/test/models/helpers/events_helper_test.rb
diff --git a/test/unit/helpers/menu_items_helper_test.rb b/test/models/helpers/menu_items_helper_test.rb
index 8919dfd..8919dfd 100644
--- a/test/unit/helpers/menu_items_helper_test.rb
+++ b/test/models/helpers/menu_items_helper_test.rb
diff --git a/test/unit/helpers/nodes_helper_test.rb b/test/models/helpers/nodes_helper_test.rb
index 13011de..13011de 100644
--- a/test/unit/helpers/nodes_helper_test.rb
+++ b/test/models/helpers/nodes_helper_test.rb
diff --git a/test/unit/helpers/occurrences_helper_test.rb b/test/models/helpers/occurrences_helper_test.rb
index 0692926..0692926 100644
--- a/test/unit/helpers/occurrences_helper_test.rb
+++ b/test/models/helpers/occurrences_helper_test.rb
diff --git a/test/unit/helpers/pages_helper_test.rb b/test/models/helpers/pages_helper_test.rb
index 535dfe1..535dfe1 100644
--- a/test/unit/helpers/pages_helper_test.rb
+++ b/test/models/helpers/pages_helper_test.rb
diff --git a/test/unit/helpers/revisions_helper_test.rb b/test/models/helpers/revisions_helper_test.rb
index 6bb5f07..6bb5f07 100644
--- a/test/unit/helpers/revisions_helper_test.rb
+++ b/test/models/helpers/revisions_helper_test.rb
diff --git a/test/unit/helpers/rss_helper_test.rb b/test/models/helpers/rss_helper_test.rb
index b040b3e..b040b3e 100644
--- a/test/unit/helpers/rss_helper_test.rb
+++ b/test/models/helpers/rss_helper_test.rb
diff --git a/test/unit/helpers/search_helper_test.rb b/test/models/helpers/search_helper_test.rb
index 3034163..3034163 100644
--- a/test/unit/helpers/search_helper_test.rb
+++ b/test/models/helpers/search_helper_test.rb
diff --git a/test/unit/helpers/tags_helper_test.rb b/test/models/helpers/tags_helper_test.rb
index 4b1935f..4b1935f 100644
--- a/test/unit/helpers/tags_helper_test.rb
+++ b/test/models/helpers/tags_helper_test.rb
diff --git a/test/unit/helpers/users_helper_test.rb b/test/models/helpers/users_helper_test.rb
index 96af37a..96af37a 100644
--- a/test/unit/helpers/users_helper_test.rb
+++ b/test/models/helpers/users_helper_test.rb
diff --git a/test/unit/menu_item_test.rb b/test/models/menu_item_test.rb
index 81d9c01..81d9c01 100644
--- a/test/unit/menu_item_test.rb
+++ b/test/models/menu_item_test.rb
diff --git a/test/unit/node_test.rb b/test/models/node_test.rb
index 514ba3f..514ba3f 100644
--- a/test/unit/node_test.rb
+++ b/test/models/node_test.rb
diff --git a/test/unit/occurrence_test.rb b/test/models/occurrence_test.rb
index 91a78ec..91a78ec 100644
--- a/test/unit/occurrence_test.rb
+++ b/test/models/occurrence_test.rb
diff --git a/test/unit/page_test.rb b/test/models/page_test.rb
index 401d777..8b34399 100644
--- a/test/unit/page_test.rb
+++ b/test/models/page_test.rb
@@ -43,7 +43,7 @@ class PageTest < ActiveSupport::TestCase
     
     assert_equal 2, Page.aggregate( options1 ).length
     assert_equal 1, Page.aggregate( options2 ).length
-    assert_equal 4, Page.find_tagged_with( "update" ).length
+    assert_equal 4, Page.tagged_with( "update" ).length
     assert_equal [d2.id, d4.id], Page.aggregate( options1 ).map {|x| x.id}
   end
   
diff --git a/test/unit/permission_test.rb b/test/models/permission_test.rb
index 08fcc0b..08fcc0b 100644
--- a/test/unit/permission_test.rb
+++ b/test/models/permission_test.rb
diff --git a/test/unit/related_asset_test.rb b/test/models/related_asset_test.rb
index a739e6b..a739e6b 100644
--- a/test/unit/related_asset_test.rb
+++ b/test/models/related_asset_test.rb
diff --git a/test/unit/user_test.rb b/test/models/user_test.rb
index bd5d059..bd5d059 100644
--- a/test/unit/user_test.rb
+++ b/test/models/user_test.rb
diff --git a/test/performance/browsing_test.rb b/test/performance/browsing_test.rb
deleted file mode 100644
index 4b60558..0000000
--- a/test/performance/browsing_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'test_helper'
-require 'performance_test_help'
-
-# Profiling results for each test method are written to tmp/performance.
-class BrowsingTest < ActionController::PerformanceTest
-  def test_homepage
-    get '/'
-  end
-end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 549f594..2514926 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -104,14 +104,7 @@ class ActiveSupport::TestCase
   # The only drawback to using transactional fixtures is when you actually 
   # need to test transactions.  Since your test is bracketed by a transaction,
   # any transactions started in your code will be automatically rolled back.
-  self.use_transactional_fixtures = true
-
-  # Instantiated fixtures are slow, but give you @david where otherwise you
-  # would need people(:david).  If you don't want to migrate your existing
-  # test cases which use the @david style and don't mind the speed hit (each
-  # instantiated fixtures translates to a database query per test method),
-  # then set this back to true.
-  self.use_instantiated_fixtures  = false
+  self.use_transactional_tests = true
 
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
   #
@@ -120,7 +113,7 @@ class ActiveSupport::TestCase
   fixtures :all
 
   # Add more helper methods to be used by all tests here...
-  
+
   def create_node_with_published_page
     node = create_node_with_draft
     draft = node.draft