Merge gmpl main2 #55

Merged
SinusFox merged 9 commits from merge_gmpl_main2 into main 2024-10-11 21:25:56 +00:00
2 changed files with 9 additions and 1 deletions
Showing only changes of commit a692445a12 - Show all commits
+8
View File
@@ -2,12 +2,20 @@ import { render, screen, fireEvent, waitFor } from '@testing-library/react';
import '@testing-library/jest-dom'; import '@testing-library/jest-dom';
import Home from "../src/app/page"; import Home from "../src/app/page";
import { customLog, customLogClear } from '../src/app/scripts'; import { customLog, customLogClear } from '../src/app/scripts';
import { useRouter } from 'next/router';
jest.mock('../src/app/scripts', () => ({ jest.mock('../src/app/scripts', () => ({
customLog: jest.fn(), customLog: jest.fn(),
customLogClear: jest.fn(), customLogClear: jest.fn(),
})); }));
jest.mock('next/router', () => ({
useRouter: jest.fn().mockReturnValue({
push: jest.fn(),
}),
}));
jest.mock('../src/solver/glpk.min.js', () => ({ jest.mock('../src/solver/glpk.min.js', () => ({
LPF_ECOND: 2, LPF_ECOND: 2,
})); }));
+1 -1
View File
@@ -216,7 +216,7 @@ const GlpPage = () => {
} catch (err) { } catch (err) {
setIsLoading(false); setIsLoading(false);
//addMessage("<div class='alert alert-danger'>" + err.toString() + "</div>"); addMessage("<div class='alert alert-danger'>" + (err as Error).toString() + "</div>");
console.log(err); console.log(err);
} }
}; };