From 644daf7dece206a771d13cca4ce7c649b276977d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:12 +0530 Subject: [PATCH 01/29] Update pytest-splinter from 1.7.* to 1.8.1 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index df54c33..cbd6b14 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -11,7 +11,7 @@ ipython==4.0.0 # ------------------------------------------------- pytest-django==2.9.* pytest-cov==2.2.* -pytest-splinter==1.7.* +pytest-splinter==1.8.1 factory_boy==2.5.* pdbpp==0.8.* fancycompleter==0.4 From c2990c4f9285cfb76affc7b6757874cecc26e3e0 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:14 +0530 Subject: [PATCH 02/29] Update dj-database-url from 0.3.* to 0.4.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7fa77a0..b19d1e1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,6 @@ # For server. # ------------------------------- uwsgi==2.0.* -dj-database-url==0.3.* +dj-database-url==0.4.1 # this file in this path is required for python buildpack. From ae06c0ce9cd8fc667d659bb79cd2397b1014326d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:15 +0530 Subject: [PATCH 03/29] Update ipython from 4.0.0 to 5.1.0 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index cbd6b14..7d0c6bd 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,7 +4,7 @@ # Debugging # ------------------------------------------------- django-extensions==1.5.2 -ipython==4.0.0 +ipython==5.1.0 # Testing From aeb539ad2fe3db8952cdd7f38edc226b55c53157 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:17 +0530 Subject: [PATCH 04/29] Update fake-factory from 0.5.7 to 9999.9.9 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 4220fec..f6a17dc 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -22,7 +22,7 @@ Markdown==2.6.5 # Sample Data # ----------------------------------------- -fake-factory==0.5.7 +fake-factory==9999.9.9 # Twitter Connect # --------------------------------------- From 6e584476c573b7b58daf1c31a45f456efaa25349 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:18 +0530 Subject: [PATCH 05/29] Update python-dateutil from 2.5.0 to 2.6.0 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index f6a17dc..689d1fc 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -38,7 +38,7 @@ Pillow==3.1.1 # Dateutils #----------------------------------------- -python-dateutil==2.5.0 +python-dateutil==2.6.0 # Captcha #----------------------------------------- From 72d27dc217aa3cfbaf95ea250df3065c7e2df3f0 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:20 +0530 Subject: [PATCH 06/29] Update markdown from 2.6.5 to 2.6.7 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 689d1fc..a73b4f8 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -18,7 +18,7 @@ django-allauth==0.25.2 # MarkDown Support # --------------------------------------- -Markdown==2.6.5 +Markdown==2.6.7 # Sample Data # ----------------------------------------- From 230078fe82f91f0b2e52baabf985ce8f9d8440e5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:21 +0530 Subject: [PATCH 07/29] Update pdbpp from 0.8.* to 0.8.3 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 7d0c6bd..6c425f9 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -13,7 +13,7 @@ pytest-django==2.9.* pytest-cov==2.2.* pytest-splinter==1.8.1 factory_boy==2.5.* -pdbpp==0.8.* +pdbpp==0.8.3 fancycompleter==0.4 coverage==4.* From c3b4abf18b47e3154650e5d1db5ce904959b359e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:23 +0530 Subject: [PATCH 08/29] Update coverage from 4.* to 4.3.1 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 6c425f9..27d1c74 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -16,5 +16,5 @@ factory_boy==2.5.* pdbpp==0.8.3 fancycompleter==0.4 -coverage==4.* +coverage==4.3.1 flake8==2.4.* From 222830e2b3b1d181067caca763cd2e4069cc37be Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:24 +0530 Subject: [PATCH 09/29] Update uwsgi from 2.0.* to 2.0.14 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b19d1e1..e17f0f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ # For server. # ------------------------------- -uwsgi==2.0.* +uwsgi==2.0.14 dj-database-url==0.4.1 # this file in this path is required for python buildpack. From 05af7151b424a7a9817b576494fda4c6b820b8cf Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:26 +0530 Subject: [PATCH 10/29] Update flake8 from 2.4.* to 3.2.1 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 27d1c74..231e048 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -17,4 +17,4 @@ pdbpp==0.8.3 fancycompleter==0.4 coverage==4.3.1 -flake8==2.4.* +flake8==3.2.1 From d4cab64d9c6ddfacac1cda7e3ff2d3d8424a17e1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:27 +0530 Subject: [PATCH 11/29] Update pytest-django from 2.9.* to 3.1.2 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 231e048..35f1f0d 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -9,7 +9,7 @@ ipython==5.1.0 # Testing # ------------------------------------------------- -pytest-django==2.9.* +pytest-django==3.1.2 pytest-cov==2.2.* pytest-splinter==1.8.1 factory_boy==2.5.* From e44c076b7db77a709e64012096f43e5b70741ec0 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:29 +0530 Subject: [PATCH 12/29] Update djangorestframework from 3.2.4 to 3.5.3 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index a73b4f8..ea9e34b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -12,7 +12,7 @@ psycopg2==2.6.1 # Rest FrameWork #--------------------------------------- -djangorestframework==3.2.4 +djangorestframework==3.5.3 django-filter==0.13.0 django-allauth==0.25.2 From 83f41756f4ae6f779101d93a0149ddd6d97b7bf4 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:30 +0530 Subject: [PATCH 13/29] Update django from 1.8.11 to 1.10.4 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index ea9e34b..62c0796 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # python==3.5.0 -Django==1.8.11 +Django==1.10.4 django-braces==1.8.1 # Utilities From f9a1a0990b368023768c163ed663f070c37b6ca5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:32 +0530 Subject: [PATCH 14/29] Update fancycompleter from 0.4 to 0.7 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 35f1f0d..dd68e80 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -14,7 +14,7 @@ pytest-cov==2.2.* pytest-splinter==1.8.1 factory_boy==2.5.* pdbpp==0.8.3 -fancycompleter==0.4 +fancycompleter==0.7 coverage==4.3.1 flake8==3.2.1 From 7520165d274430c68bc5ac8d9c74d63bec1a9a12 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:33 +0530 Subject: [PATCH 15/29] Update twython from 3.3.0 to 3.4.0 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 62c0796..a11efa7 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -26,7 +26,7 @@ fake-factory==9999.9.9 # Twitter Connect # --------------------------------------- -twython==3.3.0 +twython==3.4.0 #AutoComplete #------------------------------------------ From d30776fc1ae1cfdcc71f455f77b5e06f278008c1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:35 +0530 Subject: [PATCH 16/29] Update django-braces from 1.8.1 to 1.10.0 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index a11efa7..0aed631 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,6 +1,6 @@ # python==3.5.0 Django==1.10.4 -django-braces==1.8.1 +django-braces==1.10.0 # Utilities # -------------------------------------- From bf46611d2e9809ac3a461c14fbc7213003d3840e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:36 +0530 Subject: [PATCH 17/29] Update django-extensions from 1.5.2 to 1.7.5 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index dd68e80..27b0e79 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -3,7 +3,7 @@ # Debugging # ------------------------------------------------- -django-extensions==1.5.2 +django-extensions==1.7.5 ipython==5.1.0 From da00f2d07c8c9ccc1a656febc6c269cbb03b4064 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:38 +0530 Subject: [PATCH 18/29] Update celery from 3.1.23 to 4.0.2 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 0aed631..d843e28 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -46,6 +46,6 @@ django-simple-math-captcha==1.0.7 # Celery # -------------------------------------------------- -celery==3.1.23 +celery==4.0.2 django-celery==3.1.17 redis==2.10.5 From 7419c22123e821d08b9b2346eee5a2523073693b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:39 +0530 Subject: [PATCH 19/29] Update django-filter from 0.13.0 to 1.0.1 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index d843e28..9c5385d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -13,7 +13,7 @@ psycopg2==2.6.1 # Rest FrameWork #--------------------------------------- djangorestframework==3.5.3 -django-filter==0.13.0 +django-filter==1.0.1 django-allauth==0.25.2 # MarkDown Support From 26d40aa80edbff1d8ae886dcc262be535a2fa2fd Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:41 +0530 Subject: [PATCH 20/29] Update django-autocomplete-light from 3.1.3 to 3.2.1 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 9c5385d..3176293 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -30,7 +30,7 @@ twython==3.4.0 #AutoComplete #------------------------------------------ -django-autocomplete-light==3.1.3 +django-autocomplete-light==3.2.1 # Image # ---------------------------------------- From 65bd64725439823eec58dab102c477e74a41f5e1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:42 +0530 Subject: [PATCH 21/29] Update pillow from 3.1.1 to 3.4.2 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 3176293..66c6729 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -34,7 +34,7 @@ django-autocomplete-light==3.2.1 # Image # ---------------------------------------- -Pillow==3.1.1 +Pillow==3.4.2 # Dateutils #----------------------------------------- From 0bd81da6951c4708392b1be617f6869482c7a25a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:44 +0530 Subject: [PATCH 22/29] Update factory-boy from 2.5.* to 2.8.1 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 27b0e79..2827a35 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -12,7 +12,7 @@ ipython==5.1.0 pytest-django==3.1.2 pytest-cov==2.2.* pytest-splinter==1.8.1 -factory_boy==2.5.* +factory-boy==2.8.1 pdbpp==0.8.3 fancycompleter==0.7 From 8aede4ccf49b653fe6b732a1ddccbd86315d8539 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:45 +0530 Subject: [PATCH 23/29] Update pytest-cov from 2.2.* to 2.4.0 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 2827a35..b8f5dd9 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -10,7 +10,7 @@ ipython==5.1.0 # Testing # ------------------------------------------------- pytest-django==3.1.2 -pytest-cov==2.2.* +pytest-cov==2.4.0 pytest-splinter==1.8.1 factory-boy==2.8.1 pdbpp==0.8.3 From 46dc57805df871a8d693e0c50d18840efa5913c6 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:47 +0530 Subject: [PATCH 24/29] Update django-allauth from 0.25.2 to 0.29.0 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 66c6729..be2f6dc 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -14,7 +14,7 @@ psycopg2==2.6.1 #--------------------------------------- djangorestframework==3.5.3 django-filter==1.0.1 -django-allauth==0.25.2 +django-allauth==0.29.0 # MarkDown Support # --------------------------------------- From 70c6ce7e55d1ac90c0ba0b714424aabb69a12640 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Dec 2016 19:15:48 +0530 Subject: [PATCH 25/29] Update psycopg2 from 2.6.1 to 2.6.2 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index be2f6dc..12182b8 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,7 +8,7 @@ unicode-slugify==0.1.3 # Persistent Store # -------------------------------------- -psycopg2==2.6.1 +psycopg2==2.6.2 # Rest FrameWork #--------------------------------------- From 4a562c9ab415cd0b0c2ad33a1ed0b23e38a18b4d Mon Sep 17 00:00:00 2001 From: Vijay Date: Fri, 30 Dec 2016 21:20:28 +0530 Subject: [PATCH 26/29] Fixed the requirement issue for celery Fixed the requirement issue for celery --- requirements/base.txt | 2 +- settings/common.py | 2 +- wye/organisations/views.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 12182b8..24daf7a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -46,6 +46,6 @@ django-simple-math-captcha==1.0.7 # Celery # -------------------------------------------------- -celery==4.0.2 +celery>=3.1.15,<4.0 django-celery==3.1.17 redis==2.10.5 diff --git a/settings/common.py b/settings/common.py index 6bffac7..6468861 100644 --- a/settings/common.py +++ b/settings/common.py @@ -137,7 +137,7 @@ 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', 'django.template.context_processors.media', - 'django.core.context_processors.request', + # 'django.core.context_processors.request', 'wye.base.context_processors.site_info', ], }, diff --git a/wye/organisations/views.py b/wye/organisations/views.py index c8c57ab..007d315 100644 --- a/wye/organisations/views.py +++ b/wye/organisations/views.py @@ -1,7 +1,7 @@ import uuid from django.conf import settings -from django.conf.urls import patterns, url +from django.conf.urls import url from django.contrib.auth.tokens import PasswordResetTokenGenerator from django.core.urlresolvers import reverse_lazy from django.http import Http404 From f3e9afea9140e59425842c725f13c95a9f8a04cd Mon Sep 17 00:00:00 2001 From: Vijay Date: Fri, 30 Dec 2016 22:18:56 +0530 Subject: [PATCH 27/29] Made changes as per django 1.10 Made changes as per django 1.10 --- tests/functional/test_edit_profile.py | 4 ++-- tests/functional/test_workshops_flow.py | 8 ++++---- .../workshop/test_create_workshop.py | 4 ++-- .../functional/workshop/test_workshop_list.py | 18 +++++++++--------- wye/organisations/views.py | 2 +- wye/workshops/forms.py | 17 ++++++++++++----- 6 files changed, 30 insertions(+), 23 deletions(-) diff --git a/tests/functional/test_edit_profile.py b/tests/functional/test_edit_profile.py index 8f78f6b..7e8d29b 100644 --- a/tests/functional/test_edit_profile.py +++ b/tests/functional/test_edit_profile.py @@ -12,7 +12,7 @@ def test_signup_college_poc_flow(base_url, browser, outbox): user = f.create_user() user.set_password('123123') user.save() - url = base_url + '/workshop/' + url = base_url + '/accounts/login/' browser.visit(url) browser.fill('login', user.email) browser.fill('password', '123123') @@ -94,7 +94,7 @@ def test_signup_tutor_flow(base_url, browser, outbox): user = f.create_user() user.set_password('123123') user.save() - url = base_url + '/workshop/' + url = base_url + '/accounts/login/' browser.visit(url) browser.fill('login', user.email) browser.fill('password', '123123') diff --git a/tests/functional/test_workshops_flow.py b/tests/functional/test_workshops_flow.py index 3daedd3..1f2516c 100644 --- a/tests/functional/test_workshops_flow.py +++ b/tests/functional/test_workshops_flow.py @@ -13,7 +13,7 @@ def test_workshop_wrong_action(base_url, browser, outbox): user = f.create_user() user.set_password('123123') user.save() - url = base_url + '/workshop/' + url = base_url + '/accounts/login/' browser.visit(url) browser.fill('login', user.email) browser.fill('password', '123123') @@ -42,7 +42,7 @@ def test_workshop_wrong_action(base_url, browser, outbox): workshop.status = WorkshopStatus.REQUESTED workshop.location = org.location workshop.save() - url = base_url + '/workshop/update/{}/'.format(workshop.id) + url = base_url + '/accounts/login/' browser.visit(url) browser.fill('login', user.email) browser.fill('password', '123123') @@ -84,7 +84,7 @@ def test_workshop_flow(base_url, browser, outbox): user = f.create_user() user.set_password('123123') user.save() - url = base_url + '/workshop/' + url = base_url + '/accounts/login/' browser.visit(url) browser.fill('login', user.email) browser.fill('password', '123123') @@ -116,7 +116,7 @@ def test_workshop_flow(base_url, browser, outbox): workshop.expected_date = datetime.now() + timedelta(days=20) workshop.presenter.add(user) workshop.save() - url = base_url + '/workshop/update/{}/'.format(workshop.id) + url = base_url + '/accounts/login/' browser.visit(url) browser.fill('login', user.email) browser.fill('password', '123123') diff --git a/tests/functional/workshop/test_create_workshop.py b/tests/functional/workshop/test_create_workshop.py index e3efd74..3848490 100644 --- a/tests/functional/workshop/test_create_workshop.py +++ b/tests/functional/workshop/test_create_workshop.py @@ -12,7 +12,7 @@ def test_workshop_create(base_url, browser, outbox): poc_type = f.create_usertype(slug='poc', display_name='poc') state = f.create_state() user = base.create_user(password) - url = base_url + '/workshop/' + url = base_url + '/accounts/login/' base.login_and_confirm(browser, url, outbox, user, password) user.save() location = f.create_locaiton(name='location1') @@ -23,7 +23,7 @@ def test_workshop_create(base_url, browser, outbox): user.profile.save() - url = base_url + '/workshop/' + url = base_url + '/accounts/login/' base.login(browser, url, user, password) # validate if user belongs to organisation diff --git a/tests/functional/workshop/test_workshop_list.py b/tests/functional/workshop/test_workshop_list.py index ea50a7b..a04359c 100644 --- a/tests/functional/workshop/test_workshop_list.py +++ b/tests/functional/workshop/test_workshop_list.py @@ -27,7 +27,7 @@ def test_workshop_list(base_url, browser, outbox): state = f.create_state() # Testcase with usertyep poc user = base.create_user(password) - url = base_url + '/workshop/' + url = base_url + '/accounts/login/' base.login_and_confirm(browser, url, outbox, user, password) user.profile.usertype.clear() user.profile.usertype.add(poc_type) @@ -52,11 +52,11 @@ def test_workshop_list(base_url, browser, outbox): workshop.location = org.location workshop.save() - url = base_url + '/workshop/' + url = base_url + '/accounts/login/' base.login(browser, url, user, password) data_check = browser.find_by_text(org.name) assert data_check - + url = base_url + '/workshop/' browser.visit(url + "?location={}".format(org.location.id)) data_check = browser.find_by_text(org.name) assert data_check @@ -80,7 +80,7 @@ def test_workshop_list(base_url, browser, outbox): # Testcase for usertype tutor browser.visit(base_url + "/accounts/logout") user = base.create_user(password) - url = base_url + '/workshop/' + url = base_url + '/accounts/login/' base.login_and_confirm(browser, url, outbox, user, password) # user.profile.usertype.add(tutor_type) # user.save() @@ -100,7 +100,7 @@ def test_workshop_list(base_url, browser, outbox): # Testcase for lead browser.visit(base_url + "/accounts/logout") user = base.create_user(password) - url = base_url + '/workshop/' + url = base_url + '/accounts/login/' base.login_and_confirm(browser, url, outbox, user, password) user.profile.usertype.add(regional_lead_type) @@ -108,7 +108,7 @@ def test_workshop_list(base_url, browser, outbox): lead = RegionalLead.objects.create(location=org.location) lead.leads.add(user) - url = base_url + '/workshop/' + url = base_url + '/accounts/login/' base.login(browser, url, user, password) # data_check = browser.find_by_text(org.name) # assert data_check @@ -116,11 +116,11 @@ def test_workshop_list(base_url, browser, outbox): # Testcase for user with no usertype browser.visit(base_url + "/accounts/logout") user = base.create_user(password) - url = base_url + '/workshop/' + url = base_url + '/accounts/login/' base.login_and_confirm(browser, url, outbox, user, password) - url = base_url + '/workshop/' + url = base_url + '/accounts/login/' base.login(browser, url, user, password) # data_check = browser.find_by_text(org.name) - # assert [] == data_check + url = base_url + '/accounts/login/' browser.visit(base_url + "/accounts/logout") diff --git a/wye/organisations/views.py b/wye/organisations/views.py index 007d315..00f6ed0 100644 --- a/wye/organisations/views.py +++ b/wye/organisations/views.py @@ -1,7 +1,7 @@ import uuid from django.conf import settings -from django.conf.urls import url +from django.conf.urls import url from django.contrib.auth.tokens import PasswordResetTokenGenerator from django.core.urlresolvers import reverse_lazy from django.http import Http404 diff --git a/wye/workshops/forms.py b/wye/workshops/forms.py index 24a5975..b6b547e 100644 --- a/wye/workshops/forms.py +++ b/wye/workshops/forms.py @@ -35,12 +35,12 @@ def __init__(self, *args, **kwargs): self.fields['location'].required = False self.fields['location'].widget = forms.HiddenInput() - def clean_location(self): - if "requester" not in self.cleaned_data: - return "" + # def clean_location(self): + # if "requester" not in self.cleaned_data: + # return "" - organisation = self.cleaned_data['requester'] - return organisation.location + # organisation = self.cleaned_data['requester'] + # return organisation.location def get_organisations(self, user): if Profile.is_admin(user): @@ -59,6 +59,13 @@ def clean_expected_date(self): else: return date + def clean_location(self): + # data = self.cleaned_data['requester'] + if ('requester' not in self.data) or (not self.data['requester']): + return None + o = Organisation.objects.get(id=self.data['requester']) + return o.location + class Meta: model = Workshop exclude = ( From 3bed5c9fcef2b8c6db90762d6b8dfbfabd24a0f5 Mon Sep 17 00:00:00 2001 From: Vijay Date: Fri, 30 Dec 2016 22:55:28 +0530 Subject: [PATCH 28/29] flake8 changes --- tests/utils.py | 1 + wye/workshops/admin.py | 5 ++--- .../templatetags/workshop_action_button.py | 17 +++++++---------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tests/utils.py b/tests/utils.py index 629ca4f..e93ce61 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -18,4 +18,5 @@ def reconnect(): return disconnect, reconnect + disconnect_signals, reconnect_signals = signals_switch() diff --git a/wye/workshops/admin.py b/wye/workshops/admin.py index cfd268a..3a53b00 100644 --- a/wye/workshops/admin.py +++ b/wye/workshops/admin.py @@ -15,8 +15,6 @@ class WorkshopAdmin(admin.ModelAdmin): 'status') list_filter = ('is_active', 'status', 'workshop_level', 'location') -admin.site.register(models.Workshop, WorkshopAdmin) - class WorkshopFeedBackAdmin(admin.ModelAdmin): list_per_page = 50 @@ -30,8 +28,9 @@ class WorkshopFeedBackAdmin(admin.ModelAdmin): 'status') list_filter = ('feedback_type',) -admin.site.register(models.WorkshopFeedBack, WorkshopFeedBackAdmin) +admin.site.register(models.Workshop, WorkshopAdmin) +admin.site.register(models.WorkshopFeedBack, WorkshopFeedBackAdmin) admin.site.register(models.WorkshopSections) admin.site.register(models.WorkshopRatingValues) admin.site.register(models.WorkshopVoting) diff --git a/wye/workshops/templatetags/workshop_action_button.py b/wye/workshops/templatetags/workshop_action_button.py index 03f8f5d..d222172 100644 --- a/wye/workshops/templatetags/workshop_action_button.py +++ b/wye/workshops/templatetags/workshop_action_button.py @@ -14,8 +14,6 @@ def show_draft_button(workshop, user): return True return False -register.filter(show_draft_button) - def show_requested_button(workshop, user): if (workshop.status == WorkshopStatus.HOLD and @@ -24,16 +22,12 @@ def show_requested_button(workshop, user): return True return False -register.filter(show_requested_button) - def show_accepted_button(workshop, user): if (workshop.status == WorkshopStatus.REQUESTED): return True return False -register.filter(show_accepted_button) - def show_feedback_button(workshop, user): if (workshop.status == WorkshopStatus.COMPLETED or @@ -49,8 +43,6 @@ def show_feedback_button(workshop, user): return False return False -register.filter(show_feedback_button) - def show_reject_button(workshop, user): if (workshop.status == WorkshopStatus.ACCEPTED and @@ -59,8 +51,6 @@ def show_reject_button(workshop, user): return True return False -register.filter(show_reject_button) - def show_decline_button(workshop, user): neglected_workshops = [WorkshopStatus.COMPLETED, @@ -70,4 +60,11 @@ def show_decline_button(workshop, user): user in workshop.requester.user.all()): return True return False + + +register.filter(show_draft_button) +register.filter(show_requested_button) +register.filter(show_accepted_button) +register.filter(show_feedback_button) +register.filter(show_reject_button) register.filter(show_decline_button) From f1290a40f2f92544c17f5b75e9a66a29fcb3b947 Mon Sep 17 00:00:00 2001 From: Vijay Date: Sun, 15 Jan 2017 21:40:52 +0530 Subject: [PATCH 29/29] Change URL as per django 1.10 Change URL as per django 1.10 --- .../workshop/test_workshop_celery_tasks.py | 74 +------------------ 1 file changed, 1 insertion(+), 73 deletions(-) diff --git a/tests/functional/workshop/test_workshop_celery_tasks.py b/tests/functional/workshop/test_workshop_celery_tasks.py index 20a1f66..f5140ca 100644 --- a/tests/functional/workshop/test_workshop_celery_tasks.py +++ b/tests/functional/workshop/test_workshop_celery_tasks.py @@ -21,7 +21,7 @@ def test_workshop_celery_task(base_url, browser, outbox): state = f.create_state() # Testcase with usertyep poc user = base.create_user(password) - url = base_url + '/workshop/' + url = base_url + '/login/' base.login_and_confirm(browser, url, outbox, user, password) user.profile.usertype.clear() user.profile.usertype.add(poc_type) @@ -57,75 +57,3 @@ def test_workshop_celery_task(base_url, browser, outbox): workshop.save() rst = workshop_feedback.apply(args=(1,)).get() assert rst - # url = base_url + '/workshop/' - # base.login(browser, url, user, password) - # data_check = browser.find_by_text(org.name) - # assert data_check - - # browser.visit(url + "?location={}".format(org.location.id)) - # data_check = browser.find_by_text(org.name) - # assert data_check - - # browser.visit(url + "?location={}".format(org.location.id + 1)) - # data_check = browser.find_by_text(org.name) - # assert not data_check - - # browser.visit(url + "?presenter={}".format(user.id)) - # data_check = browser.find_by_text(org.name) - # assert not data_check - - # browser.visit(url + "?status={}".format(WorkshopStatus.REQUESTED)) - # data_check = browser.find_by_text(org.name) - # assert data_check - - # browser.visit(url + "?level={}".format(WorkshopStatus.ACCEPTED)) - # data_check = browser.find_by_text(org.name) - # assert not data_check - - # # Testcase for usertype tutor - # browser.visit(base_url + "/accounts/logout") - # user = base.create_user(password) - # url = base_url + '/workshop/' - # base.login_and_confirm(browser, url, outbox, user, password) - # # user.profile.usertype.add(tutor_type) - # # user.save() - - # # url = base_url + '/workshop/' - # # base.login(browser, url, user, password) - # # # User not associate with workshop - # # data_check = browser.find_by_text(org.name) - # # assert [] == data_check - - # # User associated with workshop - # workshop.presenter.add(user) - # browser.visit(url) - # # data_check = browser.find_by_text(org.name) - # # assert data_check - - # # Testcase for lead - # browser.visit(base_url + "/accounts/logout") - # user = base.create_user(password) - # url = base_url + '/workshop/' - # base.login_and_confirm(browser, url, outbox, user, password) - - # user.profile.usertype.add(regional_lead_type) - # user.save() - # lead = RegionalLead.objects.create(location=org.location) - # lead.leads.add(user) - - # url = base_url + '/workshop/' - # base.login(browser, url, user, password) - # # data_check = browser.find_by_text(org.name) - # # assert data_check - - # # Testcase for user with no usertype - # browser.visit(base_url + "/accounts/logout") - # user = base.create_user(password) - # url = base_url + '/workshop/' - # base.login_and_confirm(browser, url, outbox, user, password) - - # url = base_url + '/workshop/' - # base.login(browser, url, user, password) - # # data_check = browser.find_by_text(org.name) - # # assert [] == data_check - # browser.visit(base_url + "/accounts/logout")