Skip to content

Commit 8017c8e

Browse files
committed
Fix a bunch of test errors, apparently the Textarea widget in Django
now outputs a newline in the beginning - this doesn't seem make a difference for browsers, but it means testing with PyQuery needs to strip the text to be able to check accurately - Legacy-Id: 6931
1 parent 2eb8566 commit 8017c8e

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

ietf/doc/tests_conflict_review.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ def test_initial_submission(self):
261261
r = self.client.get(url)
262262
self.assertEquals(r.status_code,200)
263263
q = PyQuery(r.content)
264-
self.assertTrue(q('textarea')[0].text.startswith("[Edit this page"))
264+
self.assertTrue(q('textarea[name="content"]')[0].text.strip().startswith("[Edit this page"))
265265

266266
# Faulty posts using textbox
267267
# Right now, nothing to test - we let people put whatever the web browser will let them put into that textbox
@@ -296,7 +296,7 @@ def test_subsequent_submission(self):
296296
r = self.client.get(url)
297297
self.assertEquals(r.status_code,200)
298298
q = PyQuery(r.content)
299-
self.assertTrue(q('textarea')[0].text.startswith("This is the old proposal."))
299+
self.assertTrue(q('textarea')[0].text.strip().startswith("This is the old proposal."))
300300

301301
# faulty posts trying to use file upload
302302
# Copied from wgtracker tests - is this really testing the server code, or is it testing
@@ -324,7 +324,7 @@ def test_subsequent_submission(self):
324324
r = self.client.post(url,dict(reset_text="1"))
325325
self.assertEquals(r.status_code, 200)
326326
q = PyQuery(r.content)
327-
self.assertTrue(q('textarea')[0].text.startswith("[Edit this page"))
327+
self.assertTrue(q('textarea')[0].text.strip().startswith("[Edit this page"))
328328

329329
def setUp(self):
330330
make_test_data()

ietf/doc/tests_draft.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ def test_doc_change_shepherd_writeup(self):
866866
r = self.client.post(url,dict(txt=test_file,reset_text="1"))
867867
self.assertEquals(r.status_code, 200)
868868
q = PyQuery(r.content)
869-
self.assertTrue(q('textarea')[0].text.startswith("As required by RFC 4858"))
869+
self.assertTrue(q('textarea')[0].text.strip().startswith("As required by RFC 4858"))
870870

871871
def setUp(self):
872872
make_test_data()
@@ -943,7 +943,7 @@ def test_request_publication(self):
943943
draft.set_state(State.objects.get(used=True, type="draft-stream-iab", slug="approved"))
944944

945945
url = urlreverse('doc_request_publication', kwargs=dict(name=draft.name))
946-
login_testing_unauthorized(self, "iabchair", url)
946+
login_testing_unauthorized(self, "iab-chair", url)
947947

948948
# normal get
949949
r = self.client.get(url)

ietf/doc/tests_status_change.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ def test_initial_submission(self):
360360
r = self.client.get(url)
361361
self.assertEquals(r.status_code,200)
362362
q = PyQuery(r.content)
363-
self.assertTrue(q('textarea')[0].text.startswith("Provide a description"))
363+
self.assertTrue(q('textarea')[0].text.strip().startswith("Provide a description"))
364364

365365
# Faulty posts using textbox
366366
# Right now, nothing to test - we let people put whatever the web browser will let them put into that textbox
@@ -395,7 +395,7 @@ def test_subsequent_submission(self):
395395
r = self.client.get(url)
396396
self.assertEquals(r.status_code,200)
397397
q = PyQuery(r.content)
398-
self.assertTrue(q('textarea')[0].text.startswith("This is the old proposal."))
398+
self.assertTrue(q('textarea')[0].text.strip().startswith("This is the old proposal."))
399399

400400
# faulty posts trying to use file upload
401401
# Copied from wgtracker tests - is this really testing the server code, or is it testing
@@ -423,7 +423,7 @@ def test_subsequent_submission(self):
423423
r = self.client.post(url,dict(reset_text="1"))
424424
self.assertEquals(r.status_code, 200)
425425
q = PyQuery(r.content)
426-
self.assertTrue(q('textarea')[0].text.startswith("Provide a description"))
426+
self.assertTrue(q('textarea')[0].text.strip().startswith("Provide a description"))
427427

428428
def setUp(self):
429429
make_test_data()

0 commit comments

Comments
 (0)