diff --git a/packages/scratch-gui/test/unit/components/__snapshots__/monitor-list.test.jsx.snap b/packages/scratch-gui/test/unit/components/__snapshots__/monitor-list.test.jsx.snap
index d977293079..eda95185a2 100644
--- a/packages/scratch-gui/test/unit/components/__snapshots__/monitor-list.test.jsx.snap
+++ b/packages/scratch-gui/test/unit/components/__snapshots__/monitor-list.test.jsx.snap
@@ -10,7 +10,7 @@ exports[`MonitorListComponent it renders the correct step size for discrete slid
>
diff --git a/packages/scratch-gui/test/unit/components/button.test.jsx b/packages/scratch-gui/test/unit/components/button.test.jsx
index 27fd7d60c6..6295e77927 100644
--- a/packages/scratch-gui/test/unit/components/button.test.jsx
+++ b/packages/scratch-gui/test/unit/components/button.test.jsx
@@ -1,11 +1,11 @@
import React from 'react';
-import { render, fireEvent } from '@testing-library/react';
+import {render, fireEvent} from '@testing-library/react';
import '@testing-library/jest-dom';
import ButtonComponent from '../../../src/components/button/button';
describe('ButtonComponent', () => {
test('matches snapshot', () => {
- const { container } = render(
+ const {container} = render(
);
@@ -14,7 +14,7 @@ describe('ButtonComponent', () => {
test('triggers callback when clicked', () => {
const onClick = jest.fn();
- const { container } = render(
+ const {container} = render(
);
@@ -33,4 +33,4 @@ describe('ButtonComponent', () => {
expect(onClick).toHaveBeenCalledTimes(0);
});
-});
\ No newline at end of file
+});
diff --git a/packages/scratch-gui/test/unit/components/cards.test.jsx b/packages/scratch-gui/test/unit/components/cards.test.jsx
index f4b31c6cc5..e20f24e2ff 100644
--- a/packages/scratch-gui/test/unit/components/cards.test.jsx
+++ b/packages/scratch-gui/test/unit/components/cards.test.jsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { renderWithIntl } from '../../helpers/intl-helpers.jsx';
+import {renderWithIntl} from '../../helpers/intl-helpers.jsx';
import '@testing-library/jest-dom';
import {PLATFORM} from '../../../src/lib/platform.js';
@@ -15,7 +15,7 @@ describe('Cards component', () => {
id1: {
name: 'id1 - name',
img: 'id1 - img',
- steps: [{ video: 'videoUrl' }]
+ steps: [{video: 'videoUrl'}]
}
},
dragging: false,
@@ -38,13 +38,20 @@ describe('Cards component', () => {
});
test('showVideos=true shows the video step', () => {
- const { container } = renderWithIntl(
);
+ const {container} = renderWithIntl(
);
expect(container.firstChild).toMatchSnapshot();
});
test('showVideos=false shows the title image/name instead of video step', () => {
- const { container } = renderWithIntl(
);
+ const {container} = renderWithIntl(
);
expect(container.firstChild).toMatchSnapshot();
});
diff --git a/packages/scratch-gui/test/unit/components/controls.test.jsx b/packages/scratch-gui/test/unit/components/controls.test.jsx
index 5191594d82..a45feac420 100644
--- a/packages/scratch-gui/test/unit/components/controls.test.jsx
+++ b/packages/scratch-gui/test/unit/components/controls.test.jsx
@@ -1,7 +1,7 @@
import React from 'react';
-import { fireEvent } from '@testing-library/react';
+import {fireEvent} from '@testing-library/react';
import '@testing-library/jest-dom';
-import { renderWithIntl } from '../../helpers/intl-helpers.jsx';
+import {renderWithIntl} from '../../helpers/intl-helpers.jsx';
import Controls from '../../../src/components/controls/controls';
describe('Controls component', () => {
@@ -13,13 +13,16 @@ describe('Controls component', () => {
});
test('shows turbo mode when in turbo mode', () => {
- const { container: containerTurbo } = renderWithIntl(
);
+ const {container: containerTurbo} = renderWithIntl(
);
const turboMode = [...containerTurbo.querySelectorAll('div')].reverse().find(el => el.textContent.includes('Turbo Mode'));
expect(turboMode).toBeTruthy();
});
test('does not show turbo mode when not in turbo mode', () => {
- const { container: containerNoTurbo } = renderWithIntl(
);
+ const {container: containerNoTurbo} = renderWithIntl(
);
const noTurboMode = [...containerNoTurbo.querySelectorAll('div')].reverse().find(el => el.textContent.includes('Turbo Mode'));
expect(noTurboMode).toBeFalsy();
});
@@ -27,7 +30,7 @@ describe('Controls component', () => {
describe('triggers the right callbacks when clicked', () => {
test('when green flag button clicked triggers the right callback', () => {
const props = defaultProps();
- const { container } = renderWithIntl(
);
+ const {container} = renderWithIntl(
);
const greenFlagButton = container.querySelector('img[title="Go"]');
@@ -37,7 +40,7 @@ describe('Controls component', () => {
test('when stop all button clicked triggers the right callback', () => {
const props = defaultProps();
- const { container } = renderWithIntl(
);
+ const {container} = renderWithIntl(
);
const stopAllButton = container.querySelector('img[title="Stop"]');
@@ -45,4 +48,4 @@ describe('Controls component', () => {
expect(props.onStopAllClick).toHaveBeenCalled();
});
});
-});
\ No newline at end of file
+});
diff --git a/packages/scratch-gui/test/unit/components/error-boundary-hoc.test.jsx b/packages/scratch-gui/test/unit/components/error-boundary-hoc.test.jsx
index 7fe28b08c8..e4fb76e261 100644
--- a/packages/scratch-gui/test/unit/components/error-boundary-hoc.test.jsx
+++ b/packages/scratch-gui/test/unit/components/error-boundary-hoc.test.jsx
@@ -1,9 +1,9 @@
import React from 'react';
-import { Provider } from 'react-redux';
+import {Provider} from 'react-redux';
import '@testing-library/jest-dom';
import configureStore from 'redux-mock-store';
import ErrorBoundary from '../../../src/containers/error-boundary.jsx';
-import { renderWithIntl } from '../../helpers/intl-helpers.jsx';
+import {renderWithIntl} from '../../helpers/intl-helpers.jsx';
const ChildComponent = () =>
hello
;
@@ -22,7 +22,7 @@ describe('ErrorBoundary', () => {
test('ErrorBoundary shows children before error and CrashMessageComponent after', () => {
const child =
;
- const { container } = renderWithIntl(
+ const {container} = renderWithIntl(
{child}
@@ -36,7 +36,7 @@ describe('ErrorBoundary', () => {
const ThrowError = () => {
throw new Error('Test error');
};
- const { container: containerError } = renderWithIntl(
+ const {container: containerError} = renderWithIntl(
diff --git a/packages/scratch-gui/test/unit/components/icon-button.test.jsx b/packages/scratch-gui/test/unit/components/icon-button.test.jsx
index 707742df27..14e5dcb330 100644
--- a/packages/scratch-gui/test/unit/components/icon-button.test.jsx
+++ b/packages/scratch-gui/test/unit/components/icon-button.test.jsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { render, fireEvent } from '@testing-library/react';
+import {render, fireEvent} from '@testing-library/react';
import '@testing-library/jest-dom';
import IconButton from '../../../src/components/icon-button/icon-button';
@@ -7,12 +7,12 @@ describe('IconButtonComponent', () => {
const defaultProps = {
img: 'imgSrc',
title:
Text
,
- onClick: ()=>{},
+ onClick: () => {},
className: 'custom-class-name'
};
test('renders with all props correctly', () => {
- const { container } = render(
);
+ const {container} = render(
);
expect(container.firstChild).toMatchSnapshot();
});
@@ -20,8 +20,11 @@ describe('IconButtonComponent', () => {
test('triggers callback when clicked', () => {
const onClick = jest.fn();
- const { container } = render(
-
+ const {container} = render(
+
);
const button = container.querySelector('div[role="button"]');
@@ -34,8 +37,11 @@ describe('IconButtonComponent', () => {
test('does not trigger callback when not clicked', () => {
const onClick = jest.fn();
- render(
);
+ render(
);
expect(onClick).toHaveBeenCalledTimes(0);
});
-});
\ No newline at end of file
+});
diff --git a/packages/scratch-gui/test/unit/components/menu-bar.test.jsx b/packages/scratch-gui/test/unit/components/menu-bar.test.jsx
index 28247cf45b..37ec9b61e8 100644
--- a/packages/scratch-gui/test/unit/components/menu-bar.test.jsx
+++ b/packages/scratch-gui/test/unit/components/menu-bar.test.jsx
@@ -1,15 +1,15 @@
import React from 'react';
-import { renderWithIntl } from '../../helpers/intl-helpers.jsx';
+import {renderWithIntl} from '../../helpers/intl-helpers.jsx';
import MenuBar from '../../../src/components/menu-bar/menu-bar';
-import { menuInitialState } from '../../../src/reducers/menus';
-import { LoadingState } from '../../../src/reducers/project-state';
-import { DEFAULT_THEME } from '../../../src/lib/themes';
-import { fireEvent } from '@testing-library/react';
+import {menuInitialState} from '../../../src/reducers/menus';
+import {LoadingState} from '../../../src/reducers/project-state';
+import {DEFAULT_THEME} from '../../../src/lib/themes';
+import {fireEvent} from '@testing-library/react';
import {PLATFORM} from '../../../src/lib/platform';
import configureStore from 'redux-mock-store';
-import { Provider } from 'react-redux';
+import {Provider} from 'react-redux';
import VM from '@scratch/scratch-vm';
describe('MenuBar Component', () => {
@@ -41,14 +41,14 @@ describe('MenuBar Component', () => {
};
test('menu bar with no About handler has no About button', () => {
- const { container } = renderWithIntl(getComponent());
+ const {container} = renderWithIntl(getComponent());
const button = container.querySelector('span[role="button"]');
expect(button).toBeFalsy();
});
test('menu bar with an About handler has an About button', () => {
const onClickAbout = jest.fn();
- const { container } = renderWithIntl(getComponent({ onClickAbout }));
+ const {container} = renderWithIntl(getComponent({onClickAbout}));
const button = container.querySelector('span[role="button"]');
expect(button).toBeTruthy();
});
@@ -56,7 +56,7 @@ describe('MenuBar Component', () => {
describe('triggering About button handler', () => {
test('clicking on About button calls the handler', () => {
const onClickAbout = jest.fn();
- const { container } = renderWithIntl(getComponent({ onClickAbout }));
+ const {container} = renderWithIntl(getComponent({onClickAbout}));
const button = container.querySelector('span[role="button"]');
fireEvent.click(button);
@@ -65,7 +65,7 @@ describe('MenuBar Component', () => {
test('not clicking on About button does not call the handler', () => {
const onClickAbout = jest.fn();
- const { container } = renderWithIntl(getComponent({ onClickAbout }));
+ const {container} = renderWithIntl(getComponent({onClickAbout}));
const button = container.querySelector('span[role="button"]');
expect(onClickAbout).toHaveBeenCalledTimes(0);
diff --git a/packages/scratch-gui/test/unit/components/monitor-list.test.jsx b/packages/scratch-gui/test/unit/components/monitor-list.test.jsx
index 97a48942f1..51edd6caaa 100644
--- a/packages/scratch-gui/test/unit/components/monitor-list.test.jsx
+++ b/packages/scratch-gui/test/unit/components/monitor-list.test.jsx
@@ -1,10 +1,10 @@
import React from 'react';
-import { OrderedMap } from 'immutable';
+import {OrderedMap} from 'immutable';
import configureStore from 'redux-mock-store';
-import { Provider } from 'react-redux';
-import { renderWithIntl } from '../../helpers/intl-helpers.jsx';
+import {Provider} from 'react-redux';
+import {renderWithIntl} from '../../helpers/intl-helpers.jsx';
import MonitorList from '../../../src/components/monitor-list/monitor-list.jsx';
-import { DEFAULT_THEME } from '../../../src/lib/themes';
+import {DEFAULT_THEME} from '../../../src/lib/themes';
describe('MonitorListComponent', () => {
const store = configureStore()({
@@ -60,7 +60,7 @@ describe('MonitorListComponent', () => {
isDiscrete: true
}
});
- const { container } = renderWithIntl(getComponent());
+ const {container} = renderWithIntl(getComponent());
expect(container.firstChild).toMatchSnapshot();
});
@@ -73,7 +73,7 @@ describe('MonitorListComponent', () => {
isDiscrete: false
}
});
- const { container } = renderWithIntl(getComponent());
+ const {container} = renderWithIntl(getComponent());
expect(container.firstChild).toMatchSnapshot();
});
diff --git a/packages/scratch-gui/test/unit/components/monitor.test.jsx b/packages/scratch-gui/test/unit/components/monitor.test.jsx
index a03e6d901f..7a5d0b0c28 100644
--- a/packages/scratch-gui/test/unit/components/monitor.test.jsx
+++ b/packages/scratch-gui/test/unit/components/monitor.test.jsx
@@ -1,7 +1,7 @@
import React from 'react';
-import { render } from '@testing-library/react';
+import {render} from '@testing-library/react';
import Monitor from '../../../src/components/monitor/monitor';
-import { DARK_THEME, DEFAULT_THEME } from '../../../src/lib/themes';
+import {DARK_THEME, DEFAULT_THEME} from '../../../src/lib/themes';
jest.mock('../../../src/lib/themes/default');
jest.mock('../../../src/lib/themes/dark');
@@ -10,20 +10,20 @@ describe('Monitor Component', () => {
const noop = jest.fn();
const defaultProps = {
- category: "motion",
- // eslint-disable-next-line react/jsx-no-bind
- componentRef: noop ,
+ category: 'motion',
+
+ componentRef: noop,
draggable: false,
- label: "My label",
- mode: "default",
- // eslint-disable-next-line react/jsx-no-bind
- onDragEnd: noop ,
- // eslint-disable-next-line react/jsx-no-bind
+ label: 'My label',
+ mode: 'default',
+
+ onDragEnd: noop,
+
onNextMode: noop
};
test('it selects the correct colors based on default theme', () => {
- const { container } = render(
);
@@ -32,7 +32,7 @@ describe('Monitor Component', () => {
});
test('it selects the correct colors based on dark mode theme', () => {
- const { container } = render(
);
diff --git a/packages/scratch-gui/test/unit/components/sound-editor.test.jsx b/packages/scratch-gui/test/unit/components/sound-editor.test.jsx
index 6dbae06abb..88620f01e1 100644
--- a/packages/scratch-gui/test/unit/components/sound-editor.test.jsx
+++ b/packages/scratch-gui/test/unit/components/sound-editor.test.jsx
@@ -1,7 +1,7 @@
import React from 'react';
-import { renderWithIntl } from '../../helpers/intl-helpers.jsx';
+import {renderWithIntl} from '../../helpers/intl-helpers.jsx';
import SoundEditor from '../../../src/components/sound-editor/sound-editor';
-import { fireEvent, waitFor } from '@testing-library/react';
+import {fireEvent, waitFor} from '@testing-library/react';
describe('Sound Editor Component', () => {
let props;
@@ -33,13 +33,13 @@ describe('Sound Editor Component', () => {
});
test('matches snapshot', () => {
- const { container } = renderWithIntl(
);
+ const {container} = renderWithIntl(
);
expect(container.firstChild).toMatchSnapshot();
});
test('delete button appears when selection is not null', () => {
- const { container } = renderWithIntl(
+ const {container} = renderWithIntl(
{
});
test('play button appears when playhead is null', () => {
- const { container } = renderWithIntl(
+ const {container} = renderWithIntl(
{
});
test('stop button appears when playhead is not null', () => {
- const { container } = renderWithIntl(
+ const {container} = renderWithIntl(
{
test('submitting name calls the callback', async () => {
if (typeof MutationObserver === 'undefined') {
global.MutationObserver = class {
- observe() { }
- disconnect() { }
+ observe () { }
+ disconnect () { }
};
}
const onChangeName = jest.fn();
- const { container } = renderWithIntl();
+ const {container} = renderWithIntl();
const input = container.querySelector('input');
- fireEvent.change(input, { target: { value: 'hello' } });
- fireEvent.keyPress(input, { key: 'Enter', code: 'Enter', charCode: 13 });
+ fireEvent.change(input, {target: {value: 'hello'}});
+ fireEvent.keyPress(input, {key: 'Enter', code: 'Enter', charCode: 13});
await waitFor(() => expect(onChangeName).toHaveBeenCalled());
});
@@ -98,13 +101,13 @@ describe('Sound Editor Component', () => {
let getButtonByText;
beforeEach(() => {
- const { container } = renderWithIntl(
+ const {container} = renderWithIntl(
);
- const buttons = [...container.querySelectorAll('div[role="button"]')]
- getButtonByText = (text) => buttons.find(div => div.textContent.trim() === text);
- })
+ const buttons = [...container.querySelectorAll('div[role="button"]')];
+ getButtonByText = text => buttons.find(div => div.textContent.trim() === text);
+ });
test('clicking reverse button calls correct callback', () => {
const reverseButton = getButtonByText('Reverse');
@@ -145,8 +148,11 @@ describe('Sound Editor Component', () => {
describe('disbaling undo/redo button', () => {
test('undo button can be disabled when canUndo equals false', () => {
- const { container } = renderWithIntl(
-
+ const {container} = renderWithIntl(
+
);
const undoButtonEnabled = container.querySelector('button[title="Undo"]');
@@ -154,8 +160,11 @@ describe('Sound Editor Component', () => {
});
test('redo button can be disabled when canRedo equals false', () => {
- const { container } = renderWithIntl(
-
+ const {container} = renderWithIntl(
+
);
const redoButtonEnabled = container.querySelector('button[title="Redo"]');
@@ -165,7 +174,7 @@ describe('Sound Editor Component', () => {
describe('undo/redo buttons call the correct callbacks', () => {
test('when undo button is clicked it calls the correct callback', () => {
- const { container } = renderWithIntl(
+ const {container} = renderWithIntl(
);
@@ -175,7 +184,7 @@ describe('Sound Editor Component', () => {
});
test('when redo button is clicked it calls the correct callback', () => {
- const { container } = renderWithIntl(
+ const {container} = renderWithIntl(
);
diff --git a/packages/scratch-gui/test/unit/components/sprite-selector-item.test.jsx b/packages/scratch-gui/test/unit/components/sprite-selector-item.test.jsx
index e2f328f8dd..c12c4a1ec0 100644
--- a/packages/scratch-gui/test/unit/components/sprite-selector-item.test.jsx
+++ b/packages/scratch-gui/test/unit/components/sprite-selector-item.test.jsx
@@ -1,18 +1,17 @@
import React from 'react';
-import { renderWithIntl } from '../../helpers/intl-helpers.jsx';
+import {renderWithIntl} from '../../helpers/intl-helpers.jsx';
import SpriteSelectorItemComponent from '../../../src/components/sprite-selector-item/sprite-selector-item';
-import { fireEvent, waitFor } from '@testing-library/react';
+import {fireEvent, waitFor} from '@testing-library/react';
// Neccessary for RadixUI Context Menu
global.MutationObserver = class {
- constructor(callback) { }
- disconnect() { }
- observe() { }
+ disconnect () { }
+ observe () { }
};
document.body.insertAdjacentElement = jest.fn();
global.DOMRect = {
- fromRect: ({ x = 0, y = 0, width = 0, height = 0 } = {}) =>
- ({ x, y, width, height, top: y, left: x, right: x + width, bottom: y + height })
+ fromRect: ({x = 0, y = 0, width = 0, height = 0} = {}) =>
+ ({x, y, width, height, top: y, left: x, right: x + width, bottom: y + height})
};
@@ -55,38 +54,38 @@ describe('SpriteSelectorItemComponent', () => {
});
test('matches snapshot when selected', () => {
- const { container } = renderWithIntl(getComponent());
+ const {container} = renderWithIntl(getComponent());
expect(container.firstChild).toMatchSnapshot();
});
test('matches snapshot when given a number and details to show', () => {
number = 5;
details = '480 x 360';
- const { container } = renderWithIntl(getComponent());
+ const {container} = renderWithIntl(getComponent());
expect(container.firstChild).toMatchSnapshot();
});
test('does not have a close box when not selected', () => {
selected = false;
- const { container } = renderWithIntl(getComponent());
+ const {container} = renderWithIntl(getComponent());
expect(container.firstChild).toMatchSnapshot();
});
test('triggers callback when Box component is clicked', () => {
- const { container } = renderWithIntl(getComponent());
+ const {container} = renderWithIntl(getComponent());
fireEvent.click(container.firstChild);
expect(onClick).toHaveBeenCalled();
});
test('triggers callback when CloseButton component is clicked', () => {
- const { container } = renderWithIntl(getComponent());
+ const {container} = renderWithIntl(getComponent());
const deleteButton = container.querySelector('div[role="button"][aria-label="Delete"]');
fireEvent.click(deleteButton);
expect(onDeleteButtonClick).toHaveBeenCalled();
});
test('it has a context menu with delete menu item and callback', async () => {
- const { container } = renderWithIntl(getComponent());
+ const {container} = renderWithIntl(getComponent());
fireEvent.contextMenu(container.firstChild);
await waitFor(() => {
diff --git a/packages/scratch-gui/test/unit/components/toggle-buttons.test.jsx b/packages/scratch-gui/test/unit/components/toggle-buttons.test.jsx
index 3510da990f..d14fd3c2ff 100644
--- a/packages/scratch-gui/test/unit/components/toggle-buttons.test.jsx
+++ b/packages/scratch-gui/test/unit/components/toggle-buttons.test.jsx
@@ -1,6 +1,6 @@
import React from 'react';
import ToggleButtons from '../../../src/components/toggle-buttons/toggle-buttons';
-import { fireEvent, render } from '@testing-library/react';
+import {fireEvent, render} from '@testing-library/react';
describe('ToggleButtons', () => {
diff --git a/packages/scratch-gui/test/unit/containers/__snapshots__/slider-prompt.test.jsx.snap b/packages/scratch-gui/test/unit/containers/__snapshots__/slider-prompt.test.jsx.snap
index cd1e0d6d31..670bd5582a 100644
--- a/packages/scratch-gui/test/unit/containers/__snapshots__/slider-prompt.test.jsx.snap
+++ b/packages/scratch-gui/test/unit/containers/__snapshots__/slider-prompt.test.jsx.snap
@@ -32,6 +32,7 @@ exports[`Slider Prompt Container matches snapshot 1`] = `
{
});
Component = jest.fn(
- ({ confirmReadyToReplaceProject, shouldSaveBeforeTransition }) => (
+ ({confirmReadyToReplaceProject, shouldSaveBeforeTransition}) => (
<>
{`${confirmReadyToReplaceProject()}`}
@@ -34,7 +34,7 @@ describe('Menu Bar HOC', () => {
test('Logged in user who IS owner and HAS changed project will NOT be prompted to save', () => {
const WrappedComponent = MenuBarHOC(Component);
- const { container } = render(
+ const {container} = render(
{
/>
);
- const element = container.querySelector('#confirmReadyToReplaceProject')
+ const element = container.querySelector('#confirmReadyToReplaceProject');
expect(element).toHaveTextContent(/true/i);
});
test('Logged in user who IS owner and has NOT changed project will NOT be prompted to save', () => {
const WrappedComponent = MenuBarHOC(Component);
- const { container } = render(
+ const {container} = render(
{
/>
);
- const element = container.querySelector('#confirmReadyToReplaceProject')
+ const element = container.querySelector('#confirmReadyToReplaceProject');
expect(element).toHaveTextContent(/true/i);
});
test('Logged in user who is NOT owner and HAS changed project will NOT be prompted to save', () => {
const WrappedComponent = MenuBarHOC(Component);
- const { container } = render(
+ const {container} = render(
{
/>
);
- const element = container.querySelector('#confirmReadyToReplaceProject')
+ const element = container.querySelector('#confirmReadyToReplaceProject');
expect(element).toHaveTextContent(/true/i);
});
test('Logged OUT user who HAS changed project WILL be prompted to save', () => {
const WrappedComponent = MenuBarHOC(Component);
- const { container } = render(
+ const {container} = render(
{
/>
);
- const element = container.querySelector('#confirmReadyToReplaceProject')
+ const element = container.querySelector('#confirmReadyToReplaceProject');
expect(element).toHaveTextContent(/false/i);
});
test('Logged OUT user who has NOT changed project WILL NOT be prompted to save', () => {
const WrappedComponent = MenuBarHOC(Component);
- const { container } = render(
+ const {container} = render(
{
store={store}
/>
);
- const element = container.querySelector('#confirmReadyToReplaceProject')
+ const element = container.querySelector('#confirmReadyToReplaceProject');
expect(element).toHaveTextContent(/true/i);
});
test('Logged in user who IS owner and HAS changed project SHOULD save before transition to project page', () => {
const WrappedComponent = MenuBarHOC(Component);
- const { container } = render(
+ const {container} = render(
{
/>
);
- const element = container.querySelector('#shouldSaveBeforeTransition')
+ const element = container.querySelector('#shouldSaveBeforeTransition');
expect(element).toHaveTextContent(/true/i);
});
test('Logged in user who IS owner and has NOT changed project should NOT save before transition', () => {
const WrappedComponent = MenuBarHOC(Component);
- const { container } = render(
+ const {container} = render(
{
/>
);
- const element = container.querySelector('#shouldSaveBeforeTransition')
+ const element = container.querySelector('#shouldSaveBeforeTransition');
expect(element).toHaveTextContent(/false/i);
});
test('Logged in user who is NOT owner and HAS changed project should NOT save before transition', () => {
const WrappedComponent = MenuBarHOC(Component);
- const { container } = render(
+ const {container} = render(
{
/>
);
- const element = container.querySelector('#shouldSaveBeforeTransition')
+ const element = container.querySelector('#shouldSaveBeforeTransition');
expect(element).toHaveTextContent(/false/i);
});
test('Logged in user who is NOT owner and has NOT changed project should NOT save before transition', () => {
const WrappedComponent = MenuBarHOC(Component);
- const { container } = render(
+ const {container} = render(
{
/>
);
- const element = container.querySelector('#shouldSaveBeforeTransition')
+ const element = container.querySelector('#shouldSaveBeforeTransition');
expect(element).toHaveTextContent(/false/i);
});
diff --git a/packages/scratch-gui/test/unit/containers/save-status.test.jsx b/packages/scratch-gui/test/unit/containers/save-status.test.jsx
index c0c5ad8217..0648e07a0c 100644
--- a/packages/scratch-gui/test/unit/containers/save-status.test.jsx
+++ b/packages/scratch-gui/test/unit/containers/save-status.test.jsx
@@ -1,21 +1,20 @@
import React from 'react';
-import { Provider } from 'react-redux';
+import {Provider} from 'react-redux';
import configureStore from 'redux-mock-store';
-import { renderWithIntl } from '../../helpers/intl-helpers.jsx';
+import {renderWithIntl} from '../../helpers/intl-helpers.jsx';
import SaveStatus from '../../../src/components/menu-bar/save-status.jsx';
-import { fireEvent, screen } from '@testing-library/react';
-import { AlertTypes } from '../../../src/lib/alerts/index.jsx';
+import {fireEvent, screen} from '@testing-library/react';
+import {AlertTypes} from '../../../src/lib/alerts/index.jsx';
global.MutationObserver = class {
- constructor(callback) { }
- disconnect() { }
- observe() { }
+ disconnect () { }
+ observe () { }
};
// Stub the manualUpdateProject action creator for later testing
jest.mock('../../../src/reducers/project-state', () => ({
- manualUpdateProject: jest.fn(() => ({ type: 'stubbed' }))
+ manualUpdateProject: jest.fn(() => ({type: 'stubbed'}))
}));
describe('SaveStatus container', () => {
@@ -27,12 +26,12 @@ describe('SaveStatus container', () => {
projectChanged: true,
alerts: {
alertsList: [
- { alertId: 'saveSuccess', alertType: AlertTypes.INLINE },
+ {alertId: 'saveSuccess', alertType: AlertTypes.INLINE}
]
}
}
});
- const { container } = renderWithIntl(
+ const {container} = renderWithIntl(
@@ -53,17 +52,17 @@ describe('SaveStatus container', () => {
}
}
});
- const { container } = renderWithIntl(
+ const {container} = renderWithIntl(
);
- const saveNow = screen.getByText("Save Now");
+ const saveNow = screen.getByText('Save Now');
const inlineMessage = container.querySelector('[aria-label="inline message"]');
expect(inlineMessage).toBeFalsy();
- //Clicking save now should dispatch the manualUpdateProject action (stubbed above)
+ // Clicking save now should dispatch the manualUpdateProject action (stubbed above)
fireEvent.click(saveNow);
expect(store.getActions()[0].type).toEqual('stubbed');
});
@@ -78,7 +77,7 @@ describe('SaveStatus container', () => {
}
});
- const { container } = renderWithIntl(
+ const {container} = renderWithIntl(
diff --git a/packages/scratch-gui/test/unit/containers/slider-prompt.test.jsx b/packages/scratch-gui/test/unit/containers/slider-prompt.test.jsx
index 645e5f0f91..250682a907 100644
--- a/packages/scratch-gui/test/unit/containers/slider-prompt.test.jsx
+++ b/packages/scratch-gui/test/unit/containers/slider-prompt.test.jsx
@@ -1,12 +1,11 @@
import React from 'react';
import SliderPrompt from '../../../src/containers/slider-prompt.jsx';
-import { screen, fireEvent } from '@testing-library/react'
-import { renderWithIntl } from '../../helpers/intl-helpers.jsx';
-import { Provider } from 'react-redux';
+import {screen, fireEvent} from '@testing-library/react';
+import {renderWithIntl} from '../../helpers/intl-helpers.jsx';
+import {Provider} from 'react-redux';
import configureStore from 'redux-mock-store';
-
describe('Slider Prompt Container', () => {
const store = configureStore()({
@@ -53,7 +52,7 @@ describe('Slider Prompt Container', () => {
);
- fireEvent.click(screen.getByRole('button', { name: "OK" }));
+ fireEvent.click(screen.getByRole('button', {name: 'OK'}));
expect(onOk).toHaveBeenCalled();
});
@@ -70,7 +69,7 @@ describe('Slider Prompt Container', () => {
);
- fireEvent.click(screen.getByRole('button', { name: "Cancel" }));
+ fireEvent.click(screen.getByRole('button', {name: 'Cancel'}));
expect(onCancel).toHaveBeenCalled();
});
});
diff --git a/packages/scratch-gui/test/unit/containers/sound-editor.test.jsx b/packages/scratch-gui/test/unit/containers/sound-editor.test.jsx
index 51e5519332..abe820086f 100644
--- a/packages/scratch-gui/test/unit/containers/sound-editor.test.jsx
+++ b/packages/scratch-gui/test/unit/containers/sound-editor.test.jsx
@@ -1,19 +1,17 @@
-import React from 'react';
-import {renderWithIntl } from '../../helpers/intl-helpers.jsx';
+import React, {act} from 'react';
+import {renderWithIntl} from '../../helpers/intl-helpers.jsx';
import configureStore from 'redux-mock-store';
import mockAudioBufferPlayer from '../../__mocks__/audio-buffer-player.js';
import mockAudioEffects from '../../__mocks__/audio-effects.js';
import SoundEditor from '../../../src/containers/sound-editor';
-import { screen, fireEvent, waitFor } from '@testing-library/react';
-import { act } from 'react'; // Import act
+import {screen, fireEvent, waitFor} from '@testing-library/react';
import '@testing-library/jest-dom';
global.MutationObserver = class {
- constructor(callback) { }
- disconnect() { }
- observe() { }
+ disconnect () { }
+ observe () { }
};
jest.mock('react-ga');
@@ -25,7 +23,7 @@ describe('Sound Editor Container', () => {
let store;
let soundIndex;
let soundBuffer;
- const samples = new Float32Array([0, 0, 0]); // eslint-disable-line no-undef
+ const samples = new Float32Array([0, 0, 0]);
let vm;
beforeEach(() => {
@@ -40,15 +38,15 @@ describe('Sound Editor Container', () => {
updateSoundBuffer: jest.fn(),
editingTarget: {
sprite: {
- sounds: [{ name: 'first name', id: 'first id' }]
+ sounds: [{name: 'first name', id: 'first id'}]
}
}
};
- store = mockStore({ scratchGui: { vm: vm, mode: { isFullScreen: false } } });
+ store = mockStore({scratchGui: {vm: vm, mode: {isFullScreen: false}}});
});
test('should pass the correct data to the component from the store', () => {
- const { container } = renderWithIntl(
+ const {container} = renderWithIntl(
{
expect(mockAudioBufferPlayer.instance.play).toHaveBeenCalled();
// Mock the audio buffer player calling onUpdate
- await act(async () => {
+ await act(() => {
mockAudioBufferPlayer.instance.onUpdate(0.5);
});
@@ -93,8 +91,8 @@ describe('Sound Editor Container', () => {
);
const nameInput = screen.getByRole('textbox');
- fireEvent.change(nameInput, { target: { value: 'hello' } });
- fireEvent.keyPress(nameInput, { key: 'Enter', code: 'Enter', charCode: 13 });
+ fireEvent.change(nameInput, {target: {value: 'hello'}});
+ fireEvent.keyPress(nameInput, {key: 'Enter', code: 'Enter', charCode: 13});
expect(vm.renameSound).toHaveBeenCalledWith(soundIndex, 'hello');
});
@@ -105,7 +103,7 @@ describe('Sound Editor Container', () => {
store={store}
/>
);
- const reverseButton = screen.getByRole('button', { name: "Reverse" });
+ const reverseButton = screen.getByRole('button', {name: 'Reverse'});
await act(async () => {
fireEvent.click(reverseButton);
await mockAudioEffects.instance._finishProcessing(soundBuffer);
@@ -121,7 +119,7 @@ describe('Sound Editor Container', () => {
store={store}
/>
);
- const reverseButton = screen.getByRole('button', { name: "Reverse" });
+ const reverseButton = screen.getByRole('button', {name: 'Reverse'});
fireEvent.click(reverseButton);
expect(mockAudioEffects.instance.name).toEqual(mockAudioEffects.effectTypes.REVERSE);
expect(mockAudioEffects.instance.process).toHaveBeenCalled();
@@ -134,7 +132,7 @@ describe('Sound Editor Container', () => {
store={store}
/>
);
- const louderButton = screen.getByRole('button', { name: "Louder" });
+ const louderButton = screen.getByRole('button', {name: 'Louder'});
fireEvent.click(louderButton);
expect(mockAudioEffects.instance.name).toEqual(mockAudioEffects.effectTypes.LOUDER);
expect(mockAudioEffects.instance.process).toHaveBeenCalled();
@@ -147,7 +145,7 @@ describe('Sound Editor Container', () => {
store={store}
/>
);
- const softerButton = screen.getByRole('button', { name: "Softer" });
+ const softerButton = screen.getByRole('button', {name: 'Softer'});
fireEvent.click(softerButton);
expect(mockAudioEffects.instance.name).toEqual(mockAudioEffects.effectTypes.SOFTER);
expect(mockAudioEffects.instance.process).toHaveBeenCalled();
@@ -160,7 +158,7 @@ describe('Sound Editor Container', () => {
store={store}
/>
);
- const fasterButton = screen.getByRole('button', { name: "Faster" });
+ const fasterButton = screen.getByRole('button', {name: 'Faster'});
fireEvent.click(fasterButton);
expect(mockAudioEffects.instance.name).toEqual(mockAudioEffects.effectTypes.FASTER);
expect(mockAudioEffects.instance.process).toHaveBeenCalled();
@@ -173,7 +171,7 @@ describe('Sound Editor Container', () => {
store={store}
/>
);
- const slowerButton = screen.getByRole('button', { name: "Slower" });
+ const slowerButton = screen.getByRole('button', {name: 'Slower'});
fireEvent.click(slowerButton);
expect(mockAudioEffects.instance.name).toEqual(mockAudioEffects.effectTypes.SLOWER);
expect(mockAudioEffects.instance.process).toHaveBeenCalled();
@@ -186,7 +184,7 @@ describe('Sound Editor Container', () => {
store={store}
/>
);
- const softerButton = screen.getByRole('button', { name: "Robot" });
+ const softerButton = screen.getByRole('button', {name: 'Robot'});
fireEvent.click(softerButton);
expect(mockAudioEffects.instance.name).toEqual(mockAudioEffects.effectTypes.ROBOT);
expect(mockAudioEffects.instance.process).toHaveBeenCalled();
@@ -200,15 +198,15 @@ describe('Sound Editor Container', () => {
/>
);
- const undoButton = screen.getByRole('button', { name: "Undo" });
- const redoButton = screen.getByRole('button', { name: "Redo" });
+ const undoButton = screen.getByRole('button', {name: 'Undo'});
+ const redoButton = screen.getByRole('button', {name: 'Redo'});
// Undo and redo should be disabled initially
expect(undoButton).toBeDisabled();
expect(redoButton).toBeDisabled();
// Submitting new samples should make it possible to undo
- const fasterButton = screen.getByRole('button', { name: "Faster" });
+ const fasterButton = screen.getByRole('button', {name: 'Faster'});
await act(async () => {
fireEvent.click(fasterButton);
await mockAudioEffects.instance._finishProcessing(soundBuffer);
@@ -217,21 +215,21 @@ describe('Sound Editor Container', () => {
expect(redoButton).toBeDisabled();
// Undoing should make it possible to redo and not possible to undo again
- await act(async () => {
+ await act(() => {
fireEvent.click(undoButton);
});
expect(undoButton).toBeDisabled();
expect(redoButton).toBeEnabled();
// Redoing should make it possible to undo and not possible to redo again
- await act(async () => {
+ await act(() => {
fireEvent.click(redoButton);
});
expect(undoButton).toBeEnabled();
expect(redoButton).toBeDisabled();
// New submission should clear the redo stack
- await act(async () => {
+ await act(() => {
fireEvent.click(undoButton);
});
expect(redoButton).toBeEnabled();
@@ -252,9 +250,9 @@ describe('Sound Editor Container', () => {
);
// Set up an undoable state
- const fasterButton = screen.getByRole('button', { name: "Faster" });
- const undoButton = screen.getByRole('button', { name: "Undo" });
- const redoButton = screen.getByRole('button', { name: "Redo" });
+ const fasterButton = screen.getByRole('button', {name: 'Faster'});
+ const undoButton = screen.getByRole('button', {name: 'Undo'});
+ const redoButton = screen.getByRole('button', {name: 'Redo'});
await act(async () => {
fireEvent.click(fasterButton);
@@ -262,14 +260,14 @@ describe('Sound Editor Container', () => {
});
// Undo should update the sound buffer and play the new samples
- await act(async () => {
+ await act(() => {
fireEvent.click(undoButton);
});
-
+
expect(mockAudioBufferPlayer.instance.play).toHaveBeenCalled();
expect(vm.updateSoundBuffer).toHaveBeenCalled();
- await act(async () => {
+ await act(() => {
// Clear the mocks call history to assert again for redo.
vm.updateSoundBuffer.mockClear();
mockAudioBufferPlayer.instance.play.mockClear();
diff --git a/packages/scratch-gui/test/unit/containers/sprite-selector-item.test.jsx b/packages/scratch-gui/test/unit/containers/sprite-selector-item.test.jsx
index 68900fbf43..84a0c2dfac 100644
--- a/packages/scratch-gui/test/unit/containers/sprite-selector-item.test.jsx
+++ b/packages/scratch-gui/test/unit/containers/sprite-selector-item.test.jsx
@@ -1,18 +1,17 @@
import React from 'react';
-import { renderWithIntl } from '../../helpers/intl-helpers.jsx';
+import {renderWithIntl} from '../../helpers/intl-helpers.jsx';
import configureStore from 'redux-mock-store';
-import { Provider } from 'react-redux';
+import {Provider} from 'react-redux';
import VM from '@scratch/scratch-vm';
import SpriteSelectorItemContainer from '../../../src/containers/sprite-selector-item';
-import { legacyConfig } from '../../../src/legacy-config';
+import {legacyConfig} from '../../../src/legacy-config';
import DeleteConfirmationPrompt from '../../../src/components/delete-confirmation-prompt/delete-confirmation-prompt.jsx';
-import { screen, fireEvent, waitFor } from '@testing-library/react';
+import {screen, fireEvent, waitFor} from '@testing-library/react';
global.MutationObserver = class {
- constructor() { }
- disconnect() { }
- observe() { }
+ disconnect () { }
+ observe () { }
};
jest.mock('../../../src/components/delete-confirmation-prompt/delete-confirmation-prompt.jsx', () => jest.fn(() => null));
@@ -61,19 +60,19 @@ describe('SpriteSelectorItem Container', () => {
store = mockStore({
scratchGui: {
config: legacyConfig,
- hoveredTarget: { receivedBlocks: false, sprite: null },
- assetDrag: { dragging: false },
+ hoveredTarget: {receivedBlocks: false, sprite: null},
+ assetDrag: {dragging: false},
vm
}
});
});
- test('should delete the sprite, when called without `withDeleteConfirmation`', async () => {
+ test('should delete the sprite, when called without `withDeleteConfirmation`', () => {
onDeleteButtonClick = jest.fn();
renderWithIntl(getContainer());
- const deleteButton = screen.getByRole('button', { name: /delete/i });
+ const deleteButton = screen.getByRole('button', {name: /delete/i});
fireEvent.click(deleteButton);
expect(onDeleteButtonClick).toHaveBeenCalledWith(1337);
expect(DeleteConfirmationPrompt).not.toHaveBeenCalled();
@@ -86,7 +85,7 @@ describe('SpriteSelectorItem Container', () => {
renderWithIntl(getContainer(true));
expect(DeleteConfirmationPrompt).not.toHaveBeenCalled();
- const deleteButton = screen.getByRole('button', { name: /delete/i });
+ const deleteButton = screen.getByRole('button', {name: /delete/i});
fireEvent.click(deleteButton);
await waitFor(() => expect(DeleteConfirmationPrompt).toHaveBeenCalled());
});
diff --git a/packages/scratch-gui/test/unit/util/cloud-manager-hoc.test.jsx b/packages/scratch-gui/test/unit/util/cloud-manager-hoc.test.jsx
index 37582f6654..258112f6cc 100644
--- a/packages/scratch-gui/test/unit/util/cloud-manager-hoc.test.jsx
+++ b/packages/scratch-gui/test/unit/util/cloud-manager-hoc.test.jsx
@@ -3,9 +3,9 @@ import 'web-audio-test-api';
import React from 'react';
import configureStore from 'redux-mock-store';
import VM from '@scratch/scratch-vm';
-import { LoadingState } from '../../../src/reducers/project-state';
+import {LoadingState} from '../../../src/reducers/project-state';
import CloudProvider from '../../../src/lib/cloud-provider';
-import { render } from '@testing-library/react'
+import {render} from '@testing-library/react';
const mockCloudProviderInstance = {
connection: true,
requestCloseConnection: jest.fn()
@@ -187,7 +187,7 @@ describe('CloudManagerHOC', () => {
const onShowCloudInfo = jest.fn();
vm.runtime.hasCloudData = jest.fn(() => false);
- const { rerender } = render(
+ const {rerender} = render(
{
username="user"
vm={vm}
onShowCloudInfo={onShowCloudInfo}
- isShowingWithId={true}
+ isShowingWithId
loadingState={LoadingState.SHOWING_WITH_ID}
/>
);
@@ -223,7 +223,7 @@ describe('CloudManagerHOC', () => {
test('projectId change should not trigger cloudProvider connection unless isShowingWithId becomes true', () => {
const Component = () => ;
const WrappedComponent = cloudManagerHOC(Component);
- const { rerender } = render(
+ const {rerender} = render(
{
store={stillLoadingStore}
username="user"
vm={vm}
- projectId='a different id'
+ projectId="a different id"
/>
);
@@ -254,8 +254,8 @@ describe('CloudManagerHOC', () => {
store={stillLoadingStore}
username="user"
vm={vm}
- projectId='a different id'
- isShowingWithId={true}
+ projectId="a different id"
+ isShowingWithId
loadingState={LoadingState.SHOWING_WITH_ID}
/>
);
@@ -268,7 +268,7 @@ describe('CloudManagerHOC', () => {
test('when it unmounts, the cloud provider is reset to null on the vm', () => {
const Component = () => ();
const WrappedComponent = cloudManagerHOC(Component);
- const { unmount } = render(
+ const {unmount} = render(
{
test('projectId changing should trigger cloudProvider disconnection', () => {
const Component = () => ;
const WrappedComponent = cloudManagerHOC(Component);
- const { rerender } = render(
+ const {rerender} = render(
{
store={store}
username="user"
vm={vm}
- projectId='a different id'
+ projectId="a different id"
/>
);
@@ -326,7 +326,7 @@ describe('CloudManagerHOC', () => {
test('username changing should trigger cloudProvider disconnection', () => {
const Component = () => ;
const WrappedComponent = cloudManagerHOC(Component);
- const { rerender } = render(
+ const {rerender} = render(
{
hasCloudPermission
cloudHost="nonEmpty"
store={store}
- username='a different user'
+ username="a different user"
vm={vm}
/>
);
@@ -435,7 +435,7 @@ describe('CloudManagerHOC', () => {
test('Entering editor mode and can\'t save project should disconnect cloud provider', () => {
const Component = () => ;
const WrappedComponent = cloudManagerHOC(Component);
- const { rerender } = render(
+ const {rerender} = render(
{
+ windowSpy = jest.spyOn(global, 'window', 'get');
+ locationSpy = jest.spyOn(global, 'location', 'get');
+
+ windowSpy.mockImplementation(() => ({
+ location: mockWindowLocation,
+ navigator: mockWindowNavigator
+ }));
+
+ // `window.location` and `location` should point to the same object
+ locationSpy.mockImplementation(() => mockWindowLocation);
+});
+
+afterEach(() => {
+ windowSpy.mockRestore();
+ locationSpy.mockRestore();
+});
describe('detectLocale', () => {
test('uses locale from the URL when present', () => {
- Object.defineProperty(window.location,
- 'search',
- {value: '?locale=pt-br'}
- );
+ mockWindowLocation.search = '?locale=pt-br';
expect(detectLocale(supportedLocales)).toEqual('pt-br');
});
test('is case insensitive', () => {
- Object.defineProperty(window.location,
- 'search',
- {value: '?locale=pt-BR'}
- );
+ mockWindowLocation.search = '?locale=pt-BR';
expect(detectLocale(supportedLocales)).toEqual('pt-br');
});
test('also accepts lang from the URL when present', () => {
- Object.defineProperty(window.location,
- 'search',
- {value: '?lang=it'}
- );
+ mockWindowLocation.search = '?lang=it';
expect(detectLocale(supportedLocales)).toEqual('it');
});
test('ignores unsupported locales', () => {
- Object.defineProperty(window.location,
- 'search',
- {value: '?lang=sv'}
- );
+ mockWindowLocation.search = '?lang=sv';
expect(detectLocale(supportedLocales)).toEqual('en');
});
test('ignores other parameters', () => {
- Object.defineProperty(window.location,
- 'search',
- {value: '?enable=language'}
- );
+ mockWindowLocation.search = '?enable=language';
expect(detectLocale(supportedLocales)).toEqual('en');
});
test('uses navigator language property for default if supported', () => {
- Object.defineProperty(window.navigator,
- 'language',
- {value: 'pt-BR'}
- );
+ mockWindowNavigator.language = 'pt-BR';
expect(detectLocale(supportedLocales)).toEqual('pt-br');
});
test('ignores navigator language property if unsupported', () => {
- Object.defineProperty(window.navigator,
- 'language',
- {value: 'da'}
- );
+ mockWindowNavigator.language = 'da';
expect(detectLocale(supportedLocales)).toEqual('en');
});
test('works with an empty locale', () => {
- Object.defineProperty(window.location,
- 'search',
- {value: '?locale='}
- );
+ mockWindowLocation.search = '?locale=';
expect(detectLocale(supportedLocales)).toEqual('en');
});
test('if multiple, uses the first locale', () => {
- Object.defineProperty(window.location,
- 'search',
- {value: '?locale=de&locale=en'}
- );
+ mockWindowLocation.search = '?locale=de&locale=en';
expect(detectLocale(supportedLocales)).toEqual('de');
});
});
diff --git a/packages/scratch-gui/test/unit/util/hash-project-loader-hoc.test.jsx b/packages/scratch-gui/test/unit/util/hash-project-loader-hoc.test.jsx
index f2c7daece6..72f528c216 100644
--- a/packages/scratch-gui/test/unit/util/hash-project-loader-hoc.test.jsx
+++ b/packages/scratch-gui/test/unit/util/hash-project-loader-hoc.test.jsx
@@ -1,6 +1,6 @@
import React from 'react';
import configureStore from 'redux-mock-store';
-import { render, fireEvent } from '@testing-library/react'
+import {render, fireEvent} from '@testing-library/react';
import HashParserHOC from '../../../src/lib/hash-parser-hoc.jsx';
@@ -19,7 +19,7 @@ describe('HashParserHOC', () => {
});
test('when there is a hash, it passes the hash as projectId', () => {
- const Component = ({ projectId }) => {projectId}
;
+ const Component = ({projectId}) => {projectId}
;
const WrappedComponent = HashParserHOC(Component);
window.location.hash = '#1234567';
const mockSetProjectIdFunc = jest.fn();
@@ -33,7 +33,7 @@ describe('HashParserHOC', () => {
});
test('when there is no hash, it passes 0 as the projectId', () => {
- const Component = ({ projectId }) => {projectId}
;
+ const Component = ({projectId}) => {projectId}
;
const WrappedComponent = HashParserHOC(Component);
window.location.hash = '';
const mockSetProjectIdFunc = jest.fn();
@@ -47,7 +47,7 @@ describe('HashParserHOC', () => {
});
test('when the hash is not a number, it passes 0 as projectId', () => {
- const Component = ({ projectId }) => {projectId}
;
+ const Component = ({projectId}) => {projectId}
;
const WrappedComponent = HashParserHOC(Component);
window.location.hash = '#winning';
const mockSetProjectIdFunc = jest.fn();
@@ -61,7 +61,7 @@ describe('HashParserHOC', () => {
});
test('when hash change happens, the projectId state is changed', () => {
- const Component = ({ projectId }) => {projectId}
;
+ const Component = ({projectId}) => {projectId}
;
const WrappedComponent = HashParserHOC(Component);
window.location.hash = '';
const mockSetProjectIdFunc = jest.fn();
@@ -72,7 +72,7 @@ describe('HashParserHOC', () => {
/>
);
window.location.hash = '#1234567';
- fireEvent(window, new HashChangeEvent('hashchange', { newURL: window.location.href }));
+ fireEvent(window, new HashChangeEvent('hashchange', {newURL: window.location.href}));
expect(mockSetProjectIdFunc.mock.calls.length).toBe(2);
});
});
diff --git a/packages/scratch-gui/test/unit/util/project-fetcher-hoc.test.jsx b/packages/scratch-gui/test/unit/util/project-fetcher-hoc.test.jsx
index 7a59e89864..739489644c 100644
--- a/packages/scratch-gui/test/unit/util/project-fetcher-hoc.test.jsx
+++ b/packages/scratch-gui/test/unit/util/project-fetcher-hoc.test.jsx
@@ -1,12 +1,12 @@
import React from 'react';
import configureStore from 'redux-mock-store';
-import { renderWithIntl } from '../../helpers/intl-helpers.jsx';
+import {renderWithIntl} from '../../helpers/intl-helpers.jsx';
import ProjectFetcherHOC from '../../../src/lib/project-fetcher-hoc.jsx';
import {LoadingState} from '../../../src/reducers/project-state';
import {LegacyStorage} from '../../../src/lib/legacy-storage';
-import { IntlProvider } from 'react-intl';
+import {IntlProvider} from 'react-intl';
jest.mock('react-ga');
@@ -45,32 +45,36 @@ describe('ProjectFetcherHOC', () => {
storage.load = jest.fn((type, id) => Promise.resolve({data: id}));
const Component = ({projectId}) => {projectId}
;
const WrappedComponent = ProjectFetcherHOC(Component);
- const { rerender } = renderWithIntl(
+ const {rerender} = renderWithIntl(
);
rerender(
-
+
);
-
+
expect(storage.load).toHaveBeenLastCalledWith(
storage.AssetType.Project, '100', storage.DataFormat.JSON
);
storage.load = originalLoad;
- // nextTick needed since storage.load is async, and onFetchedProject is called in its then()
- process.nextTick(
+ // delay needed since storage.load is async, and onFetchedProject is called in its then()
+ setTimeout(
() => expect(mockedOnFetchedProject)
- .toHaveBeenLastCalledWith('100', LoadingState.FETCHING_WITH_ID)
+ .toHaveBeenLastCalledWith('100', LoadingState.FETCHING_WITH_ID),
+ 1
);
});
});
diff --git a/packages/scratch-gui/test/unit/util/project-saver-hoc.test.jsx b/packages/scratch-gui/test/unit/util/project-saver-hoc.test.jsx
index f12a59adea..f1f4621d0f 100644
--- a/packages/scratch-gui/test/unit/util/project-saver-hoc.test.jsx
+++ b/packages/scratch-gui/test/unit/util/project-saver-hoc.test.jsx
@@ -2,10 +2,10 @@ import 'web-audio-test-api';
import React from 'react';
import configureStore from 'redux-mock-store';
-import { render } from '@testing-library/react'
-import { LoadingState } from '../../../src/reducers/project-state';
+import {render} from '@testing-library/react';
+import {LoadingState} from '../../../src/reducers/project-state';
import VM from '@scratch/scratch-vm';
-import { legacyConfig } from '../../../src/legacy-config';
+import {legacyConfig} from '../../../src/legacy-config';
import projectSaverHOC from '../../../src/lib/project-saver-hoc.jsx';
import '@testing-library/jest-dom';
@@ -38,7 +38,7 @@ describe('projectSaverHOC', () => {
const mockedUpdateProject = jest.fn();
const Component = () => ;
const WrappedComponent = projectSaverHOC(Component);
- const { rerender } = render(
+ const {rerender} = render(
{
rerender(
{
const mockedSaveProject = jest.fn();
const Component = () => ;
const WrappedComponent = projectSaverHOC(Component);
- const { rerender } = render(
+ const {rerender} = render(
{
{
const mockedCreateProject = jest.fn();
const Component = () => ;
const WrappedComponent = projectSaverHOC(Component);
- const { rerender } = render(
+ const {rerender} = render(
{
const mockedCreateProject = jest.fn();
const Component = () => ;
const WrappedComponent = projectSaverHOC(Component);
- const { rerender } = render(
+ const {rerender} = render(
{
rerender(
{
const mockedCreateProject = jest.fn();
const Component = () => ;
const WrappedComponent = projectSaverHOC(Component);
- const { rerender } = render(
+ const {rerender} = render(
{
canCreateNew
isCreatingNew={false}
isShowingWithId={false}
- isShowingWithoutId={true}
+ isShowingWithoutId
isUpdating={false}
loadingState={LoadingState.SHOWING_WITHOUT_ID}
store={store}
@@ -207,7 +207,7 @@ describe('projectSaverHOC', () => {
const mockedStoreProject = jest.fn(() => Promise.resolve());
// The first wrapper is redux's Connect HOC
WrappedComponent.WrappedComponent.prototype.storeProject = mockedStoreProject;
- const { rerender } = render(
+ const {rerender} = render(
{
{
const mockedStoreProject = jest.fn(() => Promise.resolve());
// The first wrapper is redux's Connect HOC
WrappedComponent.WrappedComponent.prototype.storeProject = mockedStoreProject;
- const { rerender } = render(
+ const {rerender} = render(
{
canSave
isCreatingCopy={false}
isCreatingNew={false}
- isRemixing={true}
+ isRemixing
isShowingWithId={false}
isShowingWithoutId={false}
isUpdating={false}
@@ -290,7 +290,7 @@ describe('projectSaverHOC', () => {
const mockedStoreProject = jest.fn(() => Promise.resolve());
// The first wrapper is redux's Connect HOC
WrappedComponent.WrappedComponent.prototype.storeProject = mockedStoreProject;
- const { rerender } = render(
+ const {rerender} = render(
{
rerender(
{
const mockedStoreProject = jest.fn(() => Promise.resolve());
// The first wrapper is redux's Connect HOC
WrappedComponent.WrappedComponent.prototype.storeProject = mockedStoreProject;
- const { rerender } = render(
+ const {rerender} = render(
{
isCreatingNew={false}
isShowingWithId={false}
isShowingWithoutId={false}
- isUpdating={true}
+ isUpdating
loadingState={LoadingState.MANUAL_UPDATING}
reduxProjectId={'100'}
store={store}
@@ -363,49 +363,49 @@ describe('projectSaverHOC', () => {
test('if we are already in updating/saving state, vm project ' +
'should NOT requested, alert should NOT show', () => {
- const mockedShowCreatingAlert = jest.fn();
- const Component = () => ;
- const WrappedComponent = projectSaverHOC(Component);
- const mockedStoreProject = jest.fn(() => Promise.resolve());
- // The first wrapper is redux's Connect HOC
- WrappedComponent.WrappedComponent.prototype.storeProject = mockedStoreProject;
- const { rerender } = render(
-
- );
- rerender(
-
- );
- expect(mockedStoreProject).not.toHaveBeenCalled();
- expect(mockedShowCreatingAlert).not.toHaveBeenCalled();
- });
+ const mockedShowCreatingAlert = jest.fn();
+ const Component = () => ;
+ const WrappedComponent = projectSaverHOC(Component);
+ const mockedStoreProject = jest.fn(() => Promise.resolve());
+ // The first wrapper is redux's Connect HOC
+ WrappedComponent.WrappedComponent.prototype.storeProject = mockedStoreProject;
+ const {rerender} = render(
+
+ );
+ rerender(
+
+ );
+ expect(mockedStoreProject).not.toHaveBeenCalled();
+ expect(mockedShowCreatingAlert).not.toHaveBeenCalled();
+ });
test('if user saves, inline saving alert should show', () => {
const mockedShowSavingAlert = jest.fn();
const Component = () => ;
const WrappedComponent = projectSaverHOC(Component);
- const { rerender } = render(
+ const {rerender} = render(
{
isShowingWithoutId
canCreateNew={false}
isCreatingNew={false}
- isManualUpdating={true}
+ isManualUpdating
isShowingWithId={false}
- isUpdating={true}
+ isUpdating
loadingState={LoadingState.SHOWING_WITH_ID}
store={store}
vm={vm}
@@ -442,7 +442,7 @@ describe('projectSaverHOC', () => {
const Component = () => ;
const WrappedComponent = projectSaverHOC(Component);
const mockedAutoUpdate = jest.fn(() => Promise.resolve());
- const { rerender } = render(
+ const {rerender} = render(
{
store={store}
vm={vm}
onAutoUpdateProject={mockedAutoUpdate}
- projectChanged={true}
+ projectChanged
/>
);
// Fast-forward until all timers have been executed
@@ -474,7 +474,7 @@ describe('projectSaverHOC', () => {
const Component = () => ;
const WrappedComponent = projectSaverHOC(Component);
const mockedAutoUpdate = jest.fn(() => Promise.resolve());
- const { rerender } = render(
+ const {rerender} = render(
{
store={store}
vm={vm}
onAutoUpdateProject={mockedAutoUpdate}
- projectChanged={true}
- reduxProjectTitle='a'
+ projectChanged
+ reduxProjectTitle="a"
/>
);
rerender(
@@ -507,8 +507,8 @@ describe('projectSaverHOC', () => {
store={store}
vm={vm}
onAutoUpdateProject={mockedAutoUpdate}
- projectChanged={true}
- reduxProjectTitle='b'
+ projectChanged
+ reduxProjectTitle="b"
/>
);
rerender(
@@ -520,8 +520,8 @@ describe('projectSaverHOC', () => {
store={store}
vm={vm}
onAutoUpdateProject={mockedAutoUpdate}
- projectChanged={true}
- reduxProjectTitle='c'
+ projectChanged
+ reduxProjectTitle="c"
/>
);
// Fast-forward until all timers have been executed
@@ -533,7 +533,7 @@ describe('projectSaverHOC', () => {
const Component = () => ;
const WrappedComponent = projectSaverHOC(Component);
const mockedAutoUpdate = jest.fn(() => Promise.resolve());
- const { rerender } = render(
+ const {rerender} = render(
{
const Component = () => ;
const WrappedComponent = projectSaverHOC(Component);
WrappedComponent.WrappedComponent.prototype.storeProject = mockedStoreProject;
- const { rerender } = render(
+ const {rerender} = render(
{
);
rerender(
{
const Component = () => ;
const WrappedComponent = projectSaverHOC(Component);
WrappedComponent.WrappedComponent.prototype.storeProject = mockedStoreProject;
- const { rerender } = render(
+ const {rerender} = render(
{
});
test('uses onSetProjectThumbnailer on mount/unmount', () => {
- const Component = ({ onSetProjectThumbnailer }) => (
- {`${onSetProjectThumbnailer
- ? onSetProjectThumbnailer()
- : onSetProjectThumbnailer
- }`}
+ const Component = ({onSetProjectThumbnailer}) => (
+ {`${onSetProjectThumbnailer ?
+ onSetProjectThumbnailer() :
+ onSetProjectThumbnailer
+ }`}
);
const WrappedComponent = projectSaverHOC(Component);
const setThumb = jest.fn();
- const { container, unmount } = render(
+ const {container, unmount} = render(
{
expect(setThumb).toHaveBeenCalledTimes(1);
// And it should not pass that function on to wrapped element
- const element = container.querySelector('#onSetProjectThumbnailer')
+ const element = container.querySelector('#onSetProjectThumbnailer');
expect(element).toHaveTextContent(/undefined/i);
// Unmounting should call it again with null
@@ -641,13 +641,13 @@ describe('projectSaverHOC', () => {
});
test('uses onSetProjectSaver on mount/unmount', () => {
- const Component = ({ onSetProjectSaver }) => (
+ const Component = ({onSetProjectSaver}) => (
{`${onSetProjectSaver ? onSetProjectSaver() : onSetProjectSaver
- }`}
+ }`}
);
const WrappedComponent = projectSaverHOC(Component);
const setSaver = jest.fn();
- const { container, unmount } = render(
+ const {container, unmount} = render(
{
expect(setSaver).toHaveBeenCalledTimes(1);
// And it should not pass that function on to wrapped element
- const element = container.querySelector('#onSetProjectSaver')
+ const element = container.querySelector('#onSetProjectSaver');
expect(element).toHaveTextContent(/undefined/i);
// Unmounting should call it again with null
diff --git a/packages/scratch-gui/test/unit/util/sb-file-uploader-hoc.test.jsx b/packages/scratch-gui/test/unit/util/sb-file-uploader-hoc.test.jsx
index a8d902ad78..59779dc5cd 100644
--- a/packages/scratch-gui/test/unit/util/sb-file-uploader-hoc.test.jsx
+++ b/packages/scratch-gui/test/unit/util/sb-file-uploader-hoc.test.jsx
@@ -2,12 +2,12 @@ import 'web-audio-test-api';
import React from 'react';
import configureStore from 'redux-mock-store';
-import { renderWithIntl } from '../../helpers/intl-helpers.jsx';
-import { LoadingState } from '../../../src/reducers/project-state';
+import {renderWithIntl} from '../../helpers/intl-helpers.jsx';
+import {LoadingState} from '../../../src/reducers/project-state';
import VM from '@scratch/scratch-vm';
import SBFileUploaderHOC from '../../../src/lib/sb-file-uploader-hoc.jsx';
-import { IntlProvider } from 'react-intl';
+import {IntlProvider} from 'react-intl';
describe('SBFileUploaderHOC', () => {
const mockStore = configureStore();
@@ -59,7 +59,7 @@ describe('SBFileUploaderHOC', () => {
test('if isLoadingUpload becomes true, without fileToUpload set, will call cancelFileUpload', () => {
const mockedCancelFileUpload = jest.fn();
const WrappedComponent = getContainer();
- const { rerender } = renderWithIntl(
+ const {rerender} = renderWithIntl(
{
/>
);
rerender(
-
+
+ projectChanged
+ canSave={false}
+ cancelFileUpload={mockedCancelFileUpload}
+ closeFileMenu={jest.fn()}
+ isLoadingUpload
+ requestProjectUpload={jest.fn()}
+ store={store}
+ userOwnsProject={false}
+ vm={vm}
+ onLoadingFinished={jest.fn()}
+ onLoadingStarted={jest.fn()}
+ onUpdateProjectTitle={jest.fn()}
+ />
);
expect(mockedCancelFileUpload).toHaveBeenCalled();
diff --git a/packages/scratch-gui/test/unit/util/throttled-property-hoc.test.jsx b/packages/scratch-gui/test/unit/util/throttled-property-hoc.test.jsx
index 97238a0364..0e0d4fb45b 100644
--- a/packages/scratch-gui/test/unit/util/throttled-property-hoc.test.jsx
+++ b/packages/scratch-gui/test/unit/util/throttled-property-hoc.test.jsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { render } from '@testing-library/react'
+import {render} from '@testing-library/react';
import ThrottledPropertyHOC from '../../../src/lib/throttled-property-hoc.jsx';
@@ -27,13 +27,13 @@ describe('VMListenerHOC', () => {
});
test('it passes the props on initial render ', () => {
- const { container } = component;
- expect(container.querySelector('input').value).toEqual("0");
- expect(container.querySelector('input').name).toEqual("oldvalue");
+ const {container} = component;
+ expect(container.querySelector('input').value).toEqual('0');
+ expect(container.querySelector('input').name).toEqual('oldvalue');
});
test('it does not rerender if throttled prop is updated too soon', () => {
- const { container, rerender } = component;
+ const {container, rerender} = component;
global.Date.now = () => throttleTime / 2;
rerender(
{
propToThrottle={1}
/>
);
- expect(container.querySelector('input').value).toEqual("0");
+ expect(container.querySelector('input').value).toEqual('0');
});
test('it does rerender if throttled prop is updated after throttle timeout', () => {
- const { container, rerender } = component;
+ const {container, rerender} = component;
global.Date.now = () => throttleTime * 2;
rerender(
{
propToThrottle={1}
/>
);
- expect(container.querySelector('input').value).toEqual("1");
+ expect(container.querySelector('input').value).toEqual('1');
});
test('it does rerender if a non-throttled prop is changed', () => {
- const { container, rerender } = component;
+ const {container, rerender} = component;
global.Date.now = () => throttleTime / 2;
rerender(
{
propToThrottle={2}
/>
);
- expect(container.querySelector('input').value).toEqual("2");
- expect(container.querySelector('input').name).toEqual("newvalue");
+ expect(container.querySelector('input').value).toEqual('2');
+ expect(container.querySelector('input').name).toEqual('newvalue');
});
});
diff --git a/packages/scratch-gui/test/unit/util/vm-listener-hoc.test.jsx b/packages/scratch-gui/test/unit/util/vm-listener-hoc.test.jsx
index ef4827abad..9db0204a81 100644
--- a/packages/scratch-gui/test/unit/util/vm-listener-hoc.test.jsx
+++ b/packages/scratch-gui/test/unit/util/vm-listener-hoc.test.jsx
@@ -1,6 +1,6 @@
import React from 'react';
import configureStore from 'redux-mock-store';
-import { render } from '@testing-library/react'
+import {render} from '@testing-library/react';
import VM from '@scratch/scratch-vm';
import vmListenerHOC from '../../../src/lib/vm-listener-hoc.jsx';
@@ -39,21 +39,21 @@ describe('VMListenerHOC', () => {
});
test('onGreenFlag is not passed to the children', () => {
- const Component = ({ onGreenFlag }) => (
- {`${onGreenFlag
- ? onGreenFlag()
- : onGreenFlag
- }`}
+ const Component = ({onGreenFlag}) => (
+ {`${onGreenFlag ?
+ onGreenFlag() :
+ onGreenFlag
+ }`}
);
const WrappedComponent = vmListenerHOC(Component);
- const { container } = render(
+ const {container} = render(
);
- const element = container.querySelector('#onGreenFlag')
+ const element = container.querySelector('#onGreenFlag');
expect(element).toHaveTextContent(/undefined/i);
});
@@ -68,7 +68,7 @@ describe('VMListenerHOC', () => {
);
const targetList = [];
const editingTarget = 'id';
- vm.emit('targetsUpdate', { targetList, editingTarget });
+ vm.emit('targetsUpdate', {targetList, editingTarget});
const actions = store.getActions();
expect(actions[0].type).toEqual('scratch-gui/targets/UPDATE_TARGET_LIST');
expect(actions[0].targets).toEqual(targetList);
@@ -81,7 +81,7 @@ describe('VMListenerHOC', () => {
store = mockStore({
scratchGui: {
mode: {},
- modals: { soundRecorder: true },
+ modals: {soundRecorder: true},
vm: vm
}
});
@@ -93,7 +93,7 @@ describe('VMListenerHOC', () => {
);
const targetList = [];
const editingTarget = 'id';
- vm.emit('targetsUpdate', { targetList, editingTarget });
+ vm.emit('targetsUpdate', {targetList, editingTarget});
const actions = store.getActions();
expect(actions.length).toEqual(0);
});
@@ -104,7 +104,7 @@ describe('VMListenerHOC', () => {
store = mockStore({
scratchGui: {
mode: {},
- modals: { soundRecorder: true },
+ modals: {soundRecorder: true},
vm: vm
}
});
@@ -124,8 +124,8 @@ describe('VMListenerHOC', () => {
const WrappedComponent = vmListenerHOC(Component);
store = mockStore({
scratchGui: {
- mode: { isFullScreen: true },
- modals: { soundRecorder: true },
+ mode: {isFullScreen: true},
+ modals: {soundRecorder: true},
vm: vm
}
});
@@ -155,8 +155,8 @@ describe('VMListenerHOC', () => {
store = mockStore({
scratchGui: {
- mode: { isFullScreen: true },
- modals: { soundRecorder: true },
+ mode: {isFullScreen: true},
+ modals: {soundRecorder: true},
vm: vm
}
});
@@ -169,19 +169,19 @@ describe('VMListenerHOC', () => {
);
// keyboard events that do not target the document or body are ignored
- eventTriggers.keydown({ key: 'A', target: null });
- expect(vm.postIOData).not.toHaveBeenLastCalledWith('keyboard', { key: 'A', isDown: true });
+ eventTriggers.keydown({key: 'A', target: null});
+ expect(vm.postIOData).not.toHaveBeenLastCalledWith('keyboard', {key: 'A', isDown: true});
// keydown/up with target as the document are sent to the vm via postIOData
- eventTriggers.keydown({ key: 'A', target: document });
- expect(vm.postIOData).toHaveBeenLastCalledWith('keyboard', { key: 'A', isDown: true });
+ eventTriggers.keydown({key: 'A', target: document});
+ expect(vm.postIOData).toHaveBeenLastCalledWith('keyboard', {key: 'A', isDown: true});
- eventTriggers.keyup({ key: 'A', target: document });
- expect(vm.postIOData).toHaveBeenLastCalledWith('keyboard', { key: 'A', isDown: false });
+ eventTriggers.keyup({key: 'A', target: document});
+ expect(vm.postIOData).toHaveBeenLastCalledWith('keyboard', {key: 'A', isDown: false});
// When key is 'Dead' e.g. bluetooth keyboards on iOS, it sends keyCode instead
// because the VM can process both named keys or keyCodes as the `key` property
- eventTriggers.keyup({ key: 'Dead', keyCode: 10, target: document });
- expect(vm.postIOData).toHaveBeenLastCalledWith('keyboard', { key: 10, isDown: false });
+ eventTriggers.keyup({key: 'Dead', keyCode: 10, target: document});
+ expect(vm.postIOData).toHaveBeenLastCalledWith('keyboard', {key: 10, isDown: false});
});
});
diff --git a/packages/scratch-gui/test/unit/util/vm-manager-hoc.test.jsx b/packages/scratch-gui/test/unit/util/vm-manager-hoc.test.jsx
index 81a7600045..9f2fe143e7 100644
--- a/packages/scratch-gui/test/unit/util/vm-manager-hoc.test.jsx
+++ b/packages/scratch-gui/test/unit/util/vm-manager-hoc.test.jsx
@@ -6,7 +6,7 @@ WebAudioTestAPI.setState({
import React from 'react';
import configureStore from 'redux-mock-store';
-import {render} from '@testing-library/react'
+import {render} from '@testing-library/react';
import VM from '@scratch/scratch-vm';
import {LoadingState} from '../../../src/reducers/project-state';
@@ -96,7 +96,7 @@ describe('VMManagerHOC', () => {
const Component = () => ;
const WrappedComponent = vmManagerHOC(Component);
vm.initialized = true;
- const { rerender } = render(
+ const {rerender} = render(
{
const Component = () => ;
const WrappedComponent = vmManagerHOC(Component);
vm.initialized = true;
- const { rerender } = render(
+ const {rerender} = render(
{
const mockedOnLoadedProject = jest.fn();
const Component = () => ;
const WrappedComponent = vmManagerHOC(Component);
- const { rerender } = render(
+ const {rerender} = render(
{
rerender(
);
expect(vm.loadProject).toHaveBeenLastCalledWith('100');
- // nextTick needed since vm.loadProject is async, and we have to wait for it :/
- process.nextTick(() => (
+ // delay needed since vm.loadProject is async, and we have to wait for it :/
+ setTimeout(() => (
expect(mockedOnLoadedProject).toHaveBeenLastCalledWith(LoadingState.LOADING_VM_WITH_ID, true)
- ));
+ ), 1);
});
test('if the fontsLoaded prop becomes true, it loads project data into the vm', () => {
vm.loadProject = jest.fn(() => Promise.resolve());
const mockedOnLoadedProject = jest.fn();
const Component = () => ;
const WrappedComponent = vmManagerHOC(Component);
- const { rerender } = render(
+ const {rerender} = render(
{
vm={vm}
onLoadedProject={mockedOnLoadedProject}
canSave={false}
- fontsLoaded={true}
+ fontsLoaded
loadingState={LoadingState.LOADING_VM_WITH_ID}
- projectData='100'
+ projectData="100"
/>
);
expect(vm.loadProject).toHaveBeenLastCalledWith('100');
- // nextTick needed since vm.loadProject is async, and we have to wait for it :/
- process.nextTick(() => (
+ // delay needed since vm.loadProject is async, and we have to wait for it :/
+ setTimeout(() => (
expect(mockedOnLoadedProject).toHaveBeenLastCalledWith(LoadingState.LOADING_VM_WITH_ID, false)
- ));
+ ), 1);
});
test('if the fontsLoaded prop is false, project data is never loaded', () => {
vm.loadProject = jest.fn(() => Promise.resolve());
const mockedOnLoadedProject = jest.fn();
const Component = () => ;
const WrappedComponent = vmManagerHOC(Component);
- const { rerender } = render(
+ const {rerender} = render(
{
vm={vm}
onLoadedProject={mockedOnLoadedProject}
loadingState={LoadingState.LOADING_VM_WITH_ID}
- projectData='100'
+ projectData="100"
/>
);
expect(vm.loadProject).toHaveBeenCalledTimes(0);
- process.nextTick(() => expect(mockedOnLoadedProject).toHaveBeenCalledTimes(0));
+ // delay needed since vm.loadProject is async
+ setTimeout(() => expect(mockedOnLoadedProject).toHaveBeenCalledTimes(0), 1);
});
});
diff --git a/packages/scratch-gui/tsconfig.json b/packages/scratch-gui/tsconfig.json
index e750f01f2d..4e0b284662 100644
--- a/packages/scratch-gui/tsconfig.json
+++ b/packages/scratch-gui/tsconfig.json
@@ -6,6 +6,7 @@
/* Language and Environment */
"target": "ESNext",
"jsx": "react",
+ "allowJs": true,
/* Modules */
"module": "commonjs",
diff --git a/packages/scratch-gui/tsconfig.test.json b/packages/scratch-gui/tsconfig.test.json
index 5e0a25a50a..fb68dfd4d5 100644
--- a/packages/scratch-gui/tsconfig.test.json
+++ b/packages/scratch-gui/tsconfig.test.json
@@ -1,11 +1,10 @@
{
- "include": ["src"],
- "extends": ["./tsconfig.json"],
+ "include": ["test"],
+ "extends": "./tsconfig.json",
"compilerOptions": {
/* Visit https://aka.ms/tsconfig to read more about this file */
/* Modules */
- "module": "CommonJS",
"types": ["jest", "./src/types.d.ts"],
}
}
diff --git a/packages/scratch-render/.eslintignore b/packages/scratch-render/.eslintignore
deleted file mode 100644
index 5821b50ad8..0000000000
--- a/packages/scratch-render/.eslintignore
+++ /dev/null
@@ -1,4 +0,0 @@
-dist/*
-node_modules/*
-playground/*
-tap-snapshots/*
diff --git a/packages/scratch-render/.eslintrc.js b/packages/scratch-render/.eslintrc.js
deleted file mode 100644
index ad845bc689..0000000000
--- a/packages/scratch-render/.eslintrc.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = {
- root: true,
- extends: ['scratch', 'scratch/node', 'scratch/es6']
-};
diff --git a/packages/scratch-render/eslint.config.mjs b/packages/scratch-render/eslint.config.mjs
new file mode 100644
index 0000000000..5e27593895
--- /dev/null
+++ b/packages/scratch-render/eslint.config.mjs
@@ -0,0 +1,41 @@
+import {eslintConfigScratch} from 'eslint-config-scratch';
+import {globalIgnores} from 'eslint/config';
+import globals from 'globals';
+
+export default eslintConfigScratch.defineConfig(
+ eslintConfigScratch.legacy.base,
+ {
+ files: ['src/**/*.{,c,m}js'],
+ extends: [eslintConfigScratch.legacy.es6],
+ languageOptions: {
+ globals: globals.browser
+ }
+ },
+ {
+ files: [
+ '*.{,c,m}js', // for example, webpack.config.js
+ 'test/**/*.{,c,m}js'
+ ],
+ extends: [eslintConfigScratch.legacy.node],
+ languageOptions: {
+ globals: globals.node
+ }
+ },
+ {
+ files: ['test/helper/**/*.{,c,m}js'],
+ languageOptions: {
+ globals: globals.browser
+ }
+ },
+ {
+ files: ['src/playground/**/*.{,c,m}js'],
+ rules: {
+ 'no-console': 'off'
+ }
+ },
+ globalIgnores([
+ 'dist/**/*',
+ 'node_modules/**/*',
+ 'playground/**/*'
+ ])
+);
diff --git a/packages/scratch-render/package.json b/packages/scratch-render/package.json
index a343d660de..1baeecf490 100644
--- a/packages/scratch-render/package.json
+++ b/packages/scratch-render/package.json
@@ -24,7 +24,7 @@
"build": "webpack --progress && npm run docs",
"clean": "rimraf dist playground",
"docs": "jsdoc -c .jsdoc.json",
- "lint": "eslint .",
+ "lint": "eslint",
"prepublish": "npm run build",
"prepublish-watch": "npm run watch",
"start": "webpack-dev-server",
@@ -58,16 +58,16 @@
},
"devDependencies": {
"@babel/core": "7.28.4",
- "@babel/eslint-parser": "7.28.4",
"@babel/polyfill": "7.12.1",
"@babel/preset-env": "7.28.3",
"@scratch/scratch-vm": "11.6.0",
"babel-loader": "9.2.1",
"copy-webpack-plugin": "6.4.1",
"docdash": "0.4.0",
- "eslint": "8.57.1",
- "eslint-config-scratch": "9.0.9",
+ "eslint": "9.37.0",
+ "eslint-config-scratch": "^12.0.8",
"gh-pages": "1.2.0",
+ "globals": "^16.4.0",
"html-webpack-plugin": "5.6.4",
"jsdoc": "3.6.11",
"json": "9.0.6",
diff --git a/packages/scratch-render/src/.eslintrc.js b/packages/scratch-render/src/.eslintrc.js
deleted file mode 100644
index 11b4d5aad4..0000000000
--- a/packages/scratch-render/src/.eslintrc.js
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = {
- root: true,
- extends: ['scratch', 'scratch/es6', 'scratch/node'],
- env: {
- node: false,
- browser: true // TODO: disable this
- },
- globals: {
- Buffer: true // TODO: remove this?
- }
-};
diff --git a/packages/scratch-render/src/BitmapSkin.js b/packages/scratch-render/src/BitmapSkin.js
index e48ce43a29..7aa7096d70 100644
--- a/packages/scratch-render/src/BitmapSkin.js
+++ b/packages/scratch-render/src/BitmapSkin.js
@@ -5,7 +5,7 @@ const Skin = require('./Skin');
class BitmapSkin extends Skin {
/**
* Create a new Bitmap Skin.
- * @extends Skin
+ * @augments Skin
* @param {!int} id - The ID for this Skin.
* @param {!RenderWebGL} renderer - The renderer which will use this skin.
*/
@@ -34,7 +34,7 @@ class BitmapSkin extends Skin {
}
/**
- * @return {Array} the "native" size, in texels, of this skin.
+ * @returns {Array} the "native" size, in texels, of this skin.
*/
get size () {
return [this._textureSize[0] / this._costumeResolution, this._textureSize[1] / this._costumeResolution];
@@ -42,7 +42,7 @@ class BitmapSkin extends Skin {
/**
* @param {Array} scale - The scaling factors to be used.
- * @return {WebGLTexture} The GL texture representation of this skin when drawing at the given scale.
+ * @returns {WebGLTexture} The GL texture representation of this skin when drawing at the given scale.
*/
// eslint-disable-next-line no-unused-vars
getTexture (scale) {
@@ -52,7 +52,7 @@ class BitmapSkin extends Skin {
/**
* Set the contents of this skin to a snapshot of the provided bitmap data.
* @param {ImageData|HTMLImageElement|HTMLCanvasElement|HTMLVideoElement} bitmapData - new contents for this skin.
- * @param {int} [costumeResolution=1] - The resolution to use for this bitmap.
+ * @param {int} [costumeResolution] - The resolution to use for this bitmap.
* @param {Array} [rotationCenter] - Optional rotation center for the bitmap. If not supplied, it will be
* calculated from the bounding box
* @fires Skin.event:WasAltered
diff --git a/packages/scratch-render/src/Drawable.js b/packages/scratch-render/src/Drawable.js
index 7a2813d88c..5afadbf541 100644
--- a/packages/scratch-render/src/Drawable.js
+++ b/packages/scratch-render/src/Drawable.js
@@ -20,10 +20,9 @@ const FLOATING_POINT_ERROR_ALLOWANCE = 1e-6;
* internal __isTouchingPosition as a return value, so this should be copied
* if you ever need to get two local positions and store both. Requires that
* the drawable inverseMatrix is up to date.
- *
* @param {Drawable} drawable The drawable to get the inverse matrix and uniforms from
* @param {twgl.v3} vec [x,y] scratch space vector
- * @return {twgl.v3} [x,y] texture space float vector - transformed by effects and matrix
+ * @returns {twgl.v3} [x,y] texture space float vector - transformed by effects and matrix
*/
const getLocalPosition = (drawable, vec) => {
// Transfrom from world coordinates to Drawable coordinates.
@@ -59,7 +58,7 @@ class Drawable {
* An object which can be drawn by the renderer.
* @todo double-buffer all rendering state (position, skin, effects, etc.)
* @param {!int} id - This Drawable's unique ID.
- * @constructor
+ * @class
*/
constructor (id) {
/** @type {!int} */
@@ -108,9 +107,10 @@ class Drawable {
this._inverseTransformDirty = true;
this._visible = true;
- /** A bitmask identifying which effects are currently in use.
+ /**
+ * A bitmask identifying which effects are currently in use.
* @readonly
- * @type {int} */
+ @type {int} */
this.enabledEffects = 0;
/** @todo move convex hull functionality, maybe bounds functionality overall, to Skin classes */
@@ -443,7 +443,7 @@ class Drawable {
/**
* Whether the Drawable needs convex hull points provided by the renderer.
- * @return {boolean} True when no convex hull known, or it's dirty.
+ * @returns {boolean} True when no convex hull known, or it's dirty.
*/
needsConvexHullPoints () {
return !this._convexHullPoints || this._convexHullDirty || this._convexHullPoints.length === 0;
@@ -481,7 +481,7 @@ class Drawable {
* The caller is responsible for ensuring this drawable's inverse matrix & its skin's silhouette are up-to-date.
* @see updateCPURenderAttributes
* @param {twgl.v3} vec World coordinate vector.
- * @return {boolean} True if the world position touches the skin.
+ * @returns {boolean} True if the world position touches the skin.
*/
// `updateCPURenderAttributes` sets this Drawable instance's `isTouching` method
@@ -510,7 +510,7 @@ class Drawable {
* and then finds the minimum box along the axes.
* Before calling this, ensure the renderer has updated convex hull points.
* @param {?Rectangle} result optional destination for bounds calculation
- * @return {!Rectangle} Bounds for a tight box around the Drawable.
+ * @returns {!Rectangle} Bounds for a tight box around the Drawable.
*/
getBounds (result) {
if (this.needsConvexHullPoints()) {
@@ -531,7 +531,7 @@ class Drawable {
* Used for calculating where to position a text bubble.
* Before calling this, ensure the renderer has updated convex hull points.
* @param {?Rectangle} result optional destination for bounds calculation
- * @return {!Rectangle} Bounds for a tight box around a slice of the Drawable.
+ * @returns {!Rectangle} Bounds for a tight box around a slice of the Drawable.
*/
getBoundsForBubble (result) {
if (this.needsConvexHullPoints()) {
@@ -558,7 +558,7 @@ class Drawable {
* `getAABB` returns a much less accurate bounding box, but will be much
* faster to calculate so may be desired for quick checks/optimizations.
* @param {?Rectangle} result optional destination for bounds calculation
- * @return {!Rectangle} Rough axis-aligned bounding box for Drawable.
+ * @returns {!Rectangle} Rough axis-aligned bounding box for Drawable.
*/
getAABB (result) {
if (this._transformDirty) {
@@ -575,7 +575,7 @@ class Drawable {
* I.e., returns the tight bounding box when the convex hull points are already
* known, but otherwise return the rough AABB of the Drawable.
* @param {?Rectangle} result optional destination for bounds calculation
- * @return {!Rectangle} Bounds for the Drawable.
+ * @returns {!Rectangle} Bounds for the Drawable.
*/
getFastBounds (result) {
if (!this.needsConvexHullPoints()) {
@@ -588,7 +588,7 @@ class Drawable {
* Transform all the convex hull points by the current Drawable's
* transform. This allows us to skip recalculating the convex hull
* for many Drawable updates, including translation, rotation, scaling.
- * @return {!Array.} Array of glPoints which are Array
+ * @returns {!Array.} Array of glPoints which are Array
* @private
*/
_getTransformedHullPoints () {
@@ -723,7 +723,7 @@ class Drawable {
const textColor =
// commenting out to only use nearest for now
// drawable.skin.useNearest(drawable._scale, drawable) ?
- drawable.skin._silhouette.colorAtNearest(localPosition, dst);
+ drawable.skin._silhouette.colorAtNearest(localPosition, dst);
// : drawable.skin._silhouette.colorAtLinear(localPosition, dst);
if (drawable.enabledEffects === 0) return textColor;
diff --git a/packages/scratch-render/src/EffectTransform.js b/packages/scratch-render/src/EffectTransform.js
index 7ffae18ab4..ea7306f3fb 100644
--- a/packages/scratch-render/src/EffectTransform.js
+++ b/packages/scratch-render/src/EffectTransform.js
@@ -1,5 +1,5 @@
/**
- * @fileoverview
+ * @file
* A utility to transform a texture coordinate to another texture coordinate
* representing how the shaders apply effects.
*/
@@ -11,13 +11,13 @@ const ShaderManager = require('./ShaderManager');
/**
* A texture coordinate is between 0 and 1. 0.5 is the center position.
- * @const {number}
+ * @constant {number}
*/
const CENTER_X = 0.5;
/**
* A texture coordinate is between 0 and 1. 0.5 is the center position.
- * @const {number}
+ * @constant {number}
*/
const CENTER_Y = 0.5;
@@ -123,7 +123,7 @@ class EffectTransform {
* @param {Drawable} drawable The drawable whose effects to emulate.
* @param {twgl.v3} vec The texture coordinate to transform.
* @param {twgl.v3} dst A place to store the output coordinate.
- * @return {twgl.v3} dst - The coordinate after being transform by effects.
+ * @returns {twgl.v3} dst - The coordinate after being transform by effects.
*/
static transformPoint (drawable, vec, dst) {
twgl.v3.copy(vec, dst);
diff --git a/packages/scratch-render/src/PenSkin.js b/packages/scratch-render/src/PenSkin.js
index 8248b1f8d2..9129fda2be 100644
--- a/packages/scratch-render/src/PenSkin.js
+++ b/packages/scratch-render/src/PenSkin.js
@@ -17,7 +17,7 @@ const ShaderManager = require('./ShaderManager');
* @type {PenSkin#PenAttributes}
* @memberof PenSkin
* @private
- * @const
+ * @constant
*/
const DefaultPenAttributes = {
color4f: [0, 0, 1, 1],
@@ -35,7 +35,7 @@ class PenSkin extends Skin {
* Create a Skin which implements a Scratch pen layer.
* @param {int} id - The unique ID for this Skin.
* @param {RenderWebGL} renderer - The renderer which will use this Skin.
- * @extends Skin
+ * @augments Skin
* @listens RenderWebGL#event:NativeSizeChanged
*/
constructor (id, renderer) {
@@ -110,7 +110,7 @@ class PenSkin extends Skin {
}
/**
- * @return {Array} the "native" size, in texels, of this skin. [width, height]
+ * @returns {Array} the "native" size, in texels, of this skin. [width, height]
*/
get size () {
return this._size;
@@ -124,7 +124,7 @@ class PenSkin extends Skin {
/**
* @param {Array} scale The X and Y scaling factors to be used, as percentages of this skin's "native" size.
- * @return {WebGLTexture} The GL texture representation of this skin when drawing at the given size.
+ * @returns {WebGLTexture} The GL texture representation of this skin when drawing at the given size.
*/
// eslint-disable-next-line no-unused-vars
getTexture (scale) {
diff --git a/packages/scratch-render/src/Rectangle.js b/packages/scratch-render/src/Rectangle.js
index c998651b05..235731942c 100644
--- a/packages/scratch-render/src/Rectangle.js
+++ b/packages/scratch-render/src/Rectangle.js
@@ -3,7 +3,7 @@ class Rectangle {
* A utility for creating and comparing axis-aligned rectangles.
* Rectangles are always initialized to the "largest possible rectangle";
* use one of the init* methods below to set up a particular rectangle.
- * @constructor
+ * @class
*/
constructor () {
this.left = -Infinity;
@@ -84,7 +84,7 @@ class Rectangle {
* Note that this is a comparison assuming the Rectangle was
* initialized with Scratch-space bounds or points.
* @param {!Rectangle} other Rectangle to check if intersecting.
- * @return {boolean} True if this Rectangle intersects other.
+ * @returns {boolean} True if this Rectangle intersects other.
*/
intersects (other) {
return (
@@ -100,7 +100,7 @@ class Rectangle {
* Note that this is a comparison assuming the Rectangle was
* initialized with Scratch-space bounds or points.
* @param {!Rectangle} other Rectangle to check if fully contained.
- * @return {boolean} True if this Rectangle fully contains other.
+ * @returns {boolean} True if this Rectangle fully contains other.
*/
contains (other) {
return (
@@ -177,7 +177,7 @@ class Rectangle {
/**
* Width of the Rectangle.
- * @return {number} Width of rectangle.
+ * @returns {number} Width of rectangle.
*/
get width () {
return Math.abs(this.left - this.right);
@@ -185,7 +185,7 @@ class Rectangle {
/**
* Height of the Rectangle.
- * @return {number} Height of rectangle.
+ * @returns {number} Height of rectangle.
*/
get height () {
return Math.abs(this.top - this.bottom);
diff --git a/packages/scratch-render/src/RenderConstants.js b/packages/scratch-render/src/RenderConstants.js
index 04323c9ff7..3957d9fefd 100644
--- a/packages/scratch-render/src/RenderConstants.js
+++ b/packages/scratch-render/src/RenderConstants.js
@@ -7,14 +7,14 @@
module.exports = {
/**
* The ID value to use for "no item" or when an object has been disposed.
- * @const {int}
+ * @constant {int}
*/
ID_NONE: -1,
/**
* Optimize for fewer than this number of Drawables sharing the same Skin.
* Going above this may cause middleware warnings or a performance penalty but should otherwise behave correctly.
- * @const {int}
+ * @constant {int}
*/
SKIN_SHARE_SOFT_LIMIT: 301,
@@ -24,7 +24,6 @@ module.exports = {
Events: {
/**
* NativeSizeChanged event
- *
* @event RenderWebGL#event:NativeSizeChanged
* @type {object}
* @property {Array} newSize - the new size of the renderer
diff --git a/packages/scratch-render/src/RenderWebGL.js b/packages/scratch-render/src/RenderWebGL.js
index a948c5049c..71f29e194b 100644
--- a/packages/scratch-render/src/RenderWebGL.js
+++ b/packages/scratch-render/src/RenderWebGL.js
@@ -27,7 +27,7 @@ const __cpuTouchingColorPixelCount = 4e4;
/**
* @callback RenderWebGL#idFilterFunc
* @param {int} drawableID The ID to filter.
- * @return {bool} True if the ID passes the filter, otherwise false.
+ * @returns {bool} True if the ID passes the filter, otherwise false.
*/
/**
@@ -99,7 +99,7 @@ class RenderWebGL extends EventEmitter {
try {
// Create the context the same way that the constructor will: attributes may make the difference.
return !!RenderWebGL._getContext(optCanvas || document.createElement('canvas'));
- } catch (e) {
+ } catch (e) { // eslint-disable-line no-unused-vars
return false;
}
}
@@ -128,11 +128,11 @@ class RenderWebGL extends EventEmitter {
* @see RenderWebGL#setStageSize
* @see RenderWebGL#resize
* @param {canvas} canvas The canvas to draw onto.
- * @param {int} [xLeft=-240] The x-coordinate of the left edge.
- * @param {int} [xRight=240] The x-coordinate of the right edge.
- * @param {int} [yBottom=-180] The y-coordinate of the bottom edge.
- * @param {int} [yTop=180] The y-coordinate of the top edge.
- * @constructor
+ * @param {int} [xLeft] The x-coordinate of the left edge.
+ * @param {int} [xRight] The x-coordinate of the right edge.
+ * @param {int} [yBottom] The y-coordinate of the bottom edge.
+ * @param {int} [yTop] The y-coordinate of the top edge.
+ * @class
* @listens RenderWebGL#event:NativeSizeChanged
*/
constructor (canvas, xLeft, xRight, yBottom, yTop) {
@@ -158,7 +158,7 @@ class RenderWebGL extends EventEmitter {
// A list of layer group names in the order they should appear
// from furthest back to furthest in front.
- /** @type {Array} */
+ /** @type {Array} */
this._groupOrdering = [];
/**
@@ -316,7 +316,7 @@ class RenderWebGL extends EventEmitter {
}
/**
- * @return {Array} the "native" size of the stage, which is used for pen, query renders, etc.
+ * @returns {Array} the "native" size of the stage, which is used for pen, query renders, etc.
*/
getNativeSize () {
return [this._nativeSize[0], this._nativeSize[1]];
@@ -337,7 +337,7 @@ class RenderWebGL extends EventEmitter {
/**
* Create a new bitmap skin from a snapshot of the provided bitmap data.
* @param {ImageData|HTMLImageElement|HTMLCanvasElement|HTMLVideoElement} bitmapData - new contents for this skin.
- * @param {!int} [costumeResolution=1] - The resolution to use for this bitmap.
+ * @param {!int} [costumeResolution] - The resolution to use for this bitmap.
* @param {?Array} [rotationCenter] Optional: rotation center of the skin. If not supplied, the center of
* the skin will be used.
* @returns {!int} the ID for the new skin.
@@ -578,7 +578,7 @@ class RenderWebGL extends EventEmitter {
* Returns the position of the given drawableID in the draw list. This is
* the absolute position irrespective of layer group.
* @param {number} drawableID The drawable ID to find.
- * @return {number} The postion of the given drawable ID.
+ * @returns {number} The postion of the given drawable ID.
*/
getDrawableOrder (drawableID) {
return this._drawList.indexOf(drawableID);
@@ -598,7 +598,7 @@ class RenderWebGL extends EventEmitter {
* of the layer group.
* @param {boolean=} optIsRelative If set, `order` refers to a relative change.
* @param {number=} optMin If set, order constrained to be at least `optMin`.
- * @return {?number} New order if changed, or null.
+ * @returns {?number} New order if changed, or null.
*/
setDrawableOrder (drawableID, order, group, optIsRelative, optMin) {
if (!group || !Object.prototype.hasOwnProperty.call(this._layerGroups, group)) {
@@ -672,7 +672,7 @@ class RenderWebGL extends EventEmitter {
/**
* Get the precise bounds for a Drawable.
* @param {int} drawableID ID of Drawable to get bounds for.
- * @return {object} Bounds for a tight box around the Drawable.
+ * @returns {object} Bounds for a tight box around the Drawable.
*/
getBounds (drawableID) {
const drawable = this._allDrawables[drawableID];
@@ -705,7 +705,7 @@ class RenderWebGL extends EventEmitter {
* Get the precise bounds for a Drawable around the top slice.
* Used for positioning speech bubbles more closely to the sprite.
* @param {int} drawableID ID of Drawable to get bubble bounds for.
- * @return {object} Bounds for a tight box around the Drawable top slice.
+ * @returns {object} Bounds for a tight box around the Drawable top slice.
*/
getBoundsForBubble (drawableID) {
const drawable = this._allDrawables[drawableID];
@@ -737,7 +737,7 @@ class RenderWebGL extends EventEmitter {
/**
* Get the current skin (costume) size of a Drawable.
* @param {int} drawableID The ID of the Drawable to measure.
- * @return {Array} Skin size, width and height.
+ * @returns {Array} Skin size, width and height.
*/
getCurrentSkinSize (drawableID) {
const drawable = this._allDrawables[drawableID];
@@ -747,7 +747,7 @@ class RenderWebGL extends EventEmitter {
/**
* Get the size of a skin by ID.
* @param {int} skinID The ID of the Skin to measure.
- * @return {Array} Skin size, width and height.
+ * @returns {Array} Skin size, width and height.
*/
getSkinSize (skinID) {
const skin = this._allSkins[skinID];
@@ -757,7 +757,7 @@ class RenderWebGL extends EventEmitter {
/**
* Get the rotation center of a skin by ID.
* @param {int} skinID The ID of the Skin
- * @return {Array} The rotationCenterX and rotationCenterY
+ * @returns {Array} The rotationCenterX and rotationCenterY
*/
getSkinRotationCenter (skinID) {
const skin = this._allSkins[skinID];
@@ -1005,7 +1005,6 @@ class RenderWebGL extends EventEmitter {
* Convert a client based x/y position on the canvas to a Scratch 3 world space
* Rectangle. This creates recangles with a radius to cover selecting multiple
* scratch pixels with touch / small render areas.
- *
* @param {int} centerX The client x coordinate of the picking location.
* @param {int} centerY The client y coordinate of the picking location.
* @param {int} [width] The client width of the touch event (optional).
@@ -1041,7 +1040,6 @@ class RenderWebGL extends EventEmitter {
/**
* Determine if the drawable is touching a client based x/y. Helper method for sensing
* touching mouse-pointer. Ignores visibility.
- *
* @param {int} drawableID The ID of the drawable to check.
* @param {int} centerX The client x coordinate of the picking location.
* @param {int} centerY The client y coordinate of the picking location.
@@ -1071,7 +1069,6 @@ class RenderWebGL extends EventEmitter {
/**
* Determine if the drawable is touching a rectangle.
- *
* @param {int} drawableID The ID of the drawable to check.
* @param {int} left - The left X coordinate of the rectangle.
* @param {int} top - The top Y coordinate of the rectangle.
@@ -1102,7 +1099,6 @@ class RenderWebGL extends EventEmitter {
/**
* Determine if the drawable is touching a point in the Scratch coordinate system
- *
* @param {int} drawableID The ID of the drawable to check.
* @param {int} x The x coordinate of the point.
* @param {int} y The y coordinate of the point.
@@ -1122,7 +1118,6 @@ class RenderWebGL extends EventEmitter {
* This function will pick all drawables that are visible, unless specific
* candidate drawable IDs are provided. Used for determining what is clicked
* or dragged. Will not select hidden / ghosted sprites.
- *
* @param {int} centerX The client x coordinate of the picking location.
* @param {int} centerY The client y coordinate of the picking location.
* @param {int} [touchWidth] The client width of the touch event (optional).
@@ -1200,7 +1195,7 @@ class RenderWebGL extends EventEmitter {
/**
* Return a drawable's pixel data and bounds in screen space.
* @param {int} drawableID The ID of the drawable to get pixel data for
- * @return {DrawableExtraction} Data about the picked drawable
+ * @returns {DrawableExtraction} Data about the picked drawable
*/
extractDrawableScreenSpace (drawableID) {
const drawable = this._allDrawables[drawableID];
@@ -1313,7 +1308,7 @@ class RenderWebGL extends EventEmitter {
* @param {int} x The client x coordinate of the picking location.
* @param {int} y The client y coordinate of the picking location.
* @param {int} radius The client radius to extract pixels with.
- * @return {?ColorExtraction} Data about the picked color
+ * @returns {?ColorExtraction} Data about the picked color
*/
extractColor (x, y, radius) {
this._doExitDrawRegion();
@@ -1373,7 +1368,7 @@ class RenderWebGL extends EventEmitter {
/**
* Get the candidate bounding box for a touching query.
* @param {int} drawableID ID for drawable of query.
- * @return {?Rectangle} Rectangle bounds for touching query, or null.
+ * @returns {?Rectangle} Rectangle bounds for touching query, or null.
*/
_touchingBounds (drawableID) {
const drawable = this._allDrawables[drawableID];
@@ -1402,7 +1397,7 @@ class RenderWebGL extends EventEmitter {
* could possibly intersect the given bounds.
* @param {int} drawableID - ID for drawable of query.
* @param {Array} candidateIDs - Candidates for touching query.
- * @return {?Array< {id, drawable, intersection} >} Filtered candidates with useful data.
+ * @returns {?Array< {id, drawable, intersection} >} Filtered candidates with useful data.
*/
_candidatesTouching (drawableID, candidateIDs) {
const bounds = this._touchingBounds(drawableID);
@@ -1445,7 +1440,7 @@ class RenderWebGL extends EventEmitter {
* Helper to get the union bounds from a set of candidates returned from the above method
* @private
* @param {Array