diff --git a/.github/workflows/release-1-create-pr.yml b/.github/workflows/release-1-create-pr.yml index 33aaafecb26..2c9292971c8 100644 --- a/.github/workflows/release-1-create-pr.yml +++ b/.github/workflows/release-1-create-pr.yml @@ -111,7 +111,7 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} script: | - github.rest.pulls.create({ + const pr = await github.rest.pulls.create({ owner: '${{ env.GITHUB_ORG }}', repo: 'django-DefectDojo', title: 'Release: Merge release into master from: ${{ env.NEW_BRANCH }}', @@ -119,3 +119,9 @@ jobs: head: '${{ env.NEW_BRANCH }}', base: 'master' }) + await github.rest.issues.addLabels({ + owner: '${{ env.GITHUB_ORG }}', + repo: 'django-DefectDojo', + issue_number: pr.data.number, + labels: ['release-management'] + }) diff --git a/.github/workflows/release-3-master-into-dev.yml b/.github/workflows/release-3-master-into-dev.yml index f8e2c75682d..905be6ab488 100644 --- a/.github/workflows/release-3-master-into-dev.yml +++ b/.github/workflows/release-3-master-into-dev.yml @@ -99,7 +99,7 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} script: | - github.rest.pulls.create({ + const pr = await github.rest.pulls.create({ owner: '${{ env.GITHUB_ORG }}', repo: 'django-DefectDojo', title: 'Release: Merge back ${{ inputs.release_number_new }} into dev from: ${{ env.NEW_BRANCH }}', @@ -107,6 +107,12 @@ jobs: head: '${{ env.NEW_BRANCH }}', base: 'dev' }) + await github.rest.issues.addLabels({ + owner: '${{ env.GITHUB_ORG }}', + repo: 'django-DefectDojo', + issue_number: pr.data.number, + labels: ['release-management'] + }) create_pr_for_merge_back_into_bugfix: runs-on: ubuntu-latest @@ -175,7 +181,7 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} script: | - github.rest.pulls.create({ + const pr = await github.rest.pulls.create({ owner: '${{ env.GITHUB_ORG }}', repo: 'django-DefectDojo', title: 'Release: Merge back ${{ inputs.release_number_new }} into bugfix from: ${{ env.NEW_BRANCH }}', @@ -183,3 +189,9 @@ jobs: head: '${{ env.NEW_BRANCH }}', base: 'bugfix' }) + await github.rest.issues.addLabels({ + owner: '${{ env.GITHUB_ORG }}', + repo: 'django-DefectDojo', + issue_number: pr.data.number, + labels: ['release-management'] + }) diff --git a/dojo/__init__.py b/dojo/__init__.py index 7fda45b24f0..622b91aa8a8 100644 --- a/dojo/__init__.py +++ b/dojo/__init__.py @@ -4,6 +4,6 @@ # Django starts so that shared_task will use this app. from .celery import app as celery_app # noqa: F401 -__version__ = "2.57.2" +__version__ = "2.57.3" __url__ = "https://github.com/DefectDojo/django-DefectDojo" __docs__ = "https://documentation.defectdojo.com" diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index 4b45de922e6..33f64ec8b03 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2.58.0-dev" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.9.24-dev +version: 1.9.25-dev icon: https://defectdojo.com/hubfs/DefectDojo_favicon.png maintainers: - name: madchap diff --git a/helm/defectdojo/README.md b/helm/defectdojo/README.md index a6e271cc137..f4da0fa7dae 100644 --- a/helm/defectdojo/README.md +++ b/helm/defectdojo/README.md @@ -511,7 +511,7 @@ The HELM schema will be generated for you. # General information about chart values -![Version: 1.9.24-dev](https://img.shields.io/badge/Version-1.9.24--dev-informational?style=flat-square) ![AppVersion: 2.58.0-dev](https://img.shields.io/badge/AppVersion-2.58.0--dev-informational?style=flat-square) +![Version: 1.9.25-dev](https://img.shields.io/badge/Version-1.9.25--dev-informational?style=flat-square) ![AppVersion: 2.58.0-dev](https://img.shields.io/badge/AppVersion-2.58.0--dev-informational?style=flat-square) A Helm chart for Kubernetes to install DefectDojo diff --git a/tests/announcement_banner_test.py b/tests/announcement_banner_test.py index 051a8fa9319..de17fafe5ef 100644 --- a/tests/announcement_banner_test.py +++ b/tests/announcement_banner_test.py @@ -41,7 +41,7 @@ def disable_announcement(self): def test_create_announcement(self): driver = self.driver driver.get(self.base_url) - self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner")) + self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner:not([data-source])")) text = "Big important announcement, definitely pay attention!" self.enable_announcement(text, dismissable=False, style=self.type) @@ -56,7 +56,7 @@ def test_create_announcement(self): def test_create_dismissable_announcement(self): driver = self.driver driver.get(self.base_url) - self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner")) + self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner:not([data-source])")) text = "Big important announcement, definitely pay don't dismiss this one." self.enable_announcement(text, dismissable=True, style=self.type) @@ -77,7 +77,7 @@ def test_create_dismissable_announcement(self): def test_dismissing_announcement_does_not_dismiss_for_others(self): driver = self.driver driver.get(self.base_url) - self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner")) + self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner:not([data-source])")) text = "Everyone sees this, right?" self.enable_announcement(text, dismissable=True, style=self.type) @@ -103,7 +103,7 @@ def test_dismissing_announcement_does_not_dismiss_for_others(self): def test_announcement_ui_disabled_when_set(self): driver = self.driver driver.get(self.base_url) - self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner")) + self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner:not([data-source])")) text = "The most important announcement of the year." self.enable_announcement(text, dismissable=False, style=self.type) @@ -121,7 +121,7 @@ def test_announcement_ui_disabled_when_set(self): def test_announcement_empty_after_removal(self): driver = self.driver driver.get(self.base_url) - self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner")) + self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner:not([data-source])")) text = "Surely no-one would delete this announcement quickly" self.enable_announcement(text, dismissable=False, style=self.type) @@ -139,7 +139,7 @@ def test_announcement_empty_after_removal(self): def test_html_announcement(self): driver = self.driver driver.get(self.base_url) - self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner")) + self.assertFalse(self.is_element_by_css_selector_present(".announcement-banner:not([data-source])")) text = "Links in announcements? you bet!" self.enable_announcement(text, dismissable=False, style=self.type)