Skip to content

Commit ca791cb

Browse files
Adjust tests for pull request detection to just look at truthyness
1 parent dd927ed commit ca791cb

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

t/tests.lisp

+14-14
Original file line numberDiff line numberDiff line change
@@ -11,56 +11,56 @@
1111
(is-false (member :circleci *features*))
1212
(is (eq :travis-ci (platform)))
1313
(is (string= (uiop:getenv "TRAVIS_BRANCH") (branch)))
14-
(is (eq (uiop:getenvp "TRAVIS_PULL_REQUEST_BRANCH")
15-
(pull-request-p))))
14+
(is (eq (null (uiop:getenvp "TRAVIS_PULL_REQUEST_BRANCH"))
15+
(null (pull-request-p)))))
1616

1717
(test :circleci-tests
1818
(is-true (member :circleci *features*))
1919
(is-false (member :travis-ci *features*))
2020
(is (eq :circleci (platform)))
2121
(is (string= (uiop:getenv "CIRCLE_BRANCH") (branch)))
22-
(is (eq (uiop:getenvp "CIRCLE_PULL_REQUEST")
23-
(pull-request-p))))
22+
(is (eq (null (uiop:getenvp "CIRCLE_PULL_REQUEST"))
23+
(null (pull-request-p)))))
2424

2525
(test :appveyor-tests
2626
(is-true (member :appveyor *features*))
2727
(is-false (member :circleci *features*))
2828
(is (eq :appveyor (platform)))
2929
(is (string= (uiop:getenv "APPVEYOR_REPO_BRANCH") (branch)))
30-
(is (eq (uiop:getenvp "APPVEYOR_PULL_REQUEST_NUMBER")
31-
(pull-request-p))))
30+
(is (eq (null (uiop:getenvp "APPVEYOR_PULL_REQUEST_NUMBER"))
31+
(null (pull-request-p)))))
3232

3333
(test :gitlab-ci-tests
3434
(is-true (member :gitlab-ci *features*))
3535
(is-false (member :circleci *features*))
3636
(is (eq :gitlab-ci (platform)))
3737
(is (string= (uiop:getenv "CI_COMMIT_REF_NAME") (branch)))
38-
(is (eq (uiop:getenvp "CI_MERGE_REQUEST_ID")
39-
(pull-request-p))))
38+
(is (eq (null (uiop:getenvp "CI_MERGE_REQUEST_ID"))
39+
(null (pull-request-p)))))
4040

4141
(test :bitbucket-pipelines-tests
4242
(is-true (member :bitbucket-pipelines *features*))
4343
(is-false (member :circleci *features*))
4444
(is (eq :bitbucket-pipelines (platform)))
4545
(is (string= (uiop:getenv "BITBUCKET_BRANCH") (branch)))
46-
(is (eq (uiop:getenvp "BITBUCKET_PR_ID")
47-
(pull-request-p))))
46+
(is (eq (null (uiop:getenvp "BITBUCKET_PR_ID"))
47+
(null (pull-request-p)))))
4848

4949
(test :azure-pipelines-tests
5050
(is-true (member :azure-pipelines *features*))
5151
(is-false (member :circleci *features*))
5252
(is (eq :azure-pipelines (platform)))
5353
(is (string= (uiop:getenv "BUILD_SOURCEBRANCHNAME") (branch)))
54-
(is (eq (uiop:getenvp "SYSTEM_PULLREQUEST_PULLREQUESTID")
55-
(pull-request-p))))
54+
(is (eq (null (uiop:getenvp "SYSTEM_PULLREQUEST_PULLREQUESTID"))
55+
(null (pull-request-p)))))
5656

5757
(test :github-actions-tests
5858
(is-true (member :github-actions *features*))
5959
(is-false (member :circleci *features*))
6060
(is (eq :github-actions (platform)))
6161
(is (string= (subseq (uiop:getenv "GITHUB_REF") 11) (branch)))
62-
(is (eq (string= "pull_request" (uiop:getenvp "GITHUB_EVENT_NAME"))
63-
(pull-request-p))))
62+
(is (eq (null (string= "pull_request" (uiop:getenvp "GITHUB_EVENT_NAME")))
63+
(null (pull-request-p)))))
6464

6565
(test :base-tests
6666
(is-true (member :ci *features*))

0 commit comments

Comments
 (0)