Fix fileadmin test.

flask_admin/tests/fileadmin/test_fileadmin.py

@@ -2,7 +2,7 @@ import os
 import os.path as op
 import unittest
 
-from nose.tools import eq_, ok_, with_setup
+from nose.tools import eq_, ok_
 
 from flask_admin.contrib import fileadmin
 from flask_admin import Admin
@@ -138,31 +138,39 @@ class Base:
             ok_('path=dummy_renamed_dir' not in rv.data.decode('utf-8'))
             ok_('path=dummy.txt' in rv.data.decode('utf-8'))
 
-        def add_file():
-            # make sure that 'files/dummy2.txt' exists, is newest and has bigger size
-            with open(op.join(op.dirname(__file__), 'files', 'dummy2.txt'), 'w') as fp:
-                fp.write('test')
+        def test_fileadmin_sort_bogus_url_param(self):
+            fileadmin_class = self.fileadmin_class()
+            fileadmin_args, fileadmin_kwargs = self.fileadmin_args()
+            app, admin = setup()
 
-        def remove_file():
-            try:
-                os.remove(op.join(op.dirname(__file__), 'files', 'dummy2.txt'))
-            except (IOError, OSError):
-                pass
+            class MyFileAdmin(fileadmin_class):
+                editable_extensions = ('txt',)
+
+            view_kwargs = dict(fileadmin_kwargs)
+            view_kwargs.setdefault('name', 'Files')
+            view = MyFileAdmin(*fileadmin_args, **view_kwargs)
+
+            admin.add_view(view)
 
-        @with_setup(add_file, remove_file)
-        def test_fileadmin_sort_bogus_url_param():
-            app, admin, view = create_view()
             client = app.test_client()
+            with open(op.join(self._test_files_root, 'dummy2.txt'), 'w') as fp:
+                # make sure that 'files/dummy2.txt' exists, is newest and has bigger size
+                fp.write('test')
 
-            rv = client.get('/admin/myfileadmin/?sort=bogus')
-            eq_(rv.status_code, 200)
-            ok_(rv.data.decode('utf-8').find('path=dummy2.txt') <
-                rv.data.decode('utf-8').find('path=dummy.txt'))
+                rv = client.get('/admin/myfileadmin/?sort=bogus')
+                eq_(rv.status_code, 200)
+                ok_(rv.data.decode('utf-8').find('path=dummy2.txt') <
+                    rv.data.decode('utf-8').find('path=dummy.txt'))
 
-            rv = client.get('/admin/myfileadmin/?sort=name')
-            eq_(rv.status_code, 200)
-            ok_(rv.data.decode('utf-8').find('path=dummy.txt') <
-                rv.data.decode('utf-8').find('path=dummy2.txt'))
+                rv = client.get('/admin/myfileadmin/?sort=name')
+                eq_(rv.status_code, 200)
+                ok_(rv.data.decode('utf-8').find('path=dummy.txt') <
+                    rv.data.decode('utf-8').find('path=dummy2.txt'))
+            try:
+                # clean up
+                os.remove(op.join(self._test_files_root, 'dummy2.txt'))
+            except (IOError, OSError):
+                pass
 
         def test_modal_edit(self):
             # bootstrap 2 - test edit_modal