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

[Jest] Migrate popup.test.js #687

Merged
merged 7 commits into from
Dec 7, 2021
Merged

[Jest] Migrate popup.test.js #687

merged 7 commits into from
Dec 7, 2021

Conversation

wipfli
Copy link
Contributor

@wipfli wipfli commented Dec 2, 2021 •
edited
Loading

  • Move and rename
  • Run jscodeshift
  • Run custom codemods and lint
  • Manual edits

Launch Checklist

  • Confirm your changes do not include backports from Mapbox projects (unless with compliant license) - if you are not sure about this, please ask!
  • Briefly describe the changes in this PR.
  • Include before/after visuals or gifs if this PR includes visual changes.
  • Write tests for all new functionality.
  • Document any changes to public APIs.
  • Post benchmark scores.
  • Manually test the debug page.
  • Suggest a changelog category: bug/feature/docs/etc. or "skip changelog".
  • Add an entry inside this element for inclusion in the maplibre-gl-js changelog: <changelog></changelog>.

@wipfli
Copy link
Contributor Author

wipfli commented Dec 2, 2021

Tests that do things like expect(window.document.activeElement).toBe(dummyFocusedEl); currently fail.

@github-actions
Copy link
Contributor

github-actions bot commented Dec 2, 2021 •
edited
Loading

Bundle size report:

Size Change: 0 B
Total Size Before: 194 kB
Total Size After: 194 kB

Output file Before After Change
maplibre-gl.js 185 kB 185 kB 0 B
maplibre-gl.css 9.49 kB 9.49 kB 0 B
ℹ️ View Details No major changes

@wipfli
Copy link
Contributor Author

wipfli commented Dec 2, 2021

Is jest-dom (https://www.npmjs.com/package/@testing-library/jest-dom) what we want to use here?

@wipfli
Copy link
Contributor Author

wipfli commented Dec 3, 2021

Is jest-dom (https://www.npmjs.com/package/@testing-library/jest-dom) what we want to use here?

No, but the element has to be added to body manually. See jsdom/jsdom#2586 (comment)

The following works:

test('Popup with disabled focusing does not change the active element', () => {
    const dummyFocusedEl = window.document.createElement('button');
    window.document.body.appendChild(dummyFocusedEl);

    dummyFocusedEl.focus();

    new Popup({closeButton: false, focusAfterOpen: false})
        .setHTML('<span tabindex="0" data-testid="abc">Test</span>')
        .setLngLat([0, 0])
        .addTo(createMap());

    expect(window.document.activeElement).toBe(dummyFocusedEl);
});

@wipfli wipfli marked this pull request as ready for review December 3, 2021 15:01
HarelM
HarelM reviewed Dec 7, 2021
View reviewed changes
src/ui/popup.test.ts Outdated
@@ -0,0 +1,739 @@
import {createMap as globalCreateMap, setPerformance, setWebGlContext} from '../util/test/util';
import Popup, {Offset} from '../ui/popup';
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: shorter path.

HarelM
HarelM approved these changes Dec 7, 2021
View reviewed changes
Copy link
Collaborator

@HarelM HarelM left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix the path and you are good to go :-)

@wipfli
Copy link
Contributor Author

wipfli commented Dec 7, 2021

Thanks for reviewing @HarelM!

@wipfli wipfli merged commit 210c526 into maplibre:main Dec 7, 2021
@wipfli wipfli deleted the popup.test.js branch December 7, 2021 19:11
davenquinn added a commit to davenquinn/maplibre-gl-js that referenced this pull request Dec 29, 2021
@davenquinn
Merge branch 'main' into pluggable-render
61fd24c 
* main: (98 commits)
  [Jest] Migrate `geojson_worker_source.test.js` (maplibre#731)
  Fix events being fired after Map#remove has been called when the WebGL context is lost and restored (maplibre#726) (maplibre#727)
  Define return type of getSource as possibly undefined (maplibre#724)
  Fix attibution controll (maplibre#668)
  Fix start-debug to watch ts files (maplibre#704)
  [Jest] Migrate `touch_zoom_rotate.test.js` (maplibre#721)
  [Jest] Migrate `requestRenderFrame.test.js` (maplibre#722)
  [Jest] Migrate `scroll_zoom.test.js` (maplibre#712)
  [Jest] Migrate `marker.test.js` (maplibre#696)
  [Jest] Migrate `mouse_rotate.test.js` (maplibre#711)
  [Jest] Migrate `keyboard.test.js` (maplibre#707)
  [Jest] Migrate `map_event.test.js` (maplibre#710)
  [Jest] Migrate `drag_rotate.test.js` (maplibre#709)
  Handle spies and call counts (maplibre#708)
  [Jest] Migrate `drag_pan.test.js` (maplibre#702)
  Add type for styleimagemissing event (maplibre#703)
  Fix MapDataEvent#isSourceLoaded being true in GeoJSONSource "dataloading" event handlers (maplibre#694) (maplibre#695)
  [Jest] Migrate `dblclick_zoom.test.js` (maplibre#697)
  [Jest] Migrate `popup.test.js` (maplibre#687)
  Fixed typo (maplibre#698)
  ...
@birkskyum birkskyum added this to the Transition from Tap to Jest milestone Jan 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@HarelM HarelM HarelM approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Transition from Tap to Jest
Development

Successfully merging this pull request may close these issues.
3 participants
@wipfli @HarelM @birkskyum