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.

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

caddytest: Refactor Caddyfile adapt tests to separate files #3398

Merged
merged 4 commits into from
May 14, 2020

Conversation

francislavoie
Copy link
Member

@francislavoie francislavoie commented May 12, 2020

I decided to refactor the Caddyfile adapt tests from the one big file to a directory of text files with Caddyfile input and JSON output, separated by ---------- (10 dashes).

Should make it easier to read and edit tests, and we'll avoid the constant merge conflicts between MRs that keep trying to modify that test file 😛

I'm sorry that the diff looks super wacky on this one. Git doesn't like it lol

@francislavoie francislavoie requested review from sarge and mholt May 12, 2020 01:03
@francislavoie francislavoie added this to the 2.1 milestone May 12, 2020

Verified

This commit was signed with the committer’s verified signature.
targos Michaël Zasso
@mholt mholt added the under review 🧐 Review is pending before merging label May 12, 2020
@sarge
Copy link
Collaborator

sarge commented May 13, 2020

LGTM

@mholt mholt removed the under review 🧐 Review is pending before merging label May 14, 2020
@francislavoie francislavoie merged commit bde3823 into caddyserver:master May 14, 2020
@francislavoie francislavoie deleted the adapt-test-refactor branch May 14, 2020 21:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants