Просмотр исходного кода

Remove more conversations related files and references

Peter Justin 7 лет назад
Родитель
Сommit
5e6009d214
4 измененных файлов с 0 добавлено и 138 удалено
  1. 0 7
      flaskbb/user/models.py
  2. 0 1
      tests/conftest.py
  3. 0 98
      tests/endtoend/test_message_views.py
  4. 0 32
      tests/fixtures/message.py

+ 0 - 7
flaskbb/user/models.py

@@ -160,13 +160,6 @@ class User(db.Model, UserMixin, CRUDMixin):
         single_parent=True
     )
 
-    conversations = db.relationship(
-        "Conversation",
-        primaryjoin="Conversation.user_id == User.id",
-        lazy="dynamic",
-        passive_deletes="all"  # let the dbms handle the foreignkeys
-    )
-
     # Properties
     @property
     def is_active(self):

+ 0 - 1
tests/conftest.py

@@ -1,6 +1,5 @@
 from tests.fixtures.app import *  # noqa
 from tests.fixtures.forum import *  # noqa
 from tests.fixtures.user import *  # noqa
-from tests.fixtures.message import *  # noqa
 from tests.fixtures.settings_fixture import *  # noqa
 from tests.fixtures.plugin import *  # noqa

+ 0 - 98
tests/endtoend/test_message_views.py

@@ -1,98 +0,0 @@
-import pytest
-from werkzeug import exceptions
-from flask_login import login_user
-
-from flaskbb.message import views, models
-
-
-def test_message_not_logged_in(application):
-    """ check for redirect if not logged in """
-    view = views.Inbox.as_view('inbox')
-    with application.test_request_context():
-        resp = view()
-        assert resp.status != 302
-
-
-def test_message_inbox(application, default_settings, conversation_msgs, user):
-    view = views.Inbox()
-    with application.test_request_context():
-        login_user(user)
-        resp = view.get()
-        assert '<a href="/message/1/view">' in resp
-        assert '<a href="/user/test_normal">test_normal</a>' in resp
-
-
-def test_message_view_conversation(
-        application, default_settings,
-        conversation_msgs, user):
-    with application.test_request_context():
-        login_user(user)
-        view = views.ViewConversation()
-        resp = view.get(conversation_msgs.id)
-        assert conversation_msgs.first_message.message in resp
-
-
-def test_message_trash_restore_conversation(
-        application, default_settings,
-        conversation_msgs, user):
-    move = views.MoveConversation()
-    restore = views.RestoreConversation()
-    with application.test_request_context():
-        login_user(user)
-        resp = move.post(conversation_msgs.id)
-        assert resp.status != 302
-        assert conversation_msgs.trash is True
-        resp = restore.post(conversation_msgs.id)
-        assert conversation_msgs.trash is False
-
-
-def test_message_delete_conversation(
-        application, default_settings,
-        conversation_msgs, user):
-    view = views.DeleteConversation()
-    with application.test_request_context():
-        login_user(user)
-        resp = view.post(conversation_msgs.id)
-        assert resp.status != 302
-
-
-def test_message_trash(application, default_settings, user):
-    # FIXME more sophisticated tests required
-    view = views.TrashedMessages()
-    with application.test_request_context():
-        login_user(user)
-        resp = view.get()
-        assert 'No conversations found' in resp
-
-
-def test_message_drafts(application, default_settings, user):
-    # FIXME more sophisticated tests required
-    view = views.DraftMessages()
-    with application.test_request_context():
-        login_user(user)
-        resp = view.get()
-        assert 'No conversations found' in resp
-
-
-def test_message_sent(application, default_settings, user):
-    # FIXME more sophisticated tests required
-    view = views.SentMessages()
-    with application.test_request_context():
-        login_user(user)
-        resp = view.get()
-        assert 'No conversations found' in resp
-
-
-def test_message_view_raw(
-    application, conversation_msgs,
-    default_settings, user, moderator_user):
-    view = views.RawMessage()
-    with application.test_request_context():
-        login_user(user)
-        resp = view.get(conversation_msgs.last_message.id)
-        assert conversation_msgs.last_message.message in resp
-
-        # same view should raise a 404 for a different user
-        login_user(moderator_user)
-        with pytest.raises(exceptions.NotFound):
-            resp = view.get(conversation_msgs.last_message.id)

+ 0 - 32
tests/fixtures/message.py

@@ -1,32 +0,0 @@
-import pytest
-import uuid
-from flaskbb.message.models import Conversation, Message
-
-
-@pytest.fixture
-def conversation(database, user, admin_user):
-    conversation = Conversation(
-        user_id=user.id,
-        from_user_id=user.id,
-        to_user_id=admin_user.id,
-        shared_id=uuid.uuid4()
-    )
-    conversation.save()
-    return conversation
-
-
-@pytest.fixture
-def conversation_msgs(conversation, user, admin_user):
-    message = Message(
-        user_id=user.id,
-        conversation_id=conversation.id,
-        message="First message"
-    )
-    conversation.save(message=message)
-    message = Message(
-        user_id=admin_user.id,
-        conversation_id=conversation.id,
-        message="Second message"
-    )
-    conversation.save(message=message)
-    return conversation