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 11 additions and 5 deletions
Showing only changes of commit 8701c11844 - Show all commits
+8 -2
View File
@@ -20,6 +20,13 @@ jest.mock('../src/solver/glpk.min.js', () => ({
// Mocking console.log // Mocking console.log
const consoleLogMock = jest.spyOn(console, 'log').mockImplementation(() => {}); const consoleLogMock = jest.spyOn(console, 'log').mockImplementation(() => {});
// Mock useRouter to avoid invariant error
jest.mock('next/navigation', () => ({
useRouter: jest.fn(() => ({
push: jest.fn(), // Mock the 'push' function
})),
}));
beforeEach(() => { beforeEach(() => {
document.body.innerHTML = ` document.body.innerHTML = `
<div> <div>
@@ -90,7 +97,7 @@ test('calculate_click should display "Calculating" in the output box', () => {
document.getElementById('bounds').value = 'x <= 5'; document.getElementById('bounds').value = 'x <= 5';
document.getElementById('vars').value = 'x\ny'; document.getElementById('vars').value = 'x\ny';
// Simuliere den Button-Klick, der die Berechnung startet // Simulate the button click to trigger calculation
fireEvent.click(screen.getByText('Calculate')); fireEvent.click(screen.getByText('Calculate'));
// Check the contents of out box // Check the contents of out box
@@ -101,4 +108,3 @@ test('calculate_click should display "Calculating" in the output box', () => {
mockClear.mockRestore(); mockClear.mockRestore();
mockLog.mockRestore(); mockLog.mockRestore();
}); });
+3 -3
View File
@@ -11,7 +11,7 @@ import { LanguageContext } from './context/LanguageContext';
export default function Home() { export default function Home() {
const { language, setLanguage } = useContext(LanguageContext); const { language, setLanguage } = useContext(LanguageContext);
const [maxminOption, setMaxminOption] = useState('maximize'); const [maxminOption, setMaxminOption] = useState('maximize');
const [model] = useState('spec'); const [model, selectedModel] = useState('spec');
const router = useRouter(); const router = useRouter();
@@ -39,9 +39,9 @@ export default function Home() {
}; };
const changeModel = (event: React.ChangeEvent<HTMLSelectElement>) => { const changeModel = (event: React.ChangeEvent<HTMLSelectElement>) => {
const selectedModel = event.target.value; selectedModel(event.target.value);
if (selectedModel === 'gen') { if (event.target.value === 'gen') {
router.push('./glp'); router.push('./glp');
} }
}; };