diff --git a/.github/workflows/pull-req.yml b/.github/workflows/pull-req.yml index b3844939f..bcdecc4c1 100644 --- a/.github/workflows/pull-req.yml +++ b/.github/workflows/pull-req.yml @@ -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 diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js index f9a7c4bef..16cdf44ea 100644 --- a/__tests__/end-to-end.js +++ b/__tests__/end-to-end.js @@ -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( @@ -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', @@ -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