Browse Source

Fixed tests

sh4nks 11 years ago
parent
commit
70a1966d10
3 changed files with 12 additions and 4 deletions
  1. 8 1
      tests/fixtures/app.py
  2. 1 1
      tests/fixtures/forum.py
  3. 3 2
      tests/unit/test_forum_models.py

+ 8 - 1
tests/fixtures/app.py

@@ -3,7 +3,8 @@ import pytest
 from flaskbb import create_app
 from flaskbb.extensions import db
 from flaskbb.configs.testing import TestingConfig as Config
-from flaskbb.utils.populate import create_default_groups
+from flaskbb.utils.populate import create_default_groups, \
+    create_default_settings
 
 
 @pytest.yield_fixture(autouse=True)
@@ -25,6 +26,12 @@ def default_groups(database):
     return create_default_groups()
 
 
+@pytest.fixture()
+def default_settings(database):
+    """Creates the default settings"""
+    return create_default_settings()
+
+
 @pytest.yield_fixture()
 def database():
     """database setup."""

+ 1 - 1
tests/fixtures/forum.py

@@ -12,7 +12,7 @@ def category(database):
 
 
 @pytest.fixture
-def forum(category):
+def forum(category, default_settings):
     """A single forum in a category."""
     forum = Forum(title="Test Forum", category_id=category.id)
     forum.save()

+ 3 - 2
tests/unit/test_forum_models.py

@@ -6,6 +6,7 @@ from flask.ext.login import login_user, current_user, logout_user
 from flaskbb.forum.models import Category, Forum, Topic, Post, ForumsRead, \
     TopicsRead, Report
 from flaskbb.user.models import User
+from flaskbb.utils.settings import flaskbb_config
 
 
 def test_category_save(database):
@@ -486,9 +487,9 @@ def test_topic_update_read(database, user, topic):
                    ForumsRead.forum_id == topic.forum_id).first()
 
         # Test tracker length
-        current_app.config["TRACKER_LENGTH"] = 0
+        flaskbb_config["TRACKER_LENGTH"] = 0
         assert not topic.update_read(current_user, topic.forum, forumsread)
-        current_app.config["TRACKER_LENGTH"] = 1
+        flaskbb_config["TRACKER_LENGTH"] = 1
         assert topic.update_read(current_user, topic.forum, forumsread)
 
         # Test with logged out user