You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ke...@apache.org on 2020/06/03 16:05:29 UTC
[allura] 07/12: [#8361] don't utf8 encode urls in tests
This is an automated email from the ASF dual-hosted git repository.
kentontaylor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 6308ce07b38c993e85c367bbc3e08b6d85777437
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Mon May 18 11:19:50 2020 -0400
[#8361] don't utf8 encode urls in tests
---
Allura/allura/tests/functional/test_discuss.py | 4 ++--
ForgeBlog/forgeblog/main.py | 2 +-
ForgeBlog/forgeblog/tests/functional/test_rest.py | 6 +++---
ForgeTracker/forgetracker/tests/functional/test_root.py | 16 ++++++++--------
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Allura/allura/tests/functional/test_discuss.py b/Allura/allura/tests/functional/test_discuss.py
index 020ce0c..2849946 100644
--- a/Allura/allura/tests/functional/test_discuss.py
+++ b/Allura/allura/tests/functional/test_discuss.py
@@ -83,7 +83,7 @@ class TestDiscuss(TestDiscussBase):
if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = text
- r = self.app.post(f['action'].encode('utf-8'), params=params,
+ r = self.app.post(f['action'], params=params,
headers={str('Referer'): str(thread_link.encode("utf-8"))},
extra_environ=dict(username=str('root')))
r = r.follow()
@@ -416,7 +416,7 @@ class TestAttachment(TestDiscussBase):
if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'Test Post'
- r = self.app.post(f['action'].encode('utf-8'), params=params,
+ r = self.app.post(f['action'], params=params,
headers={str('Referer'): str(self.thread_link.encode('utf-8'))})
r = r.follow()
self.post_link = str(
diff --git a/ForgeBlog/forgeblog/main.py b/ForgeBlog/forgeblog/main.py
index 344a4b1..52a01b7 100644
--- a/ForgeBlog/forgeblog/main.py
+++ b/ForgeBlog/forgeblog/main.py
@@ -608,7 +608,7 @@ class RootRestController(BaseController, AppRestControllerMixin):
def _lookup(self, year=None, month=None, title=None, *rest):
if not (year and month and title):
raise exc.HTTPNotFound()
- slug = '/'.join((year, month, six.moves.urllib.parse.unquote(title).decode('utf-8')))
+ slug = '/'.join((year, month, six.ensure_text(six.moves.urllib.parse.unquote(title))))
post = BM.BlogPost.query.get(slug=slug, app_config_id=c.app.config._id)
if not post:
raise exc.HTTPNotFound()
diff --git a/ForgeBlog/forgeblog/tests/functional/test_rest.py b/ForgeBlog/forgeblog/tests/functional/test_rest.py
index 826a0ed..8b685ae 100644
--- a/ForgeBlog/forgeblog/tests/functional/test_rest.py
+++ b/ForgeBlog/forgeblog/tests/functional/test_rest.py
@@ -137,7 +137,7 @@ class TestBlogApi(TestRestApiBase):
self.api_post('/rest/p/test/blog/', title='test',
text='test text', state='published')
url = '/rest' + BM.BlogPost.query.find().first().url()
- self.app.post(url.encode('utf-8'),
+ self.app.post(url,
params=dict(title='test2', text='test text2',
state='published'),
extra_environ={'username': str('*anonymous')},
@@ -147,7 +147,7 @@ class TestBlogApi(TestRestApiBase):
anon = M.ProjectRole.by_name('*anonymous')._id
anon_write = M.ACE.allow(anon, 'write')
acl.append(anon_write)
- self.app.post(url.encode('utf-8'),
+ self.app.post(url,
params=dict(title='test2', text='test text2',
state='published'),
extra_environ={'username': str('*anonymous')},
@@ -164,7 +164,7 @@ class TestBlogApi(TestRestApiBase):
extra_environ={'username': str('*anonymous')})
assert_equal(r.json['posts'], [])
url = '/rest' + BM.BlogPost.query.find().first().url()
- self.app.post(url.encode('utf-8'),
+ self.app.post(url,
params=dict(title='test2', text='test text2',
state='published'),
extra_environ={'username': str('*anonymous')},
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index bcb8069..eb341cc 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -926,7 +926,7 @@ class TestFunctionalController(TrackerTestController):
if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'test comment'
- self.app.post(f['action'].encode('utf-8'), params=params,
+ self.app.post(f['action'], params=params,
headers={'Referer': '/bugs/1/'.encode("utf-8")})
r = self.app.get('/bugs/1/', dict(page='1'))
post_link = str(r.html.find('div', {'class': 'edit_post_form reply'}).find('form')['action'])
@@ -1522,7 +1522,7 @@ class TestFunctionalController(TrackerTestController):
if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = post_content
- r = self.app.post(f['action'].encode('utf-8'), params=params,
+ r = self.app.post(f['action'], params=params,
headers={'Referer': '/bugs/1/'.encode("utf-8")})
r = self.app.get('/bugs/1/', dict(page='1'))
assert_true(post_content in r)
@@ -1538,7 +1538,7 @@ class TestFunctionalController(TrackerTestController):
if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params['ticket_form.summary'] = new_summary
- r = self.app.post(f['action'].encode('utf-8'), params=params,
+ r = self.app.post(f['action'], params=params,
headers={'Referer': '/bugs/1/'.encode("utf-8")})
r = self.app.get('/bugs/1/', dict(page='1'))
assert_true(summary + ' --> ' + new_summary in r)
@@ -1557,7 +1557,7 @@ class TestFunctionalController(TrackerTestController):
if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = post_content
- r = self.app.post(f['action'].encode('utf-8'), params=params,
+ r = self.app.post(f['action'], params=params,
headers={'Referer': '/bugs/1/'.encode("utf-8")})
r = self.app.get('/bugs/1/', dict(page='-1'))
assert_true(summary in r)
@@ -1567,7 +1567,7 @@ class TestFunctionalController(TrackerTestController):
assert_false('Page 1 of 1' in r)
# add some more posts and check for pager
for i in range(2):
- r = self.app.post(f['action'].encode('utf-8'), params=params,
+ r = self.app.post(f['action'], params=params,
headers={'Referer': '/bugs/1/'.encode("utf-8")})
r = self.app.get('/bugs/1/', dict(page='1', limit='2'))
assert_true('Page 2 of 2' in r)
@@ -1585,7 +1585,7 @@ class TestFunctionalController(TrackerTestController):
if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = post_content
- self.app.post(f['action'].encode('utf-8'), params=params,
+ self.app.post(f['action'], params=params,
headers={'Referer': '/bugs/1/'.encode("utf-8")})
r = self.app.get('/bugs/feed.rss')
post = M.Post.query.find().first()
@@ -2201,7 +2201,7 @@ class TestFunctionalController(TrackerTestController):
if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = post_content
- r = self.app.post(f['action'].encode('utf-8'), params=params,
+ r = self.app.post(f['action'], params=params,
headers={'Referer': '/p/test2/bugs2/1/'.encode("utf-8")})
r = self.app.get('/p/test2/bugs2/1/', dict(page='1'))
assert_true(post_content in r)
@@ -2451,7 +2451,7 @@ class TestFunctionalController(TrackerTestController):
if field.has_attr('name'):
params[field['name']] = field.get('value') or ''
params[f.find('textarea')['name']] = 'test comment'
- self.app.post(f['action'].encode('utf-8'), params=params,
+ self.app.post(f['action'], params=params,
headers={'Referer': '/bugs/1/'.encode("utf-8")})
r = self.app.get('/bugs/1/', dict(page='1'))
post_link = str(r.html.find('div', {'class': 'edit_post_form reply'}).find('form')['action'])