Skip to content

Commit

Permalink
Merge pull request #4124 from mendersoftware/master
Browse files Browse the repository at this point in the history
staging alignment
  • Loading branch information
mzedel authored Oct 31, 2023
2 parents 905ae76 + b215cb9 commit 426a446
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/js/components/settings/artifactgeneration.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export const ArtifactGenerationSettings = () => {
setInputWindow(inputWindow);
setDuplicatesWindow(duplicatesWindow);
setInstructionBuffer(instructionBuffer);
setTimeout(() => (isInitialized.current = true), TIMEOUTS.debounceShort);
setTimeout(() => (isInitialized.current = true), TIMEOUTS.fiveSeconds);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [JSON.stringify(deltaConfig), JSON.stringify(deltaLimits)]);

Expand All @@ -133,7 +133,7 @@ export const ArtifactGenerationSettings = () => {
if (!isInitialized.current) {
return;
}
saveDeltaDeploymentsConfig(debouncedConfig);
dispatch(saveDeltaDeploymentsConfig(debouncedConfig));
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [dispatch, JSON.stringify(debouncedConfig)]);

Expand Down
2 changes: 1 addition & 1 deletion src/js/components/settings/global.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const preloadedState = {
describe('GlobalSettings Component', () => {
it('renders correctly', async () => {
const { baseElement } = render(<Global />, { preloadedState });
await act(async () => jest.advanceTimersByTime(TIMEOUTS.fiveSeconds));
await act(async () => jest.advanceTimersByTime(TIMEOUTS.refreshDefault));
await waitFor(() => expect(screen.getByText(/xDelta3/i)).toBeVisible());
const view = baseElement.firstChild.firstChild;
expect(view).toMatchSnapshot();
Expand Down

0 comments on commit 426a446

Please sign in to comment.