Skip to content

Commit

Permalink
windows path issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@maxtepkeev
maxtepkeev committed Feb 11, 2023
1 parent 2e2df37 commit 1af0b1a
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion tests/test_redmine.py
View file
Expand Up @@ -84,7 +84,7 @@ def test_successful_filestream_upload(self):
def test_successful_file_download(self):
self.response.status_code = 200
self.response.iter_content = lambda chunk_size: (str(num) for num in range(0, 5))
self.assertEqual(self.redmine.download('http://foo/bar.txt', '/some/path'), '/some/path/bar.txt')
self.assertEqual(self.redmine.download('http://foo/bar.txt', '/some/path/'), '/some/path/bar.txt')

def test_successful_in_memory_file_download(self):
self.response.status_code = 200
Expand Down
20 changes: 10 additions & 10 deletions tests/test_resources_standard.py
View file
Expand Up @@ -25,7 +25,7 @@ def test_supports_export_url_retrieval(self):
def test_export(self):
self.response.json.return_value = responses['issue']['get']
self.response.iter_content = lambda chunk_size: (str(num) for num in range(0, 5))
self.assertEqual(self.redmine.issue.get(1).export('txt', '/foo/bar'), '/foo/bar/1.txt')
self.assertEqual(self.redmine.issue.get(1).export('txt', '/foo/bar/'), '/foo/bar/1.txt')

def test_export_not_supported_exception(self):
self.response.json.return_value = responses['attachment']['get']
Expand Down Expand Up @@ -354,7 +354,7 @@ def test_project_url(self):
def test_project_export(self):
self.response.json.return_value = responses['project']['all']
self.response.iter_content = lambda chunk_size: (str(num) for num in range(0, 5))
self.assertEqual(self.redmine.project.all().export('txt', '/foo/bar'), '/foo/bar/projects.txt')
self.assertEqual(self.redmine.project.all().export('txt', '/foo/bar/'), '/foo/bar/projects.txt')

def test_project_parent_converts_to_resource(self):
self.response.json.return_value = {'project': {'name': 'Foo', 'id': 1, 'parent': {'id': 2}}}
Expand Down Expand Up @@ -608,9 +608,9 @@ def test_issue_url(self):
def test_issue_export(self):
self.response.json.return_value = responses['issue']['all']
self.response.iter_content = lambda chunk_size: (str(num) for num in range(0, 5))
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar'), '/foo/bar/issues.txt')
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar/'), '/foo/bar/issues.txt')
self.response.json.return_value = responses['issue']['get']
self.assertEqual(self.redmine.issue.get(1).export('txt', '/foo/bar'), '/foo/bar/1.txt')
self.assertEqual(self.redmine.issue.get(1).export('txt', '/foo/bar/'), '/foo/bar/1.txt')

def test_issue_parent_converts_to_resource(self):
self.response.json.return_value = {'issue': {'subject': 'Foo', 'id': 1, 'parent': {'id': 2}}}
Expand Down Expand Up @@ -748,7 +748,7 @@ def test_time_entry_url(self):
def test_time_entry_export(self):
self.response.json.return_value = responses['time_entry']['all']
self.response.iter_content = lambda chunk_size: (str(num) for num in range(0, 5))
self.assertEqual(self.redmine.time_entry.all().export('txt', '/foo/bar'), '/foo/bar/time_entries.txt')
self.assertEqual(self.redmine.time_entry.all().export('txt', '/foo/bar/'), '/foo/bar/time_entries.txt')

def test_time_entry_resource_map_converts_to_resource(self):
self.response.json.return_value = responses['time_entry']['get']
Expand Down Expand Up @@ -852,7 +852,7 @@ def test_attachment_download(self):
response['attachment']['content_url'] = 'http://foo/bar.txt'
self.response.json.return_value = response
self.response.iter_content = lambda chunk_size: (str(num) for num in range(0, 5))
self.assertEqual(self.redmine.attachment.get(1).download('/some/path'), '/some/path/bar.txt')
self.assertEqual(self.redmine.attachment.get(1).download('/some/path/'), '/some/path/bar.txt')

def test_attachment_resource_map_converts_to_resource(self):
self.response.json.return_value = responses['attachment']['get']
Expand Down Expand Up @@ -933,7 +933,7 @@ def test_file_download(self):
response['attachment']['content_url'] = 'http://foo/bar.txt'
self.response.json.return_value = response
self.response.iter_content = lambda chunk_size: (str(num) for num in range(0, 5))
self.assertEqual(self.redmine.file.get(1).download('/some/path'), '/some/path/bar.txt')
self.assertEqual(self.redmine.file.get(1).download('/some/path/'), '/some/path/bar.txt')

def test_file_resource_map_converts_to_resource(self):
self.response.json.return_value = responses['attachment']['get']
Expand Down Expand Up @@ -1048,7 +1048,7 @@ def test_wiki_page_url(self):
def test_wiki_page_export(self):
self.response.json.return_value = responses['wiki_page']['get']
self.response.iter_content = lambda chunk_size: (str(num) for num in range(0, 5))
self.assertEqual(self.redmine.wiki_page.get('Foo', project_id='Foo').export('txt', '/foo'), '/foo/Foo.txt')
self.assertEqual(self.redmine.wiki_page.get('Foo', project_id='Foo').export('txt', '/foo/'), '/foo/Foo.txt')

def test_wiki_page_parent_converts_to_resource(self):
self.response.json.return_value = {'wiki_page': {'title': 'Foo', 'project_id': 1, 'parent': {'title': 'Bar'}}}
Expand Down Expand Up @@ -1441,7 +1441,7 @@ def test_user_url(self):
def test_user_export(self):
self.response.json.return_value = responses['user']['all']
self.response.iter_content = lambda chunk_size: (str(num) for num in range(0, 5))
self.assertEqual(self.redmine.user.all().export('txt', '/foo/bar'), '/foo/bar/users.txt')
self.assertEqual(self.redmine.user.all().export('txt', '/foo/bar/'), '/foo/bar/users.txt')

def test_group_version(self):
self.assertEqual(self.redmine.group.resource_class.redmine_version, (2, 1, 0))
Expand Down Expand Up @@ -1599,7 +1599,7 @@ def test_news_url(self):
def test_news_export(self):
self.response.json.return_value = responses['news']['all']
self.response.iter_content = lambda chunk_size: (str(num) for num in range(0, 5))
self.assertEqual(self.redmine.news.all().export('txt', '/foo/bar'), '/foo/bar/news.txt')
self.assertEqual(self.redmine.news.all().export('txt', '/foo/bar/'), '/foo/bar/news.txt')

def test_news_str(self):
self.response.json.return_value = responses['news']['filter']
Expand Down
17 changes: 9 additions & 8 deletions tests/test_resultsets.py
View file
Expand Up @@ -176,33 +176,34 @@ def test_values_list_method_flattened(self):
@mock.patch('redminelib.open', mock.mock_open(), create=True)
def test_export(self):
self.response.iter_content = lambda chunk_size: (str(num) for num in range(0, 5))
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar'), '/foo/bar/issues.txt')
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar/'), '/foo/bar/issues.txt')

@mock.patch('redminelib.open', mock.mock_open(), create=True)
def test_export_with_all_columns(self):
self.response.iter_content = lambda chunk_size: (str(num) for num in range(0, 5))
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar', columns='all'), '/foo/bar/issues.txt')
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar/', columns='all'), '/foo/bar/issues.txt')
self.redmine.ver = (3, 3, 0)
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar', columns='all'), '/foo/bar/issues.txt')
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar/', columns='all'), '/foo/bar/issues.txt')

@mock.patch('redminelib.open', mock.mock_open(), create=True)
def test_export_with_all_gui_columns(self):
self.response.iter_content = lambda chunk_size: (str(num) for num in range(0, 5))
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar', columns='all_gui'), '/foo/bar/issues.txt')
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar/', columns='all_gui'), '/foo/bar/issues.txt')
self.redmine.ver = (3, 3, 0)
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar', columns='all_gui'), '/foo/bar/issues.txt')
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar/', columns='all_gui'), '/foo/bar/issues.txt')

@mock.patch('redminelib.open', mock.mock_open(), create=True)
def test_export_with_all_gui_extra_columns(self):
columns = ['all_gui']
self.response.iter_content = lambda chunk_size: (str(num) for num in range(0, 5))
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar', columns=['all_gui']), '/foo/bar/issues.txt')
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar/', columns=columns), '/foo/bar/issues.txt')
self.redmine.ver = (3, 3, 0)
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar', columns=['all_gui']), '/foo/bar/issues.txt')
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar/', columns=columns), '/foo/bar/issues.txt')

@mock.patch('redminelib.open', mock.mock_open(), create=True)
def test_export_with_custom_columns(self):
self.response.iter_content = lambda chunk_size: (str(num) for num in range(0, 5))
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar', columns=['status']), '/foo/bar/issues.txt')
self.assertEqual(self.redmine.issue.all().export('txt', '/foo/bar/', columns=['status']), '/foo/bar/issues.txt')

def test_export_not_supported_exception(self):
self.assertRaises(exceptions.ExportNotSupported, lambda: self.redmine.custom_field.all().export('pdf'))
Expand Down

0 comments on commit 1af0b1a

Please sign in to comment.