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

tests(helpers): separate server mock functions #13630

Merged
merged 4 commits into from
Sep 10, 2024
Merged

Conversation

chronolaw
Copy link
Contributor

@chronolaw chronolaw commented Sep 6, 2024

Summary

KAG-5254

Checklist

  • The Pull Request has tests
  • A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md
  • There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Issue reference

Fix #[issue number]

@github-actions github-actions bot added the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Sep 6, 2024
@chronolaw chronolaw marked this pull request as ready for review September 6, 2024 08:54
@Tieske
Copy link
Member

Tieske commented Sep 6, 2024

please validate that the documentation still renders properly when changing those helper files.

cd spec
ldoc .

should render the docs properly. Users access this through pongo docs.

@chronolaw
Copy link
Contributor Author

chronolaw commented Sep 6, 2024

please validate that the documentation still renders properly when changing those helper files.

cd spec
ldoc .

should render the docs properly. Users access this through pongo docs.

It seems that ldoc did not access spec/details directory and lose module information in it.
Shoud we change config.ld?

@Tieske
Copy link
Member

Tieske commented Sep 8, 2024

please validate that the documentation still renders properly when changing those helper files.

cd spec
ldoc .

should render the docs properly. Users access this through pongo docs.

It seems that ldoc did not access spec/details directory and lose module information in it. Shoud we change config.ld?

Yup, looks like we need to add those files from their contents

@chronolaw
Copy link
Contributor Author

chronolaw commented Sep 9, 2024

I think that I have found the solution:

  • add module definition header in each separated lua file
  • edit config.ld, add "./details" in file
  • edit config.ld, add merge=true

I will create another PR to fix the doc, do you think it is OK?
#13636

@ADD-SP ADD-SP merged commit 1989ea7 into master Sep 10, 2024
25 checks passed
@ADD-SP ADD-SP deleted the tests/clean_helper_server branch September 10, 2024 09:25
@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-13630-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13630-to-master-to-upstream
git checkout -b cherry-pick-13630-to-master-to-upstream
ancref=$(git merge-base 5ac6e1e541dd9d7219044f500b7954892c49dcf0 61012aaa6ab0dc4213f73f139ec070a326ceb113)
git cherry-pick -x $ancref..61012aaa6ab0dc4213f73f139ec070a326ceb113

@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Sep 10, 2024
@AndyZhang0707 AndyZhang0707 removed the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Sep 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee size/XL skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants