diff --git a/test/unit/folder_helper_test.rb b/test/unit/folder_helper_test.rb
index 9e433d9..aa006a6 100644
--- a/test/unit/folder_helper_test.rb
+++ b/test/unit/folder_helper_test.rb
@@ -1,10 +1,9 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class FolderHelperTest < ActiveSupport::TestCase
+class FolderHelperTest < ActionView::TestCase
 
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::UrlHelper
-  include ActionController::UrlWriter
   include ActionView::Helpers::AssetTagHelper
   include DatesHelper
 
@@ -25,7 +24,7 @@ class FolderHelperTest < ActiveSupport::TestCase
 
   should 'display icon for images' do
     profile = fast_create(Profile)
-    file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => profile)
+    file = create(UploadedFile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => profile)
     process_delayed_job_queue
 
     assert_match /rails_icon\.png/, icon_for_article(file.reload)
@@ -96,7 +95,7 @@ class FolderHelperTest < ActiveSupport::TestCase
     article2 = fast_create(Article, {:name => 'Article2', :parent_id => folder.id, :profile_id => profile.id, :updated_at => DateTime.now })
     self.stubs(:params).returns({:npage => nil})
 
-    articles = folder.children.find(:all, :order => 'updated_at DESC').paginate(:per_page => 10, :page => params[:npage])
+    articles = folder.children.order('updated_at DESC').paginate(:per_page => 10, :page => params[:npage])
     expects(:user).returns(profile).at_least_once
     expects(:recursive).returns(false).at_least_once
     expects(:pagination_links).with(anything, anything).returns('')
@@ -127,7 +126,7 @@ class FolderHelperTest < ActiveSupport::TestCase
 
   private
   def render(template, the_binding)
-    ERB.new(File.read(Rails.root + '/app/views/' + template + '.rhtml')).result(the_binding)
+    ERB.new(File.read(File.join(Rails.root, 'app/views', template + '.html.erb'))).result(the_binding)
   end
 
 end
--
libgit2 0.21.2