Skip to content

Commit

Permalink
Merge pull request #2573 from suhailsinghbains/issues/2051/1
Browse files Browse the repository at this point in the history
Fixes #2051: Remove type-stylo from EXTRA_LABELS allow-list
  • Loading branch information
Mike Taylor authored Aug 29, 2018
2 parents 6bfd26c + 5fd548a commit 5060114
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ def update_status_config(milestones_content):
'browser-firefox-reality',
'type-google',
'type-media',
'type-stylo',
'type-tracking-protection-basic',
'type-tracking-protection-strict',
'type-webrender-enabled',
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/test_form.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,27 +136,27 @@ def test_get_metadata(self):
form_object = MultiDict([
('reported_with', u'desktop-reporter'),
('url', u'http://localhost:5000/issues/new'),
('extra_labels', [u'type-stylo', u'type-webrender-enabled']),
('extra_labels', [u'type-webrender-enabled']),
('ua_header', u'Mozilla/5.0...Firefox 59.0'),
('browser', u'Firefox 59.0')])
metadata_keys = ['browser', 'ua_header', 'reported_with',
'extra_labels']
actual = form.get_metadata(metadata_keys, form_object)
expected = u'<!-- @browser: Firefox 59.0 -->\n<!-- @ua_header: Mozilla/5.0...Firefox 59.0 -->\n<!-- @reported_with: desktop-reporter -->\n<!-- @extra_labels: type-stylo, type-webrender-enabled -->\n' # nopep8
expected = u'<!-- @browser: Firefox 59.0 -->\n<!-- @ua_header: Mozilla/5.0...Firefox 59.0 -->\n<!-- @reported_with: desktop-reporter -->\n<!-- @extra_labels: type-webrender-enabled -->\n' # nopep8
self.assertEqual(actual, expected)

def test_get_metadata_browser_as_extra(self):
"""Test that we can handle a browser-foo inside of EXTRA_LABELS."""
form_object = MultiDict([
('reported_with', u'desktop-reporter'),
('url', u'http://localhost:5000/issues/new'),
('extra_labels', [u'type-stylo', u'browser-focus-geckoview']),
('extra_labels', [u'browser-focus-geckoview']),
('ua_header', u'Mozilla/5.0...Firefox 59.0'),
('browser', u'Firefox 59.0')])
metadata_keys = ['browser', 'ua_header', 'reported_with',
'extra_labels']
actual = form.get_metadata(metadata_keys, form_object)
expected = u'<!-- @browser: Firefox 59.0 -->\n<!-- @ua_header: Mozilla/5.0...Firefox 59.0 -->\n<!-- @reported_with: desktop-reporter -->\n<!-- @extra_labels: type-stylo, browser-focus-geckoview -->\n' # nopep8
expected = u'<!-- @browser: Firefox 59.0 -->\n<!-- @ua_header: Mozilla/5.0...Firefox 59.0 -->\n<!-- @reported_with: desktop-reporter -->\n<!-- @extra_labels: browser-focus-geckoview -->\n' # nopep8
self.assertEqual(actual, expected)

def test_normalize_metadata(self):
Expand Down

0 comments on commit 5060114

Please sign in to comment.