Peter Justin 5 лет назад
Родитель
Сommit
c7bcd49d52
2 измененных файлов с 43 добавлено и 43 удалено
  1. 25 25
      requirements.txt
  2. 18 18
      tests/unit/test_requirements.py

+ 25 - 25
requirements.txt

@@ -1,27 +1,27 @@
-alembic==1.0.10
-amqp==2.4.2
-attrs==19.1.0
-Babel==2.6.0
-billiard==3.6.0.0
+alembic==1.2.1
+amqp==2.5.1
+attrs==19.2.0
+Babel==2.7.0
+billiard==3.6.1.0
 blinker==1.4
 blinker==1.4
 celery==4.3.0
 celery==4.3.0
-certifi==2019.3.9
+certifi==2019.9.11
 chardet==3.0.4
 chardet==3.0.4
 click==7.0
 click==7.0
 click-log==0.3.2
 click-log==0.3.2
 enum34==1.1.6 ; python_version<'3.4'
 enum34==1.1.6 ; python_version<'3.4'
-Flask==1.0.3
+Flask==1.1.1
 Flask-Alembic==2.0.1
 Flask-Alembic==2.0.1
-flask-allows==0.7.1
+git+https://github.com/justanr/flask-allows.git@f/Cut-down-on-warnings#egg=flask-allows
 Flask-BabelPlus==2.1.1
 Flask-BabelPlus==2.1.1
-Flask-Caching==1.7.1
+Flask-Caching==1.7.2
 Flask-DebugToolbar==0.10.1
 Flask-DebugToolbar==0.10.1
 flask-debugtoolbar-warnings==0.1.0
 flask-debugtoolbar-warnings==0.1.0
-Flask-Limiter==1.0.1
+Flask-Limiter==1.1.0
 Flask-Login==0.4.1
 Flask-Login==0.4.1
 Flask-Mail==0.9.1
 Flask-Mail==0.9.1
-Flask-Redis==0.3.0
-Flask-SQLAlchemy==2.4.0
+Flask-Redis==0.4.0
+Flask-SQLAlchemy==2.4.1
 Flask-Themes2==0.1.4
 Flask-Themes2==0.1.4
 flask-whooshee==0.7.0
 flask-whooshee==0.7.0
 Flask-WTF==0.14.2
 Flask-WTF==0.14.2
@@ -29,30 +29,30 @@ flaskbb-plugin-conversations==1.0.6
 flaskbb-plugin-portal==1.1.3
 flaskbb-plugin-portal==1.1.3
 idna==2.8
 idna==2.8
 itsdangerous==1.1.0
 itsdangerous==1.1.0
-Jinja2==2.10.1
-kombu==4.5.0
+Jinja2==2.10.3
+kombu==4.6.5
 limits==1.3
 limits==1.3
-Mako==1.0.10
+Mako==1.1.0
 MarkupSafe==1.1.1
 MarkupSafe==1.1.1
 mistune==0.8.4
 mistune==0.8.4
 olefile==0.46
 olefile==0.46
-Pillow==6.0.0
-pluggy==0.11.0
-Pygments==2.4.0
+Pillow==6.2.0
+pluggy==0.13.0
+Pygments==2.4.2
 python-dateutil==2.8.0
 python-dateutil==2.8.0
 python-editor==1.0.4
 python-editor==1.0.4
-pytz==2019.1
-redis==3.2.1
+pytz==2019.3
+redis==3.3.10
 requests==2.22.0
 requests==2.22.0
 simplejson==3.16.0
 simplejson==3.16.0
 six==1.12.0
 six==1.12.0
 speaklater==1.3
 speaklater==1.3
-SQLAlchemy==1.3.3
-SQLAlchemy-Utils==0.33.11
-Unidecode==1.0.23
-urllib3==1.25.2
+SQLAlchemy==1.3.10
+SQLAlchemy-Utils==0.34.2
+Unidecode==1.1.1
+urllib3==1.25.6
 vine==1.3.0
 vine==1.3.0
-Werkzeug==0.15.4
+Werkzeug==0.16.0
 Whoosh==2.7.4
 Whoosh==2.7.4
 WTForms==2.2.1
 WTForms==2.2.1
 -e .
 -e .

+ 18 - 18
tests/unit/test_requirements.py

@@ -16,65 +16,65 @@ def request_context(application):
 
 
 
 
 def test_Fred_IsNotAdmin(Fred):
 def test_Fred_IsNotAdmin(Fred):
-    assert not r.IsAdmin(Fred, None)
+    assert not r.IsAdmin(Fred)
 
 
 
 
 def test_IsAdmin_with_admin(admin_user):
 def test_IsAdmin_with_admin(admin_user):
-    assert r.IsAdmin(admin_user, None)
+    assert r.IsAdmin(admin_user)
 
 
 
 
 def test_IsAtleastModerator_with_mod(moderator_user):
 def test_IsAtleastModerator_with_mod(moderator_user):
-    assert r.IsAtleastModerator(moderator_user, None)
+    assert r.IsAtleastModerator(moderator_user)
 
 
 
 
 def test_IsAtleastModerator_with_supermod(super_moderator_user):
 def test_IsAtleastModerator_with_supermod(super_moderator_user):
-    assert r.IsAtleastModerator(super_moderator_user, None)
+    assert r.IsAtleastModerator(super_moderator_user)
 
 
 
 
 def test_IsAtleastModerator_with_admin(admin_user):
 def test_IsAtleastModerator_with_admin(admin_user):
-    assert r.IsAtleastModerator(admin_user, None)
+    assert r.IsAtleastModerator(admin_user)
 
 
 
 
 def test_IsAtleastSuperModerator_with_not_smod(moderator_user):
 def test_IsAtleastSuperModerator_with_not_smod(moderator_user):
-    assert not r.IsAtleastSuperModerator(moderator_user, None)
+    assert not r.IsAtleastSuperModerator(moderator_user)
 
 
 
 
 def test_CanBanUser_with_admin(admin_user):
 def test_CanBanUser_with_admin(admin_user):
-    assert r.CanBanUser(admin_user, None)
+    assert r.CanBanUser(admin_user)
 
 
 
 
 def test_CanBanUser_with_smod(super_moderator_user):
 def test_CanBanUser_with_smod(super_moderator_user):
-    assert r.CanBanUser(super_moderator_user, None)
+    assert r.CanBanUser(super_moderator_user)
 
 
 
 
 def test_CanBanUser_with_mod(moderator_user):
 def test_CanBanUser_with_mod(moderator_user):
-    assert r.CanBanUser(moderator_user, None)
+    assert r.CanBanUser(moderator_user)
 
 
 
 
 def test_Fred_CannotBanUser(Fred):
 def test_Fred_CannotBanUser(Fred):
-    assert not r.CanBanUser(Fred, None)
+    assert not r.CanBanUser(Fred)
 
 
 
 
 def test_CanEditTopic_with_member(user, topic, request_context):
 def test_CanEditTopic_with_member(user, topic, request_context):
     push_onto_request_context(topic=topic)
     push_onto_request_context(topic=topic)
-    assert r.CanEditPost(user, request)
+    assert r.CanEditPost(user)
 
 
 
 
 def test_Fred_cannot_edit_other_members_post(user, Fred, topic,
 def test_Fred_cannot_edit_other_members_post(user, Fred, topic,
                                              request_context):
                                              request_context):
     push_onto_request_context(topic=topic)
     push_onto_request_context(topic=topic)
-    assert not r.CanEditPost(Fred, request)
+    assert not r.CanEditPost(Fred)
 
 
 
 
 def test_Fred_CannotEditLockedTopic(Fred, topic_locked, request_context):
 def test_Fred_CannotEditLockedTopic(Fred, topic_locked, request_context):
     push_onto_request_context(topic=topic_locked)
     push_onto_request_context(topic=topic_locked)
-    assert not r.CanEditPost(Fred, request)
+    assert not r.CanEditPost(Fred)
 
 
 
 
 def test_Moderator_in_Forum_CanEditLockedTopic(moderator_user, topic_locked,
 def test_Moderator_in_Forum_CanEditLockedTopic(moderator_user, topic_locked,
                                                request_context):
                                                request_context):
     push_onto_request_context(topic=topic_locked)
     push_onto_request_context(topic=topic_locked)
-    assert r.CanEditPost(moderator_user, request)
+    assert r.CanEditPost(moderator_user)
 
 
 
 
 def test_FredIsAMod_but_still_cant_edit_topic_in_locked_forum(
 def test_FredIsAMod_but_still_cant_edit_topic_in_locked_forum(
@@ -83,20 +83,20 @@ def test_FredIsAMod_but_still_cant_edit_topic_in_locked_forum(
     Fred.primary_group = default_groups[2]
     Fred.primary_group = default_groups[2]
 
 
     push_onto_request_context(topic=topic_locked)
     push_onto_request_context(topic=topic_locked)
-    assert not r.CanEditPost(Fred, request)
+    assert not r.CanEditPost(Fred)
 
 
 
 
 def test_Fred_cannot_reply_to_locked_topic(Fred, topic_locked,
 def test_Fred_cannot_reply_to_locked_topic(Fred, topic_locked,
                                            request_context):
                                            request_context):
     push_onto_request_context(topic=topic_locked)
     push_onto_request_context(topic=topic_locked)
-    assert not r.CanPostReply(Fred, request)
+    assert not r.CanPostReply(Fred)
 
 
 
 
 def test_Fred_cannot_delete_others_post(Fred, topic, request_context):
 def test_Fred_cannot_delete_others_post(Fred, topic, request_context):
     push_onto_request_context(post=topic.first_post)
     push_onto_request_context(post=topic.first_post)
-    assert not r.CanDeletePost(Fred, request)
+    assert not r.CanDeletePost(Fred)
 
 
 
 
 def test_Mod_can_delete_others_post(moderator_user, topic, request_context):
 def test_Mod_can_delete_others_post(moderator_user, topic, request_context):
     push_onto_request_context(post=topic.first_post)
     push_onto_request_context(post=topic.first_post)
-    assert r.CanDeletePost(moderator_user, request)
+    assert r.CanDeletePost(moderator_user)