Add some unicode in tests for better handling

NotSqrt · Dec 18, 2016 · ab8f9ae · ab8f9ae
1 parent f8dd111
commit ab8f9ae
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 17 deletions.
diff --git a/gitlab-webhooks/tools.py b/gitlab-webhooks/tools.py
@@ -199,7 +199,7 @@ def run(*args, **kwargs):
             # 1 push message about new commit
             hook_calls.expect_call('push', 'commit_dev_branch')
             readme_file.content = CI_SCRIPT + '\n# even more content\n'
-            readme_file.save(branch_name='dev', commit_message='bump2')
+            readme_file.save(branch_name='dev', commit_message='bump2 with unicode ⇗ ⟾')
 
             ##############
             # issue events

diff --git a/mattermost_gitlab/event_formatter.py b/mattermost_gitlab/event_formatter.py
@@ -72,9 +72,9 @@ def format(self):
         if self.data['total_commits_count'] > 1:
             description += "s"
 
-        suffix = str('')
+        suffix = ''
         if len(self.data['commits']) > 0:
-            suffix = str('\n')
+            suffix = '\n'
 
         text = '%s pushed %s into the `%s` branch for project [%s](%s).%s' % (
             self.data['user_name'],
@@ -87,7 +87,7 @@ def format(self):
         for val in self.data['commits']:
             text += "[%s](%s)" % (val['message'], val['url'])
 
-        return str(text)
+        return text
 
 class IssueEvent(BaseEvent):
 

diff --git a/tests/data/gitlab/merge_request/close_merge_request.json b/tests/data/gitlab/merge_request/close_merge_request.json
@@ -15,7 +15,7 @@
                 "name": "Example User"
             },
             "id": "c5ccce8cd46a277dd0723ad5954f44a562c5c67e",
-            "message": "bump2",
+            "message": "bump2 with unicode \u21d7 \u27fe",
             "timestamp": "2016-12-16T18:13:26+00:00",
             "url": "http://gitlab.example.com/root/example-repository/commit/c5ccce8cd46a277dd0723ad5954f44a562c5c67e"
         },

diff --git a/tests/data/gitlab/merge_request/close_update_merge_request.json b/tests/data/gitlab/merge_request/close_update_merge_request.json
@@ -15,7 +15,7 @@
                 "name": "Example User"
             },
             "id": "c5ccce8cd46a277dd0723ad5954f44a562c5c67e",
-            "message": "bump2",
+            "message": "bump2 with unicode \u21d7 \u27fe",
             "timestamp": "2016-12-16T18:13:26+00:00",
             "url": "http://gitlab.example.com/root/example-repository/commit/c5ccce8cd46a277dd0723ad5954f44a562c5c67e"
         },

diff --git a/tests/data/gitlab/merge_request/merge_merge_request.json b/tests/data/gitlab/merge_request/merge_merge_request.json
@@ -15,7 +15,7 @@
                 "name": "Example User"
             },
             "id": "c5ccce8cd46a277dd0723ad5954f44a562c5c67e",
-            "message": "bump2",
+            "message": "bump2 with unicode \u21d7 \u27fe",
             "timestamp": "2016-12-16T18:13:26+00:00",
             "url": "http://gitlab.example.com/root/example-repository/commit/c5ccce8cd46a277dd0723ad5954f44a562c5c67e"
         },

diff --git a/tests/data/gitlab/merge_request/open_merge_request.json b/tests/data/gitlab/merge_request/open_merge_request.json
@@ -15,7 +15,7 @@
                 "name": "Example User"
             },
             "id": "c5ccce8cd46a277dd0723ad5954f44a562c5c67e",
-            "message": "bump2",
+            "message": "bump2 with unicode \u21d7 \u27fe",
             "timestamp": "2016-12-16T18:13:26+00:00",
             "url": "http://gitlab.example.com/root/example-repository/commit/c5ccce8cd46a277dd0723ad5954f44a562c5c67e"
         },

diff --git a/tests/data/gitlab/merge_request/reopen_merge_request.json b/tests/data/gitlab/merge_request/reopen_merge_request.json
@@ -15,7 +15,7 @@
                 "name": "Example User"
             },
             "id": "c5ccce8cd46a277dd0723ad5954f44a562c5c67e",
-            "message": "bump2",
+            "message": "bump2 with unicode \u21d7 \u27fe",
             "timestamp": "2016-12-16T18:13:26+00:00",
             "url": "http://gitlab.example.com/root/example-repository/commit/c5ccce8cd46a277dd0723ad5954f44a562c5c67e"
         },

diff --git a/tests/data/gitlab/merge_request/reopen_update_merge_request.json b/tests/data/gitlab/merge_request/reopen_update_merge_request.json
@@ -15,7 +15,7 @@
                 "name": "Example User"
             },
             "id": "c5ccce8cd46a277dd0723ad5954f44a562c5c67e",
-            "message": "bump2",
+            "message": "bump2 with unicode \u21d7 \u27fe",
             "timestamp": "2016-12-16T18:13:26+00:00",
             "url": "http://gitlab.example.com/root/example-repository/commit/c5ccce8cd46a277dd0723ad5954f44a562c5c67e"
         },

diff --git a/tests/data/gitlab/merge_request/update_merge_request.json b/tests/data/gitlab/merge_request/update_merge_request.json
@@ -15,7 +15,7 @@
                 "name": "Example User"
             },
             "id": "c5ccce8cd46a277dd0723ad5954f44a562c5c67e",
-            "message": "bump2",
+            "message": "bump2 with unicode \u21d7 \u27fe",
             "timestamp": "2016-12-16T18:13:26+00:00",
             "url": "http://gitlab.example.com/root/example-repository/commit/c5ccce8cd46a277dd0723ad5954f44a562c5c67e"
         },

diff --git a/tests/data/gitlab/note/merge_request_note.json b/tests/data/gitlab/note/merge_request_note.json
@@ -14,7 +14,7 @@
                 "name": "Example User"
             },
             "id": "c5ccce8cd46a277dd0723ad5954f44a562c5c67e",
-            "message": "bump2",
+            "message": "bump2 with unicode \u21d7 \u27fe",
             "timestamp": "2016-12-16T18:13:26+00:00",
             "url": "http://gitlab.example.com/root/example-repository/commit/c5ccce8cd46a277dd0723ad5954f44a562c5c67e"
         },

diff --git a/tests/data/gitlab/push/commit_dev_branch.json b/tests/data/gitlab/push/commit_dev_branch.json
@@ -10,7 +10,7 @@
                 "name": "Example User"
             },
             "id": "c5ccce8cd46a277dd0723ad5954f44a562c5c67e",
-            "message": "bump2",
+            "message": "bump2 with unicode \u21d7 \u27fe",
             "modified": [
                 "README.md"
             ],

diff --git a/tests/data/gitlab/push/commit_dev_branch.md b/tests/data/gitlab/push/commit_dev_branch.md
@@ -1,2 +1,2 @@
 Example User pushed 1 commit into the `refs/heads/dev` branch for project [example repository](http://gitlab.example.com/root/example-repository).
-[bump2](http://gitlab.example.com/root/example-repository/commit/c5ccce8cd46a277dd0723ad5954f44a562c5c67e)
+[bump2 with unicode ⇗ ⟾](http://gitlab.example.com/root/example-repository/commit/c5ccce8cd46a277dd0723ad5954f44a562c5c67e)
diff --git a/tests/data/gitlab/push/commit_merge_request.json b/tests/data/gitlab/push/commit_merge_request.json
@@ -10,7 +10,7 @@
                 "name": "Example User"
             },
             "id": "c5ccce8cd46a277dd0723ad5954f44a562c5c67e",
-            "message": "bump2",
+            "message": "bump2 with unicode \u21d7 \u27fe",
             "modified": [
                 "README.md"
             ],

diff --git a/tests/data/gitlab/push/commit_merge_request.md b/tests/data/gitlab/push/commit_merge_request.md
@@ -1,5 +1,5 @@
 Example User pushed 2 commits into the `refs/heads/master` branch for project [example repository](http://gitlab.example.com/root/example-repository).
-[bump2](http://gitlab.example.com/root/example-repository/commit/c5ccce8cd46a277dd0723ad5954f44a562c5c67e)[Merge branch 'dev' into 'master'
+[bump2 with unicode ⇗ ⟾](http://gitlab.example.com/root/example-repository/commit/c5ccce8cd46a277dd0723ad5954f44a562c5c67e)[Merge branch 'dev' into 'master'
 
 merge cool feature
 

diff --git a/tests/test.py b/tests/test.py
@@ -8,6 +8,7 @@
 import os
 import unittest
 import json
+import codecs
 
 # Third-party imports
 
@@ -20,7 +21,7 @@ def relative_path(name):
 
 
 def file_content(name):
-    with open(relative_path(name)) as fp:
+    with codecs.open(relative_path(name), encoding='utf-8') as fp:
         return fp.read()