Require issue tracker to be present (#441)

* fix #438 * fix docs * add issue tracker to app scaffolding * improve form * re-order form field
2017-03-10 23:26:22 +01:00 · 2017-03-10 23:26:22 +01:00 · 0d8d87b47a
--- a/docs/developer.rst
+++ b/docs/developer.rst
@ -149,6 +149,7 @@ A minimum valid **info.xml** would look like this:
        <licence>agpl</licence>
        <author>Bernhard Posselt</author>
        <category>multimedia</category>
+        <bugs>https://github.com/nextcloud/news/issues</bugs>
        <dependencies>
            <!-- owncloud tag is required on Nextcloud 9 and 10 -->
            <owncloud min-version="9.1"/>
@ -306,7 +307,7 @@ website
    * must contain an URL to the project's homepage
    * will be rendered on the app detail page
 bugs
-    * optional
+    * required
    * must contain an URL to the project's bug tracker
    * will be rendered on the app detail page
 repository
--- a/nextcloudappstore/core/api/v1/release/info.xsd
+++ b/nextcloudappstore/core/api/v1/release/info.xsd
@ -28,7 +28,7 @@
                            maxOccurs="unbounded"/>
                <xs:element name="website" type="url" minOccurs="0"
                            maxOccurs="1"/>
-                <xs:element name="bugs" type="url" minOccurs="0"
+                <xs:element name="bugs" type="url" minOccurs="1"
                            maxOccurs="1"/>
                <xs:element name="repository" type="repository" minOccurs="0"
                            maxOccurs="1"/>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/11.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/11.xml
@ -8,6 +8,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>multimedia</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <nextcloud min-version="11" max-version="11"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/9and10.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/9and10.xml
@ -8,6 +8,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>multimedia</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <owncloud min-version="9.1" max-version="9.1"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/9and10invalid.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/9and10invalid.xml
@ -8,6 +8,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>multimedia</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <nextcloud min-version="10" max-version="10"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/badcommand.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/badcommand.xml
@ -8,6 +8,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>multimedia</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <owncloud min-version="9.0" max-version="9.0"/>
        <command>bad command</command>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/broken-xml.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/broken-xml.xml
@ -7,6 +7,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>multimedia</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies
        <owncloud min-version="9.0"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/category_mapping.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/category_mapping.xml
@ -8,6 +8,7 @@
    <author>Bernhard Posselt</author>
    <category>productivity</category>
    <category>tool</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <owncloud min-version="9.0" max-version="9.0"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/category_mapping_game.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/category_mapping_game.xml
@ -7,6 +7,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>game</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <owncloud min-version="9.0" max-version="9.0"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/category_mapping_tool.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/category_mapping_tool.xml
@ -7,6 +7,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>other</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <owncloud min-version="9.0" max-version="9.0"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/digits.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/digits.xml
@ -7,6 +7,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>multimedia</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <owncloud min-version="9.0" max-version="9.0"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/entities.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/entities.xml
@ -11,6 +11,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>multimedia</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <owncloud min-version="9.0" max-version="9.0"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/invalid-elements.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/invalid-elements.xml
@ -8,6 +8,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>multimedia</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <owncloud min-version="9.0" max-version="9.0"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/invalid.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/invalid.xml
@ -7,6 +7,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>multimedia</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <owncloud min-version="x9.0" max-version="9.0"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/minimal.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/minimal.xml
@ -8,6 +8,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>multimedia</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <owncloud min-version="9.0" max-version="9.0"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/nextcloud.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/nextcloud.xml
@ -8,6 +8,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>multimedia</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <nextcloud min-version="10" max-version="11"/>
        <owncloud min-version="9.0" max-version="9.1"/>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/no_en_description.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/no_en_description.xml
@ -8,6 +8,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>multimedia</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <owncloud min-version="9.0" max-version="9.0"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/no_en_name.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/no_en_name.xml
@ -8,6 +8,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>multimedia</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <owncloud min-version="9.0" max-version="9.0"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/no_en_summary.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/no_en_summary.xml
@ -8,6 +8,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>multimedia</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <owncloud min-version="9.0" max-version="9.0"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/prerelease.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/prerelease.xml
@ -8,6 +8,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>multimedia</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <owncloud min-version="9.0" max-version="9.0"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/repair-and-jobs.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/repair-and-jobs.xml
@ -8,6 +8,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>multimedia</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <owncloud min-version="9.0" max-version="9.0"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/data/infoxmls/transform.xml
+++ b/nextcloudappstore/core/api/v1/tests/data/infoxmls/transform.xml
@ -8,6 +8,7 @@
    <licence>agpl</licence>
    <author>Bernhard Posselt</author>
    <category>multimedia</category>
+    <bugs>https://github.com/nextcloud/news/issues</bugs>
    <dependencies>
        <owncloud min-version="9.1" max-version="9.2"/>
    </dependencies>
--- a/nextcloudappstore/core/api/v1/tests/test_parser.py
+++ b/nextcloudappstore/core/api/v1/tests/test_parser.py
@ -37,7 +37,7 @@ class ParserTest(TestCase):
            'developer_docs': None,
            'user_docs': None,
            'website': None,
-            'issue_tracker': None,
+            'issue_tracker': 'https://github.com/nextcloud/news/issues',
            'screenshots': [],
            'categories': [{'category': {'id': 'multimedia'}}],
            'release': {
--- a/nextcloudappstore/core/api/v1/tests/test_release_importer.py
+++ b/nextcloudappstore/core/api/v1/tests/test_release_importer.py
@ -35,7 +35,7 @@ class ImporterTest(TestCase):
        self.importer.import_data('app', result['app'], None)
        app = App.objects.get(pk='news')
        self._assert_all_empty(app, ['user_docs', 'admin_docs', 'website',
-                                     'developer_docs', 'issue_tracker'])
+                                     'developer_docs'])
        # l10n
        app.set_current_language('en')
        self.assertEqual('News', app.name)
@ -51,6 +51,9 @@ class ImporterTest(TestCase):
        self.assertEqual(1, app.categories.count())
        self.assertEqual('multimedia', app.categories.all()[0].id)

+        self.assertEqual('https://github.com/nextcloud/news/issues',
+                         app.issue_tracker)
+
        self.assertEqual(0, app.screenshots.count())
        self.assertEqual(0, Screenshot.objects.count())

--- a/nextcloudappstore/core/scaffolding/app-templates/11/app/appinfo/info.xml
+++ b/nextcloudappstore/core/scaffolding/app-templates/11/app/appinfo/info.xml
@ -10,6 +10,7 @@
    <version>0.0.1</version>
    <namespace>{{ app.namespace }}</namespace>{% for category in app.categories %}
    <category>{{ category }}</category>{% endfor %}
+    <bugs>{{ app.issue_tracker }}</bugs>
    <dependencies>
        <owncloud min-version="{{ app.owncloud_version }}"/>
        <nextcloud min-version="{{ app.nextcloud_version }}" max-version="{{ app.nextcloud_version }}"/>
--- a/nextcloudappstore/core/scaffolding/archive.py
+++ b/nextcloudappstore/core/scaffolding/archive.py
@ -23,6 +23,7 @@ def build_files(args: Dict[str, str]) -> Dict[str, str]:
        'author_name': args['author_name'],
        'author_mail': args['author_email'],
        'author_homepage': args['author_homepage'],
+        'issue_tracker': args['issue_tracker'],
        'categories': args['categories'],
        'nextcloud_version': platform
    }
--- a/nextcloudappstore/core/scaffolding/forms.py
+++ b/nextcloudappstore/core/scaffolding/forms.py
@ -36,6 +36,8 @@ class AppScaffoldingForm(Form):
    author_name = CharField(max_length=80, label=_('Author\'s full name'))
    author_email = EmailField(label=_('Author\'s e-mail'))
    author_homepage = URLField(label=_('Author\'s homepage'), required=False)
+    issue_tracker = URLField(label=_('Issue tracker URL'), required=True,
+                             help_text=_('Bug reports and feature requests'))
    categories = MultipleChoiceField(required=True, label=_('Categories'),
                                     choices=lazy(get_categories, list),
                                     help_text=_('Hold down CTRL and click to '
--- a/nextcloudappstore/core/scaffolding/tests/data/info.xml
+++ b/nextcloudappstore/core/scaffolding/tests/data/info.xml
@ -10,6 +10,7 @@
    <version>0.0.1</version>
    <namespace>TheApp</namespace>
    <category>tools</category>
+    <bugs>https://test.com</bugs>
    <dependencies>
        <owncloud min-version="9.2"/>
        <nextcloud min-version="11" max-version="11"/>
--- a/nextcloudappstore/core/scaffolding/tests/test_archive.py
+++ b/nextcloudappstore/core/scaffolding/tests/test_archive.py
@ -17,6 +17,7 @@ class ArchiveTest(TestCase):
            'author_email': 'author email',
            'author_homepage': 'author homepage',
            'platform': '11',
+            'issue_tracker': 'https://test.com',
            'categories': ['tools'],
        }