Skip to content

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

Merged
alexwizp merged 1 commit intoelastic:7.xfrom
VladLasitsa:backport/7.x/pr-72258
Sep 7, 2020
Merged

[7.x] Migrated fixed_scroll karma tests to jest (#72258)#76886
alexwizp merged 1 commit intoelastic:7.xfrom
VladLasitsa:backport/7.x/pr-72258

Conversation

@alexwizp
Copy link
Copy Markdown
Contributor

@alexwizp alexwizp commented Sep 7, 2020

Backports the following commits to 7.x:

@VladLasitsa @elasticmachine @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
@alexwizp alexwizp added the backport This PR is a backport of another PR label Sep 7, 2020
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Sep 7, 2020

💚 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
Copy Markdown
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
Copy Markdown
Contributor

sulemanof commented Sep 8, 2020

@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
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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 This PR is a backport of another PR

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@alexwizp @kibanamachine @mshustov @sulemanof @kertal @VladLasitsa