Skip to content

Commit

Permalink
Merge branch 'main' into submission-errors
Browse files Browse the repository at this point in the history
  • Loading branch information
rjsparks authored Oct 16, 2024
2 parents 959c54d + db4ff66 commit 3092211
Show file tree
Hide file tree
Showing 27 changed files with 416 additions and 669 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ jobs:
steps:
- name: Notify on Slack (Success)
if: ${{ !contains(join(needs.*.result, ','), 'failure') }}
uses: slackapi/slack-github-action@v1.26.0
uses: slackapi/slack-github-action@v1.27.0
with:
channel-id: ${{ secrets.SLACK_GH_BUILDS_CHANNEL_ID }}
payload: |
Expand All @@ -358,7 +358,7 @@ jobs:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_GH_BOT }}
- name: Notify on Slack (Failure)
if: ${{ contains(join(needs.*.result, ','), 'failure') }}
uses: slackapi/slack-github-action@v1.26.0
uses: slackapi/slack-github-action@v1.27.0
with:
channel-id: ${{ secrets.SLACK_GH_BUILDS_CHANNEL_ID }}
payload: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-az.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
ssh-keyscan -t rsa $vminfo >> ~/.ssh/known_hosts
- name: Remote SSH into VM
uses: appleboy/ssh-action@029f5b4aeeeb58fdfe1410a5d17f967dacf36262
uses: appleboy/ssh-action@25ce8cbbcb08177468c7ff7ec5cbfa236f9341e1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
path: geckodriver.log

- name: Upload Coverage Results to Codecov
uses: codecov/codecov-action@v4.5.0
uses: codecov/codecov-action@v4.6.0
with:
files: coverage.xml

Expand Down
75 changes: 44 additions & 31 deletions dev/coverage-action/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dev/coverage-action/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"author": "IETF Trust",
"license": "BSD-3-Clause",
"dependencies": {
"@actions/core": "1.10.1",
"@actions/core": "1.11.1",
"@actions/github": "6.0.0",
"lodash": "4.17.21",
"luxon": "3.4.4"
"luxon": "3.5.0"
}
}
14 changes: 7 additions & 7 deletions dev/deploy-to-container/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dev/deploy-to-container/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"nanoid": "5.0.7",
"nanoid-dictionary": "5.0.0-beta.1",
"slugify": "1.6.6",
"tar": "^7.4.0",
"tar": "^7.4.3",
"yargs": "^17.7.2"
},
"engines": {
Expand Down
28 changes: 14 additions & 14 deletions dev/diff/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dev/diff/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"keypress": "^0.2.1",
"listr2": "^6.6.1",
"lodash-es": "^4.17.21",
"luxon": "^3.4.4",
"luxon": "^3.5.0",
"pretty-bytes": "^6.1.1",
"tar": "^7.4.0",
"tar": "^7.4.3",
"yargs": "^17.7.2"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion ietf/api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
# Email alias listing
url(r'^person/email/$', api_views.active_email_list),
# Draft submission API
url(r'^submit/?$', submit_views.api_submit),
url(r'^submit/?$', submit_views.api_submit_tombstone),
# Draft upload API
url(r'^submission/?$', submit_views.api_submission),
# Draft submission state API
Expand Down
58 changes: 44 additions & 14 deletions ietf/iesg/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,18 @@ def test_milestones_needing_review_ordering(self):
group=dated_group,
person=Person.objects.get(user__username='ad'),
)
dated_milestones = DatedGroupMilestoneFactory.create_batch(
2, group=dated_group, state_id="review"
)
dated_milestones = [
DatedGroupMilestoneFactory(
group=dated_group,
state_id="review",
desc="This is the description of one dated group milestone",
),
DatedGroupMilestoneFactory(
group=dated_group,
state_id="review",
desc="This is the description of another dated group milestone",
),
]
dated_milestones[0].due -= datetime.timedelta(days=1) # make this one earlier
dated_milestones[0].save()

Expand All @@ -99,9 +108,18 @@ def test_milestones_needing_review_ordering(self):
group=dateless_group,
person=Person.objects.get(user__username='ad'),
)
dateless_milestones = DatelessGroupMilestoneFactory.create_batch(
2, group=dateless_group, state_id="review"
)
dateless_milestones = [
DatelessGroupMilestoneFactory(
group=dateless_group,
state_id="review",
desc="This is the description of one dateless group milestone",
),
DatelessGroupMilestoneFactory(
group=dateless_group,
state_id="review",
desc="This is the description of another dateless group milestone",
),
]

url = urlreverse("ietf.iesg.views.milestones_needing_review")
self.client.login(username="ad", password="ad+password")
Expand All @@ -111,17 +129,29 @@ def test_milestones_needing_review_ordering(self):

# check order-by-date
dated_tbody = pq(f'td:contains("{dated_milestones[0].desc}")').closest("tbody")
next_td = dated_tbody.find('td:contains("Next")')
self.assertEqual(next_td.siblings()[0].text.strip(), dated_milestones[0].desc)
last_td = dated_tbody.find('td:contains("Last")')
self.assertEqual(last_td.siblings()[0].text.strip(), dated_milestones[1].desc)
rows = list(dated_tbody.items("tr")) # keep as pyquery objects
self.assertTrue(rows[0].find('td:first:contains("Last")')) # Last milestone shown first
self.assertFalse(rows[0].find('td:first:contains("Next")'))
self.assertTrue(rows[0].find(f'td:contains("{dated_milestones[1].desc}")'))
self.assertFalse(rows[0].find(f'td:contains("{dated_milestones[0].desc}")'))

self.assertFalse(rows[1].find('td:first:contains("Last")')) # Last milestone shown first
self.assertTrue(rows[1].find('td:first:contains("Next")'))
self.assertFalse(rows[1].find(f'td:contains("{dated_milestones[1].desc}")'))
self.assertTrue(rows[1].find(f'td:contains("{dated_milestones[0].desc}")'))

# check order-by-order
dateless_tbody = pq(f'td:contains("{dateless_milestones[0].desc}")').closest("tbody")
next_td = dateless_tbody.find('td:contains("Next")')
self.assertEqual(next_td.siblings()[0].text.strip(), dateless_milestones[0].desc)
last_td = dateless_tbody.find('td:contains("Last")')
self.assertEqual(last_td.siblings()[0].text.strip(), dateless_milestones[1].desc)
rows = list(dateless_tbody.items("tr")) # keep as pyquery objects
self.assertTrue(rows[0].find('td:first:contains("Last")')) # Last milestone shown first
self.assertFalse(rows[0].find('td:first:contains("Next")'))
self.assertTrue(rows[0].find(f'td:contains("{dateless_milestones[1].desc}")'))
self.assertFalse(rows[0].find(f'td:contains("{dateless_milestones[0].desc}")'))

self.assertFalse(rows[1].find('td:first:contains("Last")')) # Last milestone shown first
self.assertTrue(rows[1].find('td:first:contains("Next")'))
self.assertFalse(rows[1].find(f'td:contains("{dateless_milestones[1].desc}")'))
self.assertTrue(rows[1].find(f'td:contains("{dateless_milestones[0].desc}")'))


def test_review_decisions(self):
Expand Down
Loading

0 comments on commit 3092211

Please sign in to comment.