Skip to content
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

Jump to bottom

[7.x] Migrated fixed_scroll karma tests to jest (#72258) #76886

Merged
merged 1 commit into from
Sep 7, 2020
Merged

[7.x] Migrated fixed_scroll karma tests to jest (#72258) #76886

merged 1 commit into from
Sep 7, 2020

Conversation

alexwizp
Copy link
Contributor

@alexwizp alexwizp commented Sep 7, 2020

Backports the following commits to 7.x:

@VladLasitsa @alexwizp
Migrated fixed_scroll karma tests to jest (elastic#72258)
8b50e71 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
# Conflicts:
#	src/plugins/discover/public/application/angular/doc_table/fixed_scroll.js
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Build metrics

✅ unchanged

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@alexwizp alexwizp merged commit 293124c into elastic:7.x Sep 7, 2020
@mshustov
Copy link
Contributor

mshustov commented Sep 8, 2020 •
edited
Loading

@alexwizp shouldn't this PR has removed src/legacy/core_plugins/kibana/public/__tests__/discover/fixed_scroll.js as well https://github.com/elastic/kibana/pull/72258/files#diff-31a63ce67a815095a64cde18e3a632c2 ?

@sulemanof
Copy link
Contributor

@alexwizp shouldn't this PR has removed src/legacy/core_plugins/kibana/public/__tests__/discover/fixed_scroll.js as well https://github.com/elastic/kibana/pull/72258/files#diff-31a63ce67a815095a64cde18e3a632c2 ?

@restrry it seems the __tests__ folder had been already removed in 7.x branch:

image

@mshustov
Copy link
Contributor

mshustov commented Sep 8, 2020

@sulemanof right, but why this file https://github.com/elastic/kibana/blob/7.x/src/plugins/discover/public/application/angular/doc_table/fixed_scroll.js presents in 7.x and removed in master?

@kertal
Copy link
Member

kertal commented Sep 10, 2020

@restrry I think this was committed accidentally in the back port, it's the old test and should be removed

@kertal
Copy link
Member

kertal commented Sep 10, 2020 •
edited
Loading

here's the backport PR that moved it to this location #73022 (last file in the list of modified files)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
backport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@alexwizp @kibanamachine @mshustov @sulemanof @kertal @VladLasitsa