sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

changing invite and request in teams

Browse Source
This commit is contained in:
Sander Roosendaal
2019-01-18 17:48:36 +01:00
parent 0fdd51fa9f
commit c9b417913f
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rowers/tests/test_teams.py
View File

@@ -61,6 +61,18 @@ class TeamCreateTest(TestCase):
self.t = TeamFactory(manager=self.u)
# need to set up some requests for testing (they are not good below)
self.invite = TeamInvite(
team = self.t,
user = self.users[1],
code = 'abcde',
email = self.users[1].email
)
self.request = TeamRequest(
team = self.t,
user = self.users[2],
code ='abcde'
)
def tearDown(self):
for csvfilename in self.csvfilenames:
@@ -106,8 +118,6 @@ class TeamCreateTest(TestCase):
self.assertEqual(response.status_code, 200)
def test_teamsview(self):
id, result = create_request(self.t,self.users[2].id)
id, comment = create_invite(self.t,self.u,user=self.users[1])
url = '/rowers/me/teams/'
@@ -149,8 +159,6 @@ class TeamCreateTest(TestCase):
self.assertIn(response.status_code,[200,302])
def test_teamsview_manager(self):
id, result = create_request(self.t,self.users[2].id)
id, comment = create_invite(self.t,self.u,user=self.users[1])
url = '/rowers/me/teams/'
@@ -174,12 +182,12 @@ class TeamCreateTest(TestCase):
def test_teamview_member_request(self):
login = self.c.login(username=self.users[1].username, password = self.user_passwords[1])
login = self.c.login(username=self.users[3].username, password = self.user_passwords[3])
self.assertTrue(login)
url = '/rowers/team/{t}/requestmembership/{u}/'.format(
t=self.t.id,
u=self.users[1].id)
u=self.users[3].id)
response = self.c.get(url,follow=True)
self.assertEqual(response.status_code, 200)
@@ -188,13 +196,10 @@ class TeamCreateTest(TestCase):
expected_url='/rowers/team/{t}/'.format(t=self.t.id),
status_code=302,target_status_code=200)
id, result = create_request(self.t,self.users[2].id)
self.assertTrue(id != 0)
login = self.c.login(username=self.users[2].username, password = self.user_passwords[2])
login = self.c.login(username=self.users[1].username, password = self.user_passwords[1])
self.assertTrue(login)
url = '/rowers/me/invitation/{id}/revoke/'.format(id=id)
url = '/rowers/me/invitation/{id}/revoke/'.format(id=self.invite.id)
self.assertRedirects(response,
expected_url='/rowers/team/{t}/'.format(t=self.t.id),
status_code=302,target_status_code=200)

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.

2
rowers/tests/testdata/testdata.tcx vendored
View File

@@ -2502,7 +2502,7 @@
</Trackpoint>
</Track>
</Lap>
<Notes>&lt;Element 'Notes' at 0x19d5f2b0&gt;</Notes>
<Notes>&lt;Element 'Notes' at 0x1477a860&gt;</Notes>
</Activity>
</Activities>
<Creator>