allura
Fork

Commit

Fix for failing tests

Signed-off-by: Jenny Steele <jsteele@geek.net>

--- a/Allura/allura/lib/markdown_extensions.py

+++ b/Allura/allura/lib/markdown_extensions.py

		@@ -66,9 +66,9 @@ class FencedCodeProcessor(markdown.preprocessors.Preprocessor):
66	66	class ForgeProcessor(object):
67	67	alink_pattern = r'(?<!\[)\[([^\]\[]*)\]'
68	68	macro_pattern = r'\[(\[([^\]\[]*)\])\]'
69		- placeholder_prefix = '\x02jgimwge'
70		- placeholder = '%s:%%s:%%.4d\x03' % placeholder_prefix
71		- placeholder_re = re.compile('%s:(\\w+):(\\d+)\x03' % placeholder_prefix)
	69	+ placeholder_prefix = '#jgimwge'
	70	+ placeholder = '%s:%%s:%%.4d#khjhhj' % placeholder_prefix
	71	+ placeholder_re = re.compile('%s:(\\w+):(\\d+)#khjhhj' % placeholder_prefix)
72	72
73	73	def __init__(self, use_wiki = False, markdown=None):
74	74	self.markdown = markdown

--- a/ForgeTracker/forgetracker/tests/functional/test_root.py

+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py

		@@ -148,7 +148,7 @@ class TestFunctionalController(TestController):
148	148	}, upload_files=[upload]).follow()
149	149	assert file_name in ticket_editor, ticket_editor.showbrowser()
150	150	req = self.app.get('/bugs/1/')
151		- file_link = req.html.findAll('form')[1].findAll('a')[6]
	151	+ file_link = req.html.findAll('form')[1].findAll('a')[-4]
152	152	assert_equal(file_link.string, file_name)
153	153	self.app.post(str(file_link['href']),{
154	154	'delete':'True'

		@@ -164,7 +164,7 @@ class TestFunctionalController(TestController):
164	164	ticket_editor = self.app.post('/bugs/1/update_ticket',{
165	165	'summary':'zzz'
166	166	}, upload_files=[upload]).follow()
167		- download = self.app.get(str(ticket_editor.html.findAll('form')[1].findAll('a')[7]['href']))
	167	+ download = self.app.get(str(ticket_editor.html.findAll('form')[1].findAll('a')[-4]['href']))
168	168	assert_equal(download.body, file_data)
169	169
170	170	def test_new_image_attachment_content(self):