Enhancement/#11643 - Add amp mode to Google Proxy features request #11774
+35
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Build files for 3a7a560 have been deleted. |
ankitrox
approved these changes
Nov 24, 2025
Collaborator
ankitrox
left a comment
ankitrox
left a comment
There was a problem hiding this comment.
Thank you for the nice work @hussain-t.
This looks good to me. Moving this to MR. 👍🏼
techanvil
requested changes
Nov 24, 2025
Collaborator
techanvil
left a comment
techanvil
left a comment
There was a problem hiding this comment.
Hey @hussain-t, this looks good but it would be nice to avoid the duplication in the tests.
Comment on lines
442
to
482
| public function test_get_features_with_amp_primary() { | ||
| // Remove the filter being added by Modules::register() or any other class during bootstrap. | ||
| remove_all_filters( 'googlesitekit_feature_metrics' ); | ||
|
|
||
| list ( $credentials, $site_id, $site_secret ) = $this->get_credentials(); | ||
|
|
||
| $amp_primary_context = $this->get_amp_primary_context(); | ||
| $google_proxy = new Google_Proxy( $amp_primary_context ); | ||
|
|
||
| $expected_url = $google_proxy->url( Google_Proxy::FEATURES_URI ); | ||
| $expected_success_response = array( | ||
| 'test.featureName' => array( 'enabled' => true ), | ||
| ); | ||
|
|
||
| $this->mock_http_request( $expected_url, $expected_success_response ); | ||
| $google_proxy->get_features( $credentials, new OAuth_Client( $amp_primary_context, null, null, $credentials, $google_proxy ) ); | ||
|
|
||
| // Ensure amp_mode is set to 'primary'. | ||
| $this->assertEquals( 'primary', $this->request_args['body']['amp_mode'], 'Get features request should include primary amp_mode.' ); | ||
| } | ||
|
|
||
| public function test_get_features_with_amp_secondary() { | ||
| // Remove the filter being added by Modules::register() or any other class during bootstrap. | ||
| remove_all_filters( 'googlesitekit_feature_metrics' ); | ||
|
|
||
| list ( $credentials, $site_id, $site_secret ) = $this->get_credentials(); | ||
|
|
||
| $amp_secondary_context = $this->get_amp_secondary_context(); | ||
| $google_proxy = new Google_Proxy( $amp_secondary_context ); | ||
|
|
||
| $expected_url = $google_proxy->url( Google_Proxy::FEATURES_URI ); | ||
| $expected_success_response = array( | ||
| 'test.featureName' => array( 'enabled' => true ), | ||
| ); | ||
|
|
||
| $this->mock_http_request( $expected_url, $expected_success_response ); | ||
| $google_proxy->get_features( $credentials, new OAuth_Client( $amp_secondary_context, null, null, $credentials, $google_proxy ) ); | ||
|
|
||
| // Ensure amp_mode is set to 'secondary'. | ||
| $this->assertEquals( 'secondary', $this->request_args['body']['amp_mode'], 'Get features request should include secondary amp_mode.' ); | ||
| } |
Collaborator
There was a problem hiding this comment.
These tests are duplicates other than the AMP context argument passed to new Google_Proxy(), I'd suggest using a data provider to avoid duplicating the test.
… consolidate feature retrieval logic.
techanvil
approved these changes
Nov 25, 2025
Collaborator
techanvil
left a comment
techanvil
left a comment
There was a problem hiding this comment.
Thanks @hussain-t, that's great. LGTM!
✅
techanvil
deleted the
enhancement/#11643-extend-features-request-amp-mode
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Addresses issue:
Relevant technical choices
PR Author Checklist
Do not alter or remove anything below. The following sections will be managed by moderators only.
Code Reviewer Checklist
Merge Reviewer Checklist