fix(FN-1778): resolve merge conflicts and typecheck errors
- Resolve conflict in TerminalModal.test.tsx by keeping helpful loadAddon comment - Add clarifying comment in mobile WebGL skip test - Fix pre-existing typecheck errors in SettingsModal.tsx
This commit is contained in:
@@ -936,6 +936,9 @@ describe("TerminalModal", () => {
|
|||||||
|
|
||||||
// WebGL addon constructor should NOT have been called
|
// WebGL addon constructor should NOT have been called
|
||||||
expect(webglModule.WebglAddon).not.toHaveBeenCalled();
|
expect(webglModule.WebglAddon).not.toHaveBeenCalled();
|
||||||
|
|
||||||
|
// loadAddon is called with fitAddon and webLinksAddon (not WebGL) — verified by
|
||||||
|
// the WebglAddon constructor not being called above
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user