Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions .github/workflows/pull-req.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,19 @@ jobs:
# * PRs to master
# * PRs to dev that are not draft
# * PRs to dev on branches created by dependabot
if: "${{
github.event_name == 'pull_request' && (
github.event.action == 'review_requested' ||
github.base_ref == 'master' ||
(github.base_ref == 'dev' && (
github.event.pull_request.draft == false ||
startsWith(github.head_ref, 'dependabot/')
))
)
}}"
# DO NOT MERGE THIS INTO DEV
# REMOVE COMMENTS BEFORE MERGING TO DEV!!!!!!!!!!!
# TODO
# if: "${{
# github.event_name == 'pull_request' && (
# github.event.action == 'review_requested' ||
# github.base_ref == 'master' ||
# (github.base_ref == 'dev' && (
# github.event.pull_request.draft == false ||
# startsWith(github.head_ref, 'dependabot/')
# ))
# )
# }}"
uses: ./.github/workflows/node-ci.yml
with:
e2e: true
Expand Down
5 changes: 3 additions & 2 deletions __tests__/end-to-end.js
Original file line number Diff line number Diff line change
Expand Up @@ -1145,7 +1145,7 @@ describe('end-to-end', () => {
// this test also sets the feed source as deployable
makeTestPostFeedSource('should process fetched gtfs', async () => {
// navigate to feed source settings
await click('#feed-source-viewer-tabs-tab-settings')
await click('[id="feed-source-viewer-tabs-tab-settings"]')

// make feed source deployable
await waitForAndClick(
Expand All @@ -1161,7 +1161,7 @@ describe('end-to-end', () => {
await wait(2000, 'for feed source to update')

// go back to feed source GTFS tab
await click('#feed-source-viewer-tabs-tab-')
await click('[id="feed-source-viewer-tabs-tab-gtfs"]')
// Open dropdown
await waitForAndClick(
'#bg-nested-dropdown',
Expand Down Expand Up @@ -2424,6 +2424,7 @@ describe('end-to-end', () => {
}, defaultTestTimeout, 'should create fare')
})

// fares v2 tests
describe('fares v2', () => {
makeEditorEntityTest('should create fare media', async () => {
// open fares v2 sidebar
Expand Down
Loading