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
4 changes: 2 additions & 2 deletions test/defaults
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ declare -gA latest_composer

# Defaults for scalingo-22:
default_php["scalingo-22"]="8.4." # This one depends on the semver stable rule configuration
default_nginx["scalingo-22"]="1.28."
default_nginx["scalingo-22"]="1.30."
default_composer["scalingo-22"]="2.9."
latest_composer["scalingo-22"]="2.9.7"

# Defaults for scalingo-24:
default_php["scalingo-24"]="8.4."
default_nginx["scalingo-24"]="1.28."
default_nginx["scalingo-24"]="1.30."
default_composer["scalingo-24"]="2.9."
latest_composer["scalingo-24"]="2.9.7"

Expand Down
18 changes: 0 additions & 18 deletions test/fixtures/nginx-1.21.6/composer/composer.lock

This file was deleted.

9 changes: 0 additions & 9 deletions test/fixtures/nginx-1.22.1/composer/composer.json

This file was deleted.

18 changes: 0 additions & 18 deletions test/fixtures/nginx-1.22.1/composer/composer.lock

This file was deleted.

9 changes: 0 additions & 9 deletions test/fixtures/nginx-1.28.0/composer/composer.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"extra": {
"paas": {
"engines": {
"nginx": "1.21.6"
"nginx": "1.30.0"
}
}
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions test/nginx
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
test::nginx::classic() {
#
# Test a deployment of a classic app (not using Composer)
# Specifying we want Nginx 1.22.1 via environment
# Specifying we want Nginx 1.30.0 via environment
# We don't test every step here, we just test that the Nginx version is
# the one expected.
#

NGINX_VERSION="1.28.0"
NGINX_VERSION="1.30.0"
export NGINX_VERSION

test::utils::setupFixture "defaults/classic"
test::utils::compile
test::helpers::enter_prod

test::helpers::nginx "1.28.0"
test::helpers::nginx "1.30.0"
}

test::nginx::composer() {
Expand All @@ -28,11 +28,11 @@ test::nginx::composer() {
# Specifying the nginx version only via composer.json
#

test::utils::setupFixture "nginx-1.28.0/composer"
test::utils::setupFixture "nginx-1.30.0/composer"
test::utils::compile
test::helpers::enter_prod

test::helpers::nginx "1.28.0"
test::helpers::nginx "1.30.0"
}

#test::composer::nginx_version_via_env() {
Expand All @@ -59,14 +59,14 @@ test::nginx::composer_over_lower_classic() {
# specified in NGINX_VERSION.
#

NGINX_VERSION="1.28.0"
NGINX_VERSION="1.29.0"
export NGINX_VERSION

test::utils::setupFixture "nginx-1.29.0/composer"
test::utils::setupFixture "nginx-1.30.0/composer"
test::utils::compile
test::helpers::enter_prod

test::helpers::nginx "1.29.0"
test::helpers::nginx "1.30.0"
}

test::nginx::composer_over_higher_classic() {
Expand All @@ -77,12 +77,12 @@ test::nginx::composer_over_higher_classic() {
# specified in NGINX_VERSION.
#

NGINX_VERSION="1.29.0"
NGINX_VERSION="1.30.0"
export NGINX_VERSION

test::utils::setupFixture "nginx-1.28.0/composer"
test::utils::setupFixture "nginx-1.29.0/composer"
test::utils::compile
test::helpers::enter_prod

test::helpers::nginx "1.28.0"
test::helpers::nginx "1.29.0"
}
Loading