Made changes as per django 1.10

Made changes as per django 1.10

Author: Vijay

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')

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')

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

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,27 +100,27 @@ 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)
     user.save()
     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
 
     # 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")

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

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 = (