Mock variableService getMacros #26300
Merged
micajuine-ho merged 10 commits intoampproject:masterfrom Feb 14, 2020
Merged
Conversation
4 tasks
zhouyx
suggested changes
Jan 10, 2020
Contributor
Author
|
Added the mock getMacros to We should rerun these tests before merging. |
a1cfeff to
eaf4333
Compare
zhouyx
reviewed
Feb 14, 2020
Contributor
zhouyx
left a comment
There was a problem hiding this comment.
Thank you! The improvement to the test is going to be really helpful!
| if (params) { | ||
| params = '(' + params + ')'; | ||
| } | ||
| return `_${key.replace('$', '')}${params}_`; |
Contributor
There was a problem hiding this comment.
To confirm:
analytics macros like EXAMPLE(FAKE, param1, param2) is replaced to _EXAMPLE(_fake_, param1,param2)_
global macros like CLIENT_ID(param) is replaced with _client_id_
To get the same behavior across all variables, can we please
- Resolve convert analytics macro to lower case as well.
- Include the param value for global variables like CLIENT_ID.
Feel free to address 2 in a separate PR. Thanks.
Contributor
Author
There was a problem hiding this comment.
Added 1 (which solved the double expansion problem actually!)
Will address 2 in a separate PR as part of this project.
eaf4333 to
19166f3
Compare
robinvanopstal
added a commit
to jungvonmatt/amphtml
that referenced
this pull request
Feb 17, 2020
* master: (181 commits) 🏗 Ensure valid flag usage for `gulp` tasks (ampproject#26814) build-system: Fix autocomplete error response (ampproject#26824) application/json is ab allowed type for <script> (ampproject#26815) 🚮 Removing amp-consent-v2 experiment logic (ampproject#26162) Fix more arrow functions that are passed in as "constructors" (ampproject#26795) Variable substitution tester (ampproject#26695) Turn on restrict fullscreen canary (ampproject#26766) Mock variableService getMacros (ampproject#26300) Sync from Google (ampproject#26805) Sync from Google (ampproject#26803) Move video_state macro (ampproject#26212) 🚀 Move ads variables to amp-analytics (ampproject#25113) Sync from Google (ampproject#26800) Sync from Google (ampproject#26798) Sync from Google (ampproject#26792) Another set of example.com change (ampproject#26753) Add PWA multidoc loader to examples (ampproject#26680) 🐛Check for window null before creating tracking pixel (ampproject#26749) trying to update Sauce timeouts (ampproject#26737) 🐛Fixes swipe to dismiss badly ordered swipes on `amp-lightbox-gallery` (ampproject#26788) ... # Conflicts: # extensions/amp-accordion/amp-accordion.md # extensions/amp-bind/amp-bind.md
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
For #26302
Mocked
getMacros(), so that amp-analytics variables get bound to a name transformation, instead of their resolving function:Only 3 vendors in
vendor-requests.jsneeded to be changed.