Skip to content

WAF: Make Tests Pass #28185

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.

Sign up for GitHub

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

Merged
nateweller merged 10 commits into from
Jan 9, 2023
Merged

WAF: Make Tests Pass #28185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e285d1d
Remove outdated test
nateweller Jan 4, 2023
008aba1
Add missing package requirement
nateweller Jan 5, 2023
ce59989
changelog
nateweller Jan 5, 2023
6cf2ef5
Update changelog
nateweller Jan 5, 2023
69338b7
Merge branch 'trunk' into fix/waf-tests
nateweller Jan 9, 2023
6e5ad56
Update lock files
nateweller Jan 9, 2023
450211d
changelog
nateweller Jan 9, 2023
5c7b10d
Update projects/packages/waf/composer.json
nateweller Jan 9, 2023
1016dde
Merge branch 'trunk' into fix/waf-tests
nateweller Jan 9, 2023
1145ab3
Update composer.lock files
nateweller Jan 9, 2023
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: 4 additions & 0 deletions projects/packages/waf/changelog/fix-waf-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

Fixed the WAF package's PHP tests and Composer requirements
1 change: 1 addition & 0 deletions projects/packages/waf/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"type": "jetpack-library",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-status": "@dev",
"wikimedia/aho-corasick": "^1.0"
},
"require-dev": {
Expand Down
18 changes: 0 additions & 18 deletions projects/packages/waf/tests/php/test-waf-runtime-targets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,24 +450,6 @@ public function testNormalizeRequestUri() {
);
}

/**
* Test using REMOTE_ADDR target
*/
public function testNormalizeRemoteAddr() {
$request = $this->mock_request( array( 'remote_addr' => 'test_remote_addr' ) );
$runtime = new Waf_Runtime( new Waf_Transforms(), new Waf_Operators(), $request );
$values = $runtime->normalize_targets( array( 'remote_addr' => array() ) );
$this->assertCount( 1, $values );
$this->assertContains(
array(
'name' => 'remote_addr',
'value' => 'test_remote_addr',
'source' => 'remote_addr',
),
$values
);
}

/**
* Test using REQUEST_BODY target
*/
Expand Down
4 changes: 4 additions & 0 deletions projects/plugins/jetpack/changelog/fix-waf-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: other

Updated composer.lock
3 changes: 2 additions & 1 deletion projects/plugins/jetpack/composer.lock
View file
Open in desktop

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

4 changes: 4 additions & 0 deletions projects/plugins/protect/changelog/fix-waf-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

Updated composer.lock
3 changes: 2 additions & 1 deletion projects/plugins/protect/composer.lock
View file
Open in desktop

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