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

fix: Composer prevails over env for Nginx and Composer too #409

Merged
merged 6 commits into from
Feb 16, 2024

Conversation

Frzk
Copy link
Contributor

@Frzk Frzk commented Feb 15, 2024

Add tests to check that:

  • The default Nginx version is installed if nothing is specified (this version is different in scalingo-20 and scalingo-22).
  • The user can specify an Nginx version by using NGINX_VERSION
  • The user can specify an Nginx version by using composer.json
  • Using composer.json will always prevail over NGINX_VERSION if both are set.
  • The default Composer version is installed if the app is not a Classic PHP app.
  • The user can specify a Composer version by using NGINX_VERSION
  • The user can specify a Composer version by using composer.json
  • Using composer.json will always prevail over NGINX_VERSION if both are set.

I had to make quite a few changes to be able to do that in a way that follows the testing logic we have.

@Frzk Frzk self-assigned this Feb 15, 2024
@Frzk Frzk marked this pull request as ready for review February 15, 2024 14:47
@Frzk Frzk requested a review from EtienneM February 15, 2024 14:51
EtienneM
EtienneM previously approved these changes Feb 16, 2024
Copy link
Member

@EtienneM EtienneM left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a couple of suggestions, but already approving the PR

# No Composer
}

test::helpers::composer_deploy() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion(non-blocking): with both composer_deploy and classic_deploy sharing most of the code base, we could create a common function named test::helpers::deploy_common that is called by these functions.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, applied in 4217951

Frzk and others added 3 commits February 16, 2024 11:04
Co-authored-by: Étienne M. <EtienneM@users.noreply.github.com>
@Frzk Frzk requested a review from EtienneM February 16, 2024 10:38
@Frzk Frzk merged commit 14611dd into master Feb 16, 2024
2 checks passed
@Frzk Frzk deleted the tests/composer_prevails branch February 16, 2024 12:55
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.

2 participants