🐛 Resolve conflicts for "Fix amp-video custom poster fit with different aspect ratio #36845"
#26
Conversation
This file contains 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
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Don't focus on the current story until the animation ends * Fix lint errors
…9856) * Fix for newly broken Chromedriver issues * Use the Chrome version installed by CircleCI in `amp visual-diff` * Disable flaky tests
… shadow AMP document` (#39860)
…9861) * Parallelize `dist` builds on CircleCI * Consolidate all the different `dist` jobs in CircleCI under a reusuable file * Split browser tests by test type
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
… visual-diff edge-case (#39878)
* Attempt at deflaking amp-consent tests * Disable flaky test * Disable flaky test
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Add Dock UI fullscreen button support * small fix * add break at end of switch statement * fix lint * update test
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
… Tests` jobs on CircleCI (#39891)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* 📦 Update dependency codecov to v5 * Forward fix codecov parameters in circleci config * Tag-along fix for cache saving config --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Daniel Rozenberg <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Fix amp-story-player panel next/prev button in Chrome * Change ancestor selector to child selector
* feat(new variables): 🛠 Adds new analytics variables for Navegg vendor * feat(new variables): 🛠 Adjust optional variables validation * feat(new variables): 🛠 Fix navegg URL version parameter * feat(AMP new variables): 🛠 Ensure new variables value * feat(AMP new variables): 🛠 Test fix, params adjust
* 📦 Update dependency chromedriver to v131 * Disable flaky tests * Disable flaky tests * Disable flaky tests * Disable flaky tests --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Daniel Rozenberg <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…0213) * 📦 Update dependency chromedriver to v131 * switch to realWin to resolve scheme-less url to the correct hostname something changed recently with Url Parsing in Chrome or something in the FakeWin implementation is causign it to not resolve properly. Quick fix seems to be to switch it to a real window * try out the disable feature * rename to requestClose * undo skip to test which tests are still failing * add back skip * try w/o closewatcher * Update test/unit/utils/test-close-watcher-impl.js Co-authored-by: Daniel Rozenberg <[email protected]> * Update test/unit/utils/test-close-watcher-impl.js Co-authored-by: Daniel Rozenberg <[email protected]> * Update test/unit/utils/test-close-watcher-impl.js Co-authored-by: Daniel Rozenberg <[email protected]> * Update test/unit/utils/test-close-watcher-impl.js Co-authored-by: Daniel Rozenberg <[email protected]> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Daniel Rozenberg <[email protected]>
…ent > clicking tabs between multiple social-shares and opens on "enter" keypress` (#40217)
* Stop to load pv endpoint from AMP stories * Stop to load pv endpoint from AMP stories
* add validation for amp-social-share in amp-story * Add amp-story with amp-social-share example * Update amp-story with amp-social-share example * Add TODO * add validation for amp-social-share in amp-story * Add amp-story with amp-social-share example * Update amp-story with amp-social-share example * Add TODO * Follow the fix instructions on the failed test
this was fixed in #40218
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* cl/610820873 Fix validation for unexpected attribute name starting with = * cl/614818595 Fix validation for duplicate attribute names * cl/713373388 Two-way sync for PR #40094. No-op, or fixes merge conflicts, if any. * Update some files that failed validator test * Update some files that failed validator test
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* 📦 Update dependency puppeteer-core to v24 * Fixes for changed type information --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Daniel Rozenberg <[email protected]>
* unskip carousel e2e tests * remove failing tests on CI
The `src` attribute is banned in the email spec.
… new cookiematching (#40245) * Updated configu to include GDPR in pageview and added ADFORM and MEDIAMATH cookie matching 1. Added GDPR Consent to Pageview 2. Added ADFORM Cookie Matching 3. Added MEDIAMATH Cookie Matching * Fix calls in vendors requests for neodata * minor fix pageview call for Neodata * fix calls * fix call's placeholders for neodata config * fix cmDbm call for neodata * fix Mediamath cm call * minor fix mediamath call * fix mediamath call
* Trigger Build * intentional only * skip flakey test and add TODO to fix
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR addresses conflicts with
main.