change setState() to updateState()

this way we don't wipe out state if we change a different value
This commit is contained in:
David Lechner
2021-01-22 15:58:10 -06:00
parent 79e06bcd51
commit 08fea237c9
7 changed files with 43 additions and 43 deletions
+3 -3
View File
@@ -15,7 +15,7 @@ test('open', async () => {
const mockEditor = mock<Ace.EditSession>();
const data = new Uint8Array().buffer;
saga.setState({ editor: { current: mockEditor } });
saga.updateState({ editor: { current: mockEditor } });
saga.put(open(data));
expect(mockEditor.setValue).toBeCalled();
@@ -27,7 +27,7 @@ test('saveAs', async () => {
const saga = new AsyncSaga(editor);
const mockEditor = mock<Ace.EditSession>();
saga.setState({ editor: { current: mockEditor } });
saga.updateState({ editor: { current: mockEditor } });
saga.put(saveAs());
expect(mockEditor.getValue).toBeCalled();
@@ -39,7 +39,7 @@ test('reloadProgram', async () => {
const saga = new AsyncSaga(editor);
const mockEditor = mock<Ace.EditSession>();
saga.setState({ editor: { current: mockEditor } });
saga.updateState({ editor: { current: mockEditor } });
saga.put(reloadProgram());
expect(mockEditor.setValue).toHaveBeenCalled();
+22 -22
View File
@@ -76,7 +76,7 @@ describe('flashFirmware', () => {
nextMessageId: createCountFunc(),
});
saga.setState({ settings: { flashCurrentProgram: false } });
saga.updateState({ settings: { flashCurrentProgram: false } });
// saga is triggered by this action
@@ -87,7 +87,7 @@ describe('flashFirmware', () => {
let action = await saga.take();
expect(action).toEqual(connect());
saga.setState({
saga.updateState({
bootloader: { connection: BootloaderConnectionState.Connected },
});
saga.put(didConnect());
@@ -220,7 +220,7 @@ describe('flashFirmware', () => {
nextMessageId: createCountFunc(),
});
saga.setState({ settings: { flashCurrentProgram: false } });
saga.updateState({ settings: { flashCurrentProgram: false } });
// saga is triggered by this action
@@ -271,7 +271,7 @@ describe('flashFirmware', () => {
nextMessageId: createCountFunc(),
});
saga.setState({ settings: { flashCurrentProgram: false } });
saga.updateState({ settings: { flashCurrentProgram: false } });
// saga is triggered by this action
@@ -282,7 +282,7 @@ describe('flashFirmware', () => {
let action = await saga.take();
expect(action).toEqual(connect());
saga.setState({
saga.updateState({
bootloader: { connection: BootloaderConnectionState.Connected },
});
saga.put(didConnect());
@@ -296,7 +296,7 @@ describe('flashFirmware', () => {
// hub disconnects before replying
saga.setState({
saga.updateState({
bootloader: { connection: BootloaderConnectionState.Disconnected },
});
saga.put(didDisconnect());
@@ -337,7 +337,7 @@ describe('flashFirmware', () => {
nextMessageId: createCountFunc(),
});
saga.setState({ settings: { flashCurrentProgram: false } });
saga.updateState({ settings: { flashCurrentProgram: false } });
// saga is triggered by this action
@@ -348,7 +348,7 @@ describe('flashFirmware', () => {
let action = await saga.take();
expect(action).toEqual(connect());
saga.setState({
saga.updateState({
bootloader: { connection: BootloaderConnectionState.Connected },
});
saga.put(didConnect());
@@ -402,7 +402,7 @@ describe('flashFirmware', () => {
nextMessageId: createCountFunc(),
});
saga.setState({ settings: { flashCurrentProgram: false } });
saga.updateState({ settings: { flashCurrentProgram: false } });
// saga is triggered by this action
@@ -413,7 +413,7 @@ describe('flashFirmware', () => {
let action = await saga.take();
expect(action).toEqual(connect());
saga.setState({
saga.updateState({
bootloader: { connection: BootloaderConnectionState.Connected },
});
saga.put(didConnect());
@@ -462,7 +462,7 @@ describe('flashFirmware', () => {
nextMessageId: createCountFunc(),
});
saga.setState({ settings: { flashCurrentProgram: false } });
saga.updateState({ settings: { flashCurrentProgram: false } });
// saga is triggered by this action
@@ -492,7 +492,7 @@ describe('flashFirmware', () => {
action = await saga.take();
expect(action).toEqual(connect());
saga.setState({
saga.updateState({
bootloader: { connection: BootloaderConnectionState.Connected },
});
saga.put(didConnect());
@@ -604,7 +604,7 @@ describe('flashFirmware', () => {
nextMessageId: createCountFunc(),
});
saga.setState({
saga.updateState({
bootloader: { connection: BootloaderConnectionState.Disconnected },
settings: { flashCurrentProgram: false },
});
@@ -652,7 +652,7 @@ describe('flashFirmware', () => {
nextMessageId: createCountFunc(),
});
saga.setState({
saga.updateState({
bootloader: { connection: BootloaderConnectionState.Disconnected },
settings: { flashCurrentProgram: false },
});
@@ -699,7 +699,7 @@ describe('flashFirmware', () => {
nextMessageId: createCountFunc(),
});
saga.setState({ settings: { flashCurrentProgram: false } });
saga.updateState({ settings: { flashCurrentProgram: false } });
// saga is triggered by this action
@@ -722,7 +722,7 @@ describe('flashFirmware', () => {
// this triggers a failure
saga.setState({
saga.updateState({
bootloader: { connection: BootloaderConnectionState.Disconnected },
});
@@ -760,7 +760,7 @@ describe('flashFirmware', () => {
nextMessageId: createCountFunc(),
});
saga.setState({ settings: { flashCurrentProgram: false } });
saga.updateState({ settings: { flashCurrentProgram: false } });
// saga is triggered by this action
@@ -781,7 +781,7 @@ describe('flashFirmware', () => {
}
`);
saga.setState({
saga.updateState({
bootloader: { connection: BootloaderConnectionState.Disconnected },
});
@@ -822,7 +822,7 @@ describe('flashFirmware', () => {
nextMessageId: createCountFunc(),
});
saga.setState({ settings: { flashCurrentProgram: false } });
saga.updateState({ settings: { flashCurrentProgram: false } });
// saga is triggered by this action
@@ -843,7 +843,7 @@ describe('flashFirmware', () => {
}
`);
saga.setState({
saga.updateState({
bootloader: { connection: BootloaderConnectionState.Disconnected },
});
@@ -894,7 +894,7 @@ describe('flashFirmware', () => {
const saga = new AsyncSaga(flashFirmware, { nextMessageId: createCountFunc() });
saga.setState({
saga.updateState({
editor: { current: editor },
settings: { flashCurrentProgram: true },
});
@@ -908,7 +908,7 @@ describe('flashFirmware', () => {
let action = await saga.take();
expect(action).toEqual(connect());
saga.setState({
saga.updateState({
bootloader: { connection: BootloaderConnectionState.Connected },
});
saga.put(didConnect());
+1 -1
View File
@@ -25,7 +25,7 @@ describe('downloadAndRun', () => {
const saga = new AsyncSaga(hub, { nextMessageId: createCountFunc() });
const mockEditor = mock<Ace.EditSession>();
saga.setState({ editor: { current: mockEditor } });
saga.updateState({ editor: { current: mockEditor } });
saga.put(downloadAndRun());
+3 -3
View File
@@ -24,7 +24,7 @@ describe('fetchLicenses', () => {
// initially, license list starts as null, so fetch is called to get
// the list
saga.setState({ license: { list: null } });
saga.updateState({ license: { list: null } });
saga.put(openLicenseDialog());
const action = await saga.take();
@@ -42,7 +42,7 @@ describe('fetchLicenses', () => {
// after we have the list, we don't fetch it again since it will
// always be the same list
saga.setState({ license: { list: testLicenseList } });
saga.updateState({ license: { list: testLicenseList } });
saga.put(openLicenseDialog());
// have to yield to be sure fetch call would have taken place on error
@@ -56,7 +56,7 @@ describe('fetchLicenses', () => {
jest.spyOn(globalThis, 'fetch').mockResolvedValue(failResponse);
saga.setState({ license: { list: null } });
saga.updateState({ license: { list: null } });
saga.put(openLicenseDialog());
const action = await saga.take();
+4 -4
View File
@@ -220,7 +220,7 @@ describe('store settings to local storage', () => {
throw testError;
});
saga.setState({ settings: { showDocs: false } });
saga.updateState({ settings: { showDocs: false } });
saga.put(setBoolean(SettingId.ShowDocs, true));
expect(mockSetItem).toHaveBeenCalled();
@@ -245,7 +245,7 @@ describe('store settings to local storage', () => {
expect(value).toBe('true');
});
saga.setState({ settings: { showDocs: false } });
saga.updateState({ settings: { showDocs: false } });
saga.put(setBoolean(SettingId.ShowDocs, true));
expect(mockSetItem).toHaveBeenCalled();
@@ -265,7 +265,7 @@ describe('store settings to local storage', () => {
expect(value).toBe('false');
});
saga.setState({ settings: { darkMode: true } });
saga.updateState({ settings: { darkMode: true } });
saga.put(setBoolean(SettingId.DarkMode, false));
expect(mockSetItem).toHaveBeenCalled();
@@ -285,7 +285,7 @@ describe('store settings to local storage', () => {
expect(value).toBe('false');
});
saga.setState({ settings: { flashCurrentProgram: true } });
saga.updateState({ settings: { flashCurrentProgram: true } });
saga.put(setBoolean(SettingId.FlashCurrentProgram, false));
expect(mockSetItem).toHaveBeenCalled();
+8 -8
View File
@@ -33,7 +33,7 @@ describe('Data receiver filters out hub status', () => {
const saga = new AsyncSaga(terminal, { nextMessageId: createCountFunc() });
// sending ASCII space character
saga.setState({ hub: { runtime: HubRuntimeState.Unknown } });
saga.updateState({ hub: { runtime: HubRuntimeState.Unknown } });
saga.put(notify(new DataView(new Uint8Array([0x20]).buffer)));
const action = await saga.take();
@@ -46,7 +46,7 @@ describe('Data receiver filters out hub status', () => {
test('checksum message', async () => {
const saga = new AsyncSaga(terminal, { nextMessageId: createCountFunc() });
saga.setState({ hub: { runtime: HubRuntimeState.Loading } });
saga.updateState({ hub: { runtime: HubRuntimeState.Loading } });
saga.put(notify(new DataView(new Uint8Array([0xaa]).buffer)));
const action = await saga.take();
@@ -60,7 +60,7 @@ describe('Data receiver filters out hub status', () => {
const saga = new AsyncSaga(terminal, { nextMessageId: createCountFunc() });
// '>>>> IDLE'
saga.setState({ hub: { runtime: HubRuntimeState.Unknown } });
saga.updateState({ hub: { runtime: HubRuntimeState.Unknown } });
saga.put(
notify(
new DataView(
@@ -92,7 +92,7 @@ describe('Data receiver filters out hub status', () => {
const saga = new AsyncSaga(terminal, { nextMessageId: createCountFunc() });
// '0>>>> IDLE1'
saga.setState({ hub: { runtime: HubRuntimeState.Unknown } });
saga.updateState({ hub: { runtime: HubRuntimeState.Unknown } });
saga.put(
notify(
new DataView(
@@ -136,7 +136,7 @@ describe('Data receiver filters out hub status', () => {
const saga = new AsyncSaga(terminal, { nextMessageId: createCountFunc() });
// '>>>> ERROR'
saga.setState({ hub: { runtime: HubRuntimeState.Unknown } });
saga.updateState({ hub: { runtime: HubRuntimeState.Unknown } });
saga.put(
notify(
new DataView(
@@ -169,7 +169,7 @@ describe('Data receiver filters out hub status', () => {
const saga = new AsyncSaga(terminal, { nextMessageId: createCountFunc() });
// '0>>>> ERROR1'
saga.setState({ hub: { runtime: HubRuntimeState.Unknown } });
saga.updateState({ hub: { runtime: HubRuntimeState.Unknown } });
saga.put(
notify(
new DataView(
@@ -214,7 +214,7 @@ describe('Data receiver filters out hub status', () => {
const saga = new AsyncSaga(terminal, { nextMessageId: createCountFunc() });
// '>>>> ERROR'
saga.setState({ hub: { runtime: HubRuntimeState.Unknown } });
saga.updateState({ hub: { runtime: HubRuntimeState.Unknown } });
saga.put(
notify(
new DataView(
@@ -249,7 +249,7 @@ describe('Data receiver filters out hub status', () => {
const saga = new AsyncSaga(terminal, { nextMessageId: createCountFunc() });
// '0>>>> RUNNING1'
saga.setState({ hub: { runtime: HubRuntimeState.Unknown } });
saga.updateState({ hub: { runtime: HubRuntimeState.Unknown } });
saga.put(
notify(
new DataView(