unicode support (fixes allure-framework#69 via allure-framework#71)

unicode fixes

Author: sseliverstov

allure-behave/features/description.feature

@@ -1,4 +1,3 @@
-@wip
 Feature: Description
 
   Scenario: Use description

allure-behave/features/scenario.feature

@@ -19,4 +19,16 @@ Feature: Scenario
             | passed    | passed |
             | failed    | failed |
             | broken    | broken |
-            | undefined | broken |
+            | undefined | broken |
+
+
+  Scenario: Scenario without name
+    Given feature definition
+        """
+        Feature: Scenario
+
+        Scenario:
+          Given passed step
+        """
+     When I run behave with allure formatter
+     Then allure report has a scenario with name "Scenario"

allure-behave/features/steps/behave_steps.py

@@ -9,15 +9,18 @@
 
 
 @given(u'feature definition')
-def feature_definition(context):
-    parser = Parser()
+@given(u'feature definition {lang}')
+def feature_definition(context, **kwargs):
+    parser = Parser(language=kwargs.get('lang', None))
     context.feature_definition = parser.parse(context.text)
 
 
 @when(u'I run behave with allure formatter')
-def run_behave_with_allure(context):
+@when(u'I run behave with allure formatter with options "{args}"')
+def run_behave_with_allure(context, **kwargs):
     cmd_args = '-v -f allure_behave.formatter:AllureFormatter -f pretty'
-    config = Configuration(command_args=cmd_args)
+    cmd = '{options} {cmd}'.format(cmd=cmd_args, options=kwargs.get('args', ''))
+    config = Configuration(command_args=cmd)
 
     result_tmp_dir = mkdtemp(dir=os.environ.get('TEST_TMP', None))
     stream_opener = StreamOpener(filename=result_tmp_dir)

allure-behave/features/steps/report_steps.py

@@ -84,11 +84,3 @@ def step_impl(context, item):
     context_matcher = getattr(context, item)
     matcher = partial(context_matcher, has_attachment)
     assert_that(context.allure_report, matcher())
-
-
-
-
-
-
-
-

allure-behave/features/unicode.feature

@@ -1,49 +1,11 @@
 Feature: Language
     Scenario: Use russian
-      Given feature definition ru
+    Given feature definition ru
         """
-        Свойство: Юникод
+        Функционал: Язык
 
-          Структура сценария: Солнечный круг, небо вокруг
-            Пусть всегда будет <это>
-            Пусть всегда буду я
-            Примеры:
-             | это    |
-             | солнце |
-             | небо   |
-             | мама   |
+          Сценарий: На русском
+            Допустим passed step
         """
      When I run behave with allure formatter with options "--lang ru"
-     Then allure report has a scenario with name "Солнечный круг, небо вокруг"
-      And scenario contains step "Пусть всегда будет солнце"
-      And scenario contains step "Пусть всегда будет небо"
-      And scenario contains step "Пусть всегда будет мама"
-      And scenario contains step "Пусть всегда буду я"
-
-
-    Scenario: Assert message in step
-      Given feature definition ru
-        """
-        Свойство: Юникод
-
-          Сценарий: Ошибка с utf-8 сообщением
-            Допустим провальный шаг
-        """
-      When I run behave with allure formatter with options "--lang ru"
-      Then allure report has a scenario with name "Ошибка с utf-8 сообщением"
-       And scenario contains step "Допустим провальный шаг"
-       And step has status details with message "AssertionError: Фиаско!"
-
-
-    Scenario: ASCII assert message in step
-      Given feature definition ru
-        """
-        Свойство: Юникод
-
-          Сценарий: Ошибка с utf-8 сообщением
-            Допустим провальный шаг с ascii
-        """
-      When I run behave with allure formatter with options "--lang ru"
-      Then allure report has a scenario with name "Ошибка с utf-8 сообщением"
-       And scenario contains step "Допустим провальный шаг с ascii"
-       And step has status details with message "AssertionError: Фиаско!"
+     Then allure report has a scenario with name "На русском"

allure-behave/src/listener.py

@@ -80,7 +80,7 @@ def stop_scenario(self, scenario):
 
     def start_step(self, step):
         self.current_step_uuid = uuid4()
-        name = '{keyword} {title}'.format(keyword=step.keyword, title=step.name)
+        name = u'{keyword} {title}'.format(keyword=step.keyword, title=step.name)
         parent_uuid = self.current_before_uuid or self.current_scenario_uuid
         allure_step = TestStepResult(name=name, start=now())
 

allure-behave/src/utils.py

@@ -71,12 +71,11 @@ def step_status(result):
 
 def step_status_details(result):
     if result.exception:
-        message = ','.join(map(str, result.exception.args))
-        message = '{name}: {message}'.format(name=result.exception.__class__.__name__, message=message)
-        trace = '\n'.join(traceback.format_tb(result.exc_traceback)) if result.exc_traceback else None
+        message = u','.join(map(str, result.exception.args))
+        message = u'{name}: {message}'.format(name=result.exception.__class__.__name__, message=message)
+        trace = u'\n'.join(traceback.format_tb(result.exc_traceback)) if result.exc_traceback else None
         return StatusDetails(message=message, trace=trace)
     elif result.status == 'undefined':
-        message = u"\nYou can implement step definitions for undefined steps with "
-        message += u"these snippets:\n\n"
+        message = u'\nYou can implement step definitions for undefined steps with these snippets:\n\n'
         message += make_undefined_step_snippet(result)
         return StatusDetails(message=message)

allure-behave/tox.ini

@@ -3,7 +3,6 @@ envlist=
     py{27,33,34,35}
     static_check
 
-
 [testenv]
 passenv =
     HOME

allure-python-commons/src/model2.py

@@ -19,7 +19,7 @@ def _write(report_dir, item, glob):
     data = asdict(item, filter=lambda attr, value: not (type(value) != bool and not bool(value)))
     with io.open(os.path.join(report_dir, filename), 'w', encoding='utf8') as json_file:
         if sys.version_info.major < 3:
-            json_file.write(unicode(json.dumps(data, indent=indent, ensure_ascii=False)))
+            json_file.write(unicode(json.dumps(data, indent=indent, ensure_ascii=False, encoding='utf8')))
         else:
             json.dump(data, json_file, indent=indent, ensure_ascii=False)
 

allure-python-commons/src/utils.py

@@ -6,7 +6,7 @@
 def md5(*args):
     m = hashlib.md5()
     for arg in args:
-        part = str(arg).encode('utf-8')
+        part = arg.encode('utf-8')
         m.update(part)
     return m.hexdigest()