Skip to content

[NO QA] Fix tests/unit/getPullRequestsMergedBetweenTest.sh #7134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roryabraham merged 4 commits into from
Jan 13, 2022
+12 −3
Merged

[NO QA] Fix tests/unit/getPullRequestsMergedBetweenTest.sh #7134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6feeec8
Fix locally
AndrewGable Jan 11, 2022
6ad3957
Add back to test workflow
AndrewGable Jan 11, 2022
cb0f48b
Add test git config
AndrewGable Jan 11, 2022
3a42e30
Merge branch 'main' into andrew-sign-test
AndrewGable Jan 12, 2022
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
6 changes: 5 additions & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ jobs:
max_attempts: 5
command: npm ci

- run: npm run test
- name: Jest Unit Tests
run: npm run test
env:
CI: true

- name: Pull Request Tests
run: tests/unit/getPullRequestsMergedBetweenTest.sh
9 changes: 7 additions & 2 deletions tests/unit/getPullRequestsMergedBetweenTest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Fail immediately if there is an error thrown
set -e

TEST_DIR=$(dirname "$(dirname "$(cd "$(dirname "$0")" || exit 1;pwd)/$(basename "$0")")")
DUMMY_DIR="$HOME/DumDumRepo"
getPullRequestsMergedBetween="$TEST_DIR/utils/getPullRequestsMergedBetween.js"
Expand Down Expand Up @@ -53,6 +56,8 @@ fi

info "Initializing Git repo..."
git init -b main
git config user.email "test@test.com"
git config user.name "test"
git add package.json package-lock.json
git commit -m "Initial commit"

Expand Down Expand Up @@ -226,8 +231,8 @@ success "Bumped version to 1.1.1 on main!"
info "Cherry picking PR #7 and the version bump to staging..."
git checkout staging
git checkout -b cherry-pick-staging-7
git cherry-pick -S -x --mainline 1 --strategy=recursive -Xtheirs "$PR_7_MERGE_COMMIT"
git cherry-pick -S -x --mainline 1 "$VERSION_BUMP_MERGE_COMMIT"
git cherry-pick -x --mainline 1 --strategy=recursive -Xtheirs "$PR_7_MERGE_COMMIT"
git cherry-pick -x --mainline 1 "$VERSION_BUMP_MERGE_COMMIT"
git checkout staging
git merge cherry-pick-staging-7 --no-ff -m "Merge pull request #9 from Expensify/cherry-pick-staging-7"
git branch -d cherry-pick-staging-7
Expand Down