Skip to content

Commit b7e8fdf

Browse files
committed
fix: fix function calls following renaming
1 parent 5029101 commit b7e8fdf

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

test/helpers

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
### Helpers functions
44

5-
test::helpers::test_deploy() {
5+
test::helpers::deploy() {
66
# Deploys a PHP app step by step and tests that everything is working as
77
# expected.
88
# To do so, this function runs the buildpack scripts and mimicks the
@@ -24,17 +24,17 @@ test::helpers::test_deploy() {
2424
local version="${2}"
2525

2626
# Test that bin/detect works as expected:
27-
test::helpers::test_detect "${detect_expectation}"
27+
test::helpers::detect "${detect_expectation}"
2828

2929
# Test that bin/compile works as expected:
30-
test::helpers::test_compile "${version}"
30+
test::helpers::compile "${version}"
3131

3232
# Test that all default PHP modules are available:
33-
test::helpers::test_default_modules
33+
test::helpers::default_modules
3434
}
3535

3636
test::helpers::detect() {
37-
# Runs the `bin/detect`script of the buildpack and then:
37+
# Runs the `bin/detect` script of the buildpack and then:
3838
# - Asserts that it succeeded
3939
# - Asserts that the output equals what's expected.
4040
#

test/tests

+18-18
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ test::classic::defaults() {
2121
# With default settings
2222

2323
test::utils::setupFixture "classic_default"
24-
test::helpers::test_deploy "PHP (classic)" "8.1."
24+
test::helpers::deploy "PHP (classic)" "8.1."
2525
}
2626

2727
test::classic::php80() {
@@ -38,7 +38,7 @@ test::classic::php80() {
3838
fi
3939

4040
test::utils::setupFixture "classic_default"
41-
test::helpers::test_deploy "PHP (classic)" "8.0."
41+
test::helpers::deploy "PHP (classic)" "8.0."
4242
}
4343

4444
test::classic::php81() {
@@ -49,7 +49,7 @@ test::classic::php81() {
4949
export PHP_VERSION
5050

5151
test::utils::setupFixture "classic_default"
52-
test::helpers::test_deploy "PHP (classic)" "8.1."
52+
test::helpers::deploy "PHP (classic)" "8.1."
5353
}
5454

5555
test::classic::php82() {
@@ -60,7 +60,7 @@ test::classic::php82() {
6060
export PHP_VERSION
6161

6262
test::utils::setupFixture "classic_default"
63-
test::helpers::test_deploy "PHP (classic)" "8.2."
63+
test::helpers::deploy "PHP (classic)" "8.2."
6464
}
6565

6666
test::classic::php83() {
@@ -71,15 +71,15 @@ test::classic::php83() {
7171
export PHP_VERSION
7272

7373
test::utils::setupFixture "classic_default"
74-
test::helpers::test_deploy "PHP (classic)" "8.3."
74+
test::helpers::deploy "PHP (classic)" "8.3."
7575
}
7676

7777
test::composer::defaults() {
7878
# Test a deployment of a PHP app using Composer
7979
# With default settings
8080

8181
test::utils::setupFixture "composer_default"
82-
test::helpers::test_deploy "PHP (composer.json)" "8.1."
82+
test::helpers::deploy "PHP (composer.json)" "8.1."
8383
}
8484

8585
test::composer::php80() {
@@ -93,31 +93,31 @@ test::composer::php80() {
9393
fi
9494

9595
test::utils::setupFixture "composer_php80"
96-
test::helpers::test_deploy "PHP (composer.json)" "8.0."
96+
test::helpers::deploy "PHP (composer.json)" "8.0."
9797
}
9898

9999
test::composer::php81() {
100100
# Test a deployment of a PHP app using Composer
101101
# Specifying we want PHP 8.1.x in composer.json
102102

103103
test::utils::setupFixture "composer_php81"
104-
test::helpers::test_deploy "PHP (composer.json)" "8.1."
104+
test::helpers::deploy "PHP (composer.json)" "8.1."
105105
}
106106

107107
test::composer::php82() {
108108
# Test a deployment of a PHP app using Composer
109109
# Specifying we want PHP 8.2.x in composer.json
110110

111111
test::utils::setupFixture "composer_php82"
112-
test::helpers::test_deploy "PHP (composer.json)" "8.2."
112+
test::helpers::deploy "PHP (composer.json)" "8.2."
113113
}
114114

115115
test::composer::php83() {
116116
# Test a deployment of a PHP app using Composer
117117
# Specifying we want PHP 8.3.x in composer.json
118118

119119
test::utils::setupFixture "composer_php83"
120-
test::helpers::test_deploy "PHP (composer.json)" "8.3."
120+
test::helpers::deploy "PHP (composer.json)" "8.3."
121121
}
122122

123123
test::composer::php_version_defaults() {
@@ -128,10 +128,10 @@ test::composer::php_version_defaults() {
128128
export PHP_VERSION
129129

130130
test::utils::setupFixture "composer_default"
131-
test::helpers::test_compile "8.3."
131+
test::helpers::compile "8.3."
132132
}
133133

134-
test::composer::php_version_lower_than_env() {
134+
test::composer::php_version_greater_than_env() {
135135
# Test a deployment of a PHP app using Composer
136136
# Where the PHP version requirement is specified in both composer.json
137137
# and PHP_VERSION.
@@ -142,10 +142,10 @@ test::composer::php_version_lower_than_env() {
142142
export PHP_VERSION
143143

144144
test::utils::setupFixture "composer_php83"
145-
test::helpers::test_compile "8.3."
145+
test::helpers::compile "8.3."
146146
}
147147

148-
test::composer::php_version_greater_than_env() {
148+
test::composer::php_version_lower_than_env() {
149149
# Test a deployment of a PHP app using Composer
150150
# Where PHP version requirement is specified in both composer.json
151151
# and PHP_VERSION.
@@ -156,7 +156,7 @@ test::composer::php_version_greater_than_env() {
156156
export PHP_VERSION
157157

158158
test::utils::setupFixture "composer_php82"
159-
test::helpers::test_compile "8.2."
159+
test::helpers::compile "8.2."
160160
}
161161

162162

@@ -174,7 +174,7 @@ suite_addTest test::composer::php81
174174
suite_addTest test::composer::php82
175175
suite_addTest test::composer::php83
176176

177-
suite_addTest test::composer::over_defaults
178-
suite_addTest test::composer::over_lower_env
179-
suite_addTest test::composer::over_greater_env
177+
suite_addTest test::composer::php_version_defaults
178+
suite_addTest test::composer::php_version_greater_than_env
179+
suite_addTest test::composer::php_version_lower_than_env
180180

0 commit comments

Comments
 (0)