Skip to content
Merged
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
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "test/bats"]
path = test/bats
url = https://github.com/sstephenson/bats
url = https://github.com/bats-core/bats-core
[submodule "test/test_helper/bats-support"]
path = test/test_helper/bats-support
url = https://github.com/ztombol/bats-support
url = https://github.com/bats-core/bats-support
[submodule "test/test_helper/bats-assert"]
path = test/test_helper/bats-assert
url = https://github.com/ztombol/bats-assert
url = https://github.com/bats-core/bats-assert
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ Please note we have a code of conduct, please follow it in all your interactions
- Fork this repository
- Create a new feature branch for a new functionality or bugfix
- Code...
- Add integration tests in test/tests.bats
- Add integration tests in test/*.bats
- Use `make` to build image locally and run tests
- Document your improvements
- Commit your changes
- Push your code and open a new pull request
- Use [issues](https://github.com/hardware/mailserver/issues) for any questions
- Use [issues](https://github.com/mailserver2/mailserver/issues) for any questions

## Licensing

Expand Down
2 changes: 1 addition & 1 deletion test/bats
Submodule bats updated 371 files
8 changes: 4 additions & 4 deletions test/ldap.bats
Original file line number Diff line number Diff line change
Expand Up @@ -284,25 +284,25 @@ load 'test_helper/bats-assert/load'
assert_output 1
}

@test "checking smtp: delivers mail to existing forward (ldap configuration)" {
@test "checking smtp: delivers mail to existing forward to john.doe (ldap configuration)" {
run docker exec mailserver_ldap /bin/sh -c "grep 'to=<john.doe@domain.tld>, orig_to=<hostmaster@domain.tld>' /var/log/mail.log | grep 'status=sent' | wc -l"
assert_success
assert_output 1
}

@test "checking smtp: delivers mail to existing alias (ldap configuration)" {
@test "checking smtp: delivers mail to existing alias to john.doe (ldap configuration)" {
run docker exec mailserver_ldap /bin/sh -c "grep 'to=<john.doe@domain.tld>, orig_to=<postmaster@domain.tld>' /var/log/mail.log | grep 'status=sent' | wc -l"
assert_success
assert_output 1
}

@test "checking smtp: delivers mail to existing forward (ldap configuration)" {
@test "checking smtp: delivers mail to existing forward to john.connor (ldap configuration)" {
run docker exec mailserver_ldap /bin/sh -c "grep 'to=<john.connor@domain.tld>, orig_to=<hostmaster@domain.tld>' /var/log/mail.log | grep 'status=sent' | wc -l"
assert_success
assert_output 1
}

@test "checking smtp: delivers mail to existing alias (ldap configuration)" {
@test "checking smtp: delivers mail to existing alias to john.connor (ldap configuration)" {
run docker exec mailserver_ldap /bin/sh -c "grep 'to=<john.connor@domain.tld>, orig_to=<postmaster@domain.tld>' /var/log/mail.log | grep 'status=sent' | wc -l"
assert_success
assert_output 1
Expand Down
2 changes: 1 addition & 1 deletion test/test_helper/bats-assert
Submodule bats-assert updated 45 files
+37 −0 .github/workflows/release.yml
+25 −0 .github/workflows/sync-default-branch.yml
+9 −0 .github/workflows/test.yml
+4 −0 .gitignore
+0 −8 .travis.yml
+0 −39 CHANGELOG.md
+570 −188 README.md
+22 −0 docs/CONTRIBUTING.md
+32 −0 load.bash
+36 −0 package-lock.json
+45 −4 package.json
+0 −6 script/install-bats.sh
+29 −707 src/assert.bash
+42 −0 src/assert_equal.bash
+86 −0 src/assert_failure.bash
+298 −0 src/assert_line.bash
+42 −0 src/assert_not_equal.bash
+247 −0 src/assert_output.bash
+54 −0 src/assert_regex.bash
+47 −0 src/assert_success.bash
+42 −0 src/refute.bash
+341 −0 src/refute_line.bash
+243 −0 src/refute_output.bash
+64 −0 src/refute_regex.bash
+0 −50 test/50-assert-12-assert_equal.bats
+0 −36 test/50-assert-13-assert_success.bats
+0 −69 test/50-assert-14-assert_failure.bats
+0 −242 test/50-assert-15-assert_output.bats
+8 −7 test/assert.bats
+62 −0 test/assert_equal.bats
+94 −0 test/assert_failure.bats
+183 −139 test/assert_line.bats
+57 −0 test/assert_not_equal.bats
+306 −0 test/assert_output.bats
+97 −0 test/assert_regex.bats
+308 −0 test/assert_stderr.bats
+374 −0 test/assert_stderr_line.bats
+58 −0 test/assert_success.bats
+7 −7 test/refute.bats
+170 −147 test/refute_line.bats
+126 −83 test/refute_output.bats
+108 −0 test/refute_regex.bats
+252 −0 test/refute_stderr.bats
+366 −0 test/refute_stderr_line.bats
+27 −7 test/test_helper.bash
Loading