Skip to content
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

Jump to bottom

Rename master branch in tests #218

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rename master branch in tests #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/git-secrets.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ load test_helper
echo '@todo' > $TEST_REPO/history_failure.txt
git add -A
git commit -m "Testing history"
git checkout master
git checkout main
cd -
repo_run git-secrets --scan-history
[ $status -eq 1 ]
Expand Down
4 changes: 2 additions & 2 deletions test/prepare-commit-msg.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ load test_helper
echo 'Fixing!' > data.txt
git add -A
git commit -m 'Fixing commit'
git checkout master
git checkout main
run git merge --no-ff feature
[ $status -eq 1 ]
}
Expand All @@ -27,7 +27,7 @@ load test_helper
echo 'Not bad' > data.txt
git add -A
git commit -m 'Good commit'
git checkout master
git checkout main
run git merge --no-ff feature
[ $status -eq 0 ]
}
2 changes: 1 addition & 1 deletion test/test_helper.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ setup_repo() {
delete_repo
mkdir -p $TEST_REPO
cd $TEST_REPO
git init --initial-branch=master
git init --initial-branch=main
git config --local --add secrets.patterns '@todo'
git config --local --add secrets.patterns 'forbidden|me'
git config --local --add secrets.patterns '#hash'
Expand Down