fix dynamic issue (fixes allure-framework#198 via allure-framework#200)

sseliverstov · web-flow · commit 884581f18b4b · 2018-01-26T19:19:28.000+02:00
diff --git a/allure-pytest/src/listener.py b/allure-pytest/src/listener.py
@@ -23,7 +23,8 @@
 
 class AllureListener(object):
 
-    def __init__(self):
+    def __init__(self, config):
+        self.config = config
         self.allure_logger = AllureReporter()
         self._cache = ItemCache()
         self._host = host_tag()
@@ -211,6 +212,8 @@ def add_description_html(self, test_description_html):
     def add_link(self, url, link_type, name):
         test_result = self.allure_logger.get_test(None)
         if test_result:
+            pattern = dict(self.config.option.allure_link_pattern).get(link_type, u'{}')
+            url = pattern.format(url)
             test_result.links.append(Link(link_type, url, name))
 
     @allure_commons.hookimpl
diff --git a/allure-pytest/src/plugin.py b/allure-pytest/src/plugin.py
@@ -94,7 +94,7 @@ def pytest_configure(config):
     allure_commons.plugin_manager.register(test_helper)
 
     if report_dir:
-        test_listener = AllureListener()
+        test_listener = AllureListener(config)
         config.pluginmanager.register(test_listener)
         allure_commons.plugin_manager.register(test_listener)
 
diff --git a/allure-pytest/test/links/dynamic_links_test.py b/allure-pytest/test/links/dynamic_links_test.py
@@ -3,6 +3,7 @@
 
 LINK_1 = "https://github.com"
 LINK_2 = "https://gitter.im"
+ISSUE = 'https://github.com/allure-framework/allure-python/pull/199'
 
 
 @allure.link(LINK_1)
@@ -30,3 +31,4 @@ def test_parametrized_dynamic_links(link):
     ...     )
     """
     allure.dynamic.link(link)
+    allure.dynamic.issue(ISSUE)
diff --git a/allure-pytest/test/links/links_pattern_test.py b/allure-pytest/test/links/links_pattern_test.py
@@ -1,18 +1,6 @@
-"""
->>> allure_report = getfixture('allure_report_with_params')('--allure-link-pattern=issue:{pattern}'.format(
-...                                                             pattern=ISSUE_PATTERN),
-...                                                         '--allure-link-pattern={link_type}:{pattern}'.format(
-...                                                             link_type=CUSTOM_LINK_TYPE,
-...                                                             pattern=CUSTOM_LINK_PATTERN))
->>> assert_that(allure_report,
-...             has_test_case('test_link_pattern',
-...                           has_link(ISSUE_PATTERN.format(ISSUE)),
-...                           has_link(CUSTOM_LINK_PATTERN.format(CUSTOM_LINK))
-...                           )
-...             )
-"""
-
 import pytest
+import allure
+
 
 ISSUE = '24'
 ISSUE_PATTERN = 'https://github.com/allure-framework/allure-python2/issues/{}'
@@ -24,4 +12,35 @@
 @pytest.allure.issue(ISSUE)
 @pytest.allure.link(CUSTOM_LINK, link_type=CUSTOM_LINK_TYPE)
 def test_link_pattern():
+    """
+    >>> allure_report = getfixture('allure_report_with_params')('--allure-link-pattern=issue:{pattern}'.format(
+    ...                                                             pattern=ISSUE_PATTERN),
+    ...                                                         '--allure-link-pattern={link_type}:{pattern}'.format(
+    ...                                                             link_type=CUSTOM_LINK_TYPE,
+    ...                                                             pattern=CUSTOM_LINK_PATTERN))
+    >>> assert_that(allure_report,
+    ...             has_test_case('test_link_pattern',
+    ...                           has_link(ISSUE_PATTERN.format(ISSUE)),
+    ...                           has_link(CUSTOM_LINK_PATTERN.format(CUSTOM_LINK))
+    ...                           )
+    ...             )
+    """
     pass
+
+
+def test_dynamic_link_pattern():
+    """
+    >>> allure_report = getfixture('allure_report_with_params')('--allure-link-pattern=issue:{pattern}'.format(
+    ...                                                             pattern=ISSUE_PATTERN),
+    ...                                                         '--allure-link-pattern={link_type}:{pattern}'.format(
+    ...                                                             link_type=CUSTOM_LINK_TYPE,
+    ...                                                             pattern=CUSTOM_LINK_PATTERN))
+    >>> assert_that(allure_report,
+    ...             has_test_case('test_dynamic_link_pattern',
+    ...                           has_link(ISSUE_PATTERN.format(ISSUE)),
+    ...                           has_link(CUSTOM_LINK_PATTERN.format(CUSTOM_LINK))
+    ...                           )
+    ...             )
+    """
+    allure.dynamic.issue(ISSUE)
+    allure.dynamic.link(CUSTOM_LINK, link_type=CUSTOM_LINK_TYPE)
diff --git a/allure-python-commons/src/_allure.py b/allure-python-commons/src/_allure.py
@@ -103,7 +103,7 @@ def link(url, link_type=LinkType.LINK, name=None):
 
     @staticmethod
     def issue(url, name=None):
-        Dynamic.link(url, link_type=LinkType.TEST_CASE, name=name)
+        Dynamic.link(url, link_type=LinkType.ISSUE, name=name)
 
     @staticmethod
     def testcase(url, name=None):
