apply suggestions from code review

Author: Frzk

test/helpers

@@ -2,9 +2,9 @@
 
 ### Helpers functions
 
-test::helpers::classic_deploy() {
-    # Deploys a classic PHP app step by step and tests that everything is
-    # working as expected.
+test::helpers::common_deploy() {
+    # Deploys a PHP app step by step and tests that everything related to the
+    # PHP setup is as expected.
     # To do so, this function runs the buildpack scripts and mimicks the
     # platform behavior wherever needed.
     #
@@ -13,17 +13,17 @@ test::helpers::classic_deploy() {
     #   default_modules
     #
     # Arguments:
-    #   $1 > $php_version
-    #      See `test::helpers::php`.
+    #   $1 > $detect_expectation
+    #      See `test::helpers::detect`.
     #
-    #   $2 > $nginx_version
-    #      See `test::helpers::nginx`
+    #   $2 > $php_version
+    #      See `test::helpers::php`.
 
-    local php_version="${1}"
-    local nginx_version="${2}"
+    local detect_expectation="${1}"
+    local php_version="${2}"
 
     # Test bin/detect:
-    test::helpers::detect "PHP (classic)"
+    test::helpers::detect "${detect_expectation}"
 
     # Test bin/compile:
     test::helpers::compile
@@ -36,6 +36,28 @@ test::helpers::classic_deploy() {
 
     # Test PHP default modules:
     test::helpers::default_php_modules
+}
+
+test::helpers::classic_deploy() {
+    # Deploys a classic PHP app step by step and tests that everything is
+    # working as expected, including the Nginx version.
+    #
+    # Globals:
+    #   STD_OUT
+    #   default_modules
+    #
+    # Arguments:
+    #   $1 > $php_version
+    #      See `test::helpers::php`.
+    #
+    #   $2 > $nginx_version
+    #      See `test::helpers::nginx`
+
+    local php_version="${1}"
+    local nginx_version="${2}"
+
+    # Test everything related to PHP:
+    test::helpers::common_deploy "PHP (classic)" "${php_version}"
 
     # Test Nginx version:
     test::helpers::nginx "${nginx_version}"
@@ -45,10 +67,7 @@ test::helpers::classic_deploy() {
 
 test::helpers::composer_deploy() {
     # Deploys a Composer PHP app step by step and tests that everything is
-    # working as expected.
-    # To do so, this function runs the buildpack scripts and mimicks the
-    # platform behavior wherever needed.
-    # The different fixtures allow us to test different setup and conditions.
+    # working as expected, including the Nginx and the Composer versions.
     #
     # Globals:
     #   STD_OUT
@@ -68,20 +87,8 @@ test::helpers::composer_deploy() {
     local nginx_version="${2}"
     local composer_version="${3}"
 
-    # Test bin/detect:
-    test::helpers::detect "PHP (composer.json)"
-
-    # Test bin/compile:
-    test::helpers::compile
-
-    # Switch environment:
-    test::helpers::enter_prod
-
-    # Test PHP version:
-    test::helpers::php "${php_version}"
-
-    # Test default PHP defaults modules:
-    test::helpers::default_php_modules
+    # Test everything related to PHP:
+    test::helpers::common_deploy "PHP (composer.json)" "${php_version}"
 
     # Test Nginx version:
     test::helpers::nginx "${nginx_version}"