aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/tests')
-rw-r--r--mediagoblin/tests/__init__.py11
-rw-r--r--mediagoblin/tests/test_auth.py10
-rw-r--r--mediagoblin/tests/test_globals.py2
-rw-r--r--mediagoblin/tests/test_tests.py10
-rw-r--r--mediagoblin/tests/test_util.py19
-rw-r--r--mediagoblin/tests/test_workbench.py50
6 files changed, 65 insertions, 37 deletions
diff --git a/mediagoblin/tests/__init__.py b/mediagoblin/tests/__init__.py
index c129cbf8..e9e2a59a 100644
--- a/mediagoblin/tests/__init__.py
+++ b/mediagoblin/tests/__init__.py
@@ -13,3 +13,14 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from mediagoblin import mg_globals
+
+
+def setup_package():
+ pass
+
+def teardown_package():
+ print "Killing db ..."
+ mg_globals.db_connection.drop_database(mg_globals.database.name)
+ print "... done"
diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index cdfeccab..3d569093 100644
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -20,7 +20,7 @@ from nose.tools import assert_equal
from mediagoblin.auth import lib as auth_lib
from mediagoblin.tests.tools import setup_fresh_app
-from mediagoblin import globals as mgoblin_globals
+from mediagoblin import mg_globals
from mediagoblin import util
@@ -137,7 +137,7 @@ def test_register_views(test_app):
u'Passwords must match.']
## At this point there should be no users in the database ;)
- assert not mgoblin_globals.database.User.find().count()
+ assert not mg_globals.database.User.find().count()
# Successful register
# -------------------
@@ -158,7 +158,7 @@ def test_register_views(test_app):
'mediagoblin/auth/register_success.html')
## Make sure user is in place
- new_user = mgoblin_globals.database.User.find_one(
+ new_user = mg_globals.database.User.find_one(
{'username': 'happygirl'})
assert new_user
assert new_user['status'] == u'needs_email_verification'
@@ -191,7 +191,7 @@ def test_register_views(test_app):
context = util.TEMPLATE_TEST_CONTEXT[
'mediagoblin/auth/verify_email.html']
assert context['verification_successful'] == False
- new_user = mgoblin_globals.database.User.find_one(
+ new_user = mg_globals.database.User.find_one(
{'username': 'happygirl'})
assert new_user
assert new_user['status'] == u'needs_email_verification'
@@ -203,7 +203,7 @@ def test_register_views(test_app):
context = util.TEMPLATE_TEST_CONTEXT[
'mediagoblin/auth/verify_email.html']
assert context['verification_successful'] == True
- new_user = mgoblin_globals.database.User.find_one(
+ new_user = mg_globals.database.User.find_one(
{'username': 'happygirl'})
assert new_user
assert new_user['status'] == u'active'
diff --git a/mediagoblin/tests/test_globals.py b/mediagoblin/tests/test_globals.py
index 6d2e01da..59d217f3 100644
--- a/mediagoblin/tests/test_globals.py
+++ b/mediagoblin/tests/test_globals.py
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from mediagoblin import globals as mg_globals
+from mediagoblin import mg_globals
def test_setup_globals():
mg_globals.setup_globals(
diff --git a/mediagoblin/tests/test_tests.py b/mediagoblin/tests/test_tests.py
index 3ecbfac7..8ac7f0a4 100644
--- a/mediagoblin/tests/test_tests.py
+++ b/mediagoblin/tests/test_tests.py
@@ -16,7 +16,7 @@
from mediagoblin.tests.tools import get_test_app
-from mediagoblin import globals as mgoblin_globals
+from mediagoblin import mg_globals
def test_get_test_app_wipes_db():
@@ -24,15 +24,15 @@ def test_get_test_app_wipes_db():
Make sure we get a fresh database on every wipe :)
"""
get_test_app()
- assert mgoblin_globals.database.User.find().count() == 0
+ assert mg_globals.database.User.find().count() == 0
- new_user = mgoblin_globals.database.User()
+ new_user = mg_globals.database.User()
new_user['username'] = u'lolcat'
new_user['email'] = u'lol@cats.example.org'
new_user['pw_hash'] = u'pretend_this_is_a_hash'
new_user.save()
- assert mgoblin_globals.database.User.find().count() == 1
+ assert mg_globals.database.User.find().count() == 1
get_test_app()
- assert mgoblin_globals.database.User.find().count() == 0
+ assert mg_globals.database.User.find().count() == 0
diff --git a/mediagoblin/tests/test_util.py b/mediagoblin/tests/test_util.py
index 7b00a074..75e28aca 100644
--- a/mediagoblin/tests/test_util.py
+++ b/mediagoblin/tests/test_util.py
@@ -103,3 +103,22 @@ def test_locale_to_lower_lower():
# crazy renditions. Useful?
assert util.locale_to_lower_lower('en-US') == 'en-us'
assert util.locale_to_lower_lower('en_us') == 'en-us'
+
+
+def test_html_cleaner():
+ # Remove images
+ result = util.clean_html(
+ '<p>Hi everybody! '
+ '<img src="http://example.org/huge-purple-barney.png" /></p>\n'
+ '<p>:)</p>')
+ assert result == (
+ '<div>'
+ '<p>Hi everybody! </p>\n'
+ '<p>:)</p>'
+ '</div>')
+
+ # Remove evil javascript
+ result = util.clean_html(
+ '<p><a href="javascript:nasty_surprise">innocent link!</a></p>')
+ assert result == (
+ '<p><a href="">innocent link!</a></p>')
diff --git a/mediagoblin/tests/test_workbench.py b/mediagoblin/tests/test_workbench.py
index 89f2ef33..953835a1 100644
--- a/mediagoblin/tests/test_workbench.py
+++ b/mediagoblin/tests/test_workbench.py
@@ -30,29 +30,29 @@ class TestWorkbench(object):
def test_create_workbench(self):
workbench = self.workbench_manager.create_workbench()
- assert os.path.isdir(workbench)
- assert workbench.startswith(self.workbench_manager.base_workbench_dir)
+ assert os.path.isdir(workbench.dir)
+ assert workbench.dir.startswith(self.workbench_manager.base_workbench_dir)
+
+ def test_joinpath(self):
+ this_workbench = self.workbench_manager.create_workbench()
+ tmpname = this_workbench.joinpath('temp.txt')
+ assert tmpname == os.path.join(this_workbench.dir, 'temp.txt')
+ this_workbench.destroy_self()
def test_destroy_workbench(self):
# kill a workbench
this_workbench = self.workbench_manager.create_workbench()
- tmpfile = file(os.path.join(this_workbench, 'temp.txt'), 'w')
+ tmpfile_name = this_workbench.joinpath('temp.txt')
+ tmpfile = file(tmpfile_name, 'w')
with tmpfile:
tmpfile.write('lollerskates')
- assert os.path.exists(os.path.join(this_workbench, 'temp.txt'))
-
- self.workbench_manager.destroy_workbench(this_workbench)
- assert not os.path.exists(os.path.join(this_workbench, 'temp.txt'))
- assert not os.path.exists(this_workbench)
-
- # make sure we can't kill other stuff though
- dont_kill_this = tempfile.mkdtemp()
+ assert os.path.exists(tmpfile_name)
- assert_raises(
- workbench.WorkbenchOutsideScope,
- self.workbench_manager.destroy_workbench,
- dont_kill_this)
+ wb_dir = this_workbench.dir
+ this_workbench.destroy_self()
+ assert not os.path.exists(tmpfile_name)
+ assert not os.path.exists(wb_dir)
def test_localized_file(self):
tmpdir, this_storage = get_tmp_filestorage()
@@ -65,8 +65,7 @@ class TestWorkbench(object):
our_file.write('Our file')
# with a local file storage
- filename = self.workbench_manager.localized_file(
- this_workbench, this_storage, filepath)
+ filename = this_workbench.localized_file(this_storage, filepath)
assert filename == os.path.join(
tmpdir, 'dir1/dir2/ourfile.txt')
@@ -77,20 +76,19 @@ class TestWorkbench(object):
with this_storage.get_file(filepath, 'w') as our_file:
our_file.write('Our file')
- filename = self.workbench_manager.localized_file(
- this_workbench, this_storage, filepath)
+ filename = this_workbench.localized_file(this_storage, filepath)
assert filename == os.path.join(
- this_workbench, 'ourfile.txt')
+ this_workbench.dir, 'ourfile.txt')
# fake remote file storage, filename_if_copying set
- filename = self.workbench_manager.localized_file(
- this_workbench, this_storage, filepath, 'thisfile')
+ filename = this_workbench.localized_file(
+ this_storage, filepath, 'thisfile')
assert filename == os.path.join(
- this_workbench, 'thisfile.txt')
+ this_workbench.dir, 'thisfile.txt')
# fake remote file storage, filename_if_copying set,
# keep_extension_if_copying set to false
- filename = self.workbench_manager.localized_file(
- this_workbench, this_storage, filepath, 'thisfile.text', False)
+ filename = this_workbench.localized_file(
+ this_storage, filepath, 'thisfile.text', False)
assert filename == os.path.join(
- this_workbench, 'thisfile.text')
+ this_workbench.dir, 'thisfile.text')
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-11 09:42:09 +0000