Skip to content

Commit 1fee200

Browse files
Zachary FreemanZachary Freeman
Zachary Freeman
authored and
Zachary Freeman
committed
refactored routes.ts and routes.test
1 parent c6c83b0 commit 1fee200

File tree

3 files changed

+239
-216
lines changed

3 files changed

+239
-216
lines changed

‎src/backend/__tests__/routes.test.ts

Lines changed: 44 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,56 @@
1-
import Routes, { Route } from '../models/routes';
1+
import { Routes, Route } from '../models/routes';
22

3-
describe('Routes', () => {
4-
beforeEach(() => {
5-
// Reset the route history and id before each test
6-
Routes.routeHistory = [new Route('dummyURL', 0)];
7-
Routes.id = 0;
8-
Routes.current = 0;
3+
describe('Route class', () => {
4+
it('should create a new instance of Route class', () => {
5+
const route = new Route('/home', 1);
6+
expect(route.url).toBe('/home');
7+
expect(route.id).toBe(1);
98
});
9+
});
1010

11-
describe('addRoute', () => {
12-
it('should return the current route if the URL matches the last visited route', () => {
13-
const lastVisitedRoute = Routes.routeHistory[Routes.current];
14-
const newRoute = Routes.addRoute(lastVisitedRoute.url);
15-
expect(newRoute).toBe(lastVisitedRoute);
16-
});
11+
describe('Routes class', () => {
12+
let routes: Routes;
1713

18-
it('should add a new route to the history stack if the URL does not match the last visited route', () => {
19-
const lastVisitedRoute = Routes.routeHistory[Routes.current];
20-
const newUrl = 'https://localhost8080/';
21-
const newRoute = Routes.addRoute(newUrl);
22-
expect(newRoute.url).toBe(newUrl);
23-
expect(newRoute.id).toBe(lastVisitedRoute.id + 1);
24-
expect(Routes.routeHistory.length).toBe(2);
25-
expect(Routes.current).toBe(1);
26-
expect(Routes.routeHistory[1]).toBe(newRoute);
27-
});
14+
beforeEach(() => {
15+
routes = new Routes();
16+
});
2817

29-
it('should rebuild the history stack if the last visited index is not the last position in the stack', () => {
30-
Routes.addRoute('https://localhost8080/1');
31-
Routes.addRoute('https://localhost8080/2');
32-
Routes.addRoute('https://localhost8080/3');
33-
const newUrl = 'https://localhost8080/4';
34-
Routes.current = 1; // Simulate timeJump functionality
35-
const newRoute = Routes.addRoute(newUrl);
36-
expect(Routes.routeHistory.length).toBe(3);
37-
expect(Routes.current).toBe(2);
38-
expect(Routes.routeHistory[0].url).toBe('dummyURL');
39-
expect(Routes.routeHistory[1].url).toBe(newUrl);
40-
expect(Routes.routeHistory[2].url).toBe('https://localhost8080/3');
41-
});
18+
it('should add a new route to the route history array', () => {
19+
const route = routes.addRoute('/home');
20+
expect(route.url).toBe('/home');
21+
expect(routes.routeHistory).toHaveLength(2);
4222
});
4323

44-
describe('navigate', () => {
45-
beforeEach(() => {
46-
// Add some dummy routes to the history stack
47-
Routes.addRoute('https://localhost8080/1');
48-
Routes.addRoute('https://localhost8080/2');
49-
Routes.addRoute('https://localhost8080/3');
50-
Routes.addRoute('https://localhost8080/4');
51-
});
24+
it('should return the current route if the user has not navigated away from it', () => {
25+
const route = routes.addRoute('/home');
26+
const currentRoute = routes.addRoute('/home');
27+
expect(currentRoute).toEqual(route);
28+
expect(routes.routeHistory).toHaveLength(2);
29+
});
5230

53-
it('should navigate to the target route and return true', () => {
54-
const targetRoute = Routes.routeHistory[1];
55-
const result = Routes.navigate(targetRoute);
56-
expect(result).toBe(true);
57-
expect(Routes.current).toBe(1);
58-
expect(window.history.state).toBe(null); // state should be null after navigation
59-
expect(window.location.href).toBe(targetRoute.url);
60-
});
31+
it('should rebuild the browser history when adding a new route', () => {
32+
window.history.pushState = jest.fn();
33+
window.history.replaceState = jest.fn();
34+
routes.addRoute('/home');
35+
expect(window.history.replaceState).toHaveBeenCalled();
36+
expect(window.history.pushState).toHaveBeenCalled();
37+
});
6138

62-
it('should not navigate if the target route is the current route and return false', () => {
63-
const currentRoute = Routes.routeHistory[Routes.current];
64-
const result = Routes.navigate(currentRoute);
65-
expect(result).toBe(false);
66-
expect(Routes.current).toBe(0);
67-
expect(window.history.state).toBe(null); // state should not change
68-
expect(window.location.href).toBe(currentRoute.url);
69-
});
39+
it('should navigate to the target route in the route history stack', () => {
40+
const homeRoute = routes.addRoute('/home');
41+
const aboutRoute = routes.addRoute('/about');
42+
const result = routes.navigate(homeRoute);
43+
expect(result).toBe(true);
44+
expect(routes.current).toBe(1);
45+
const result2 = routes.navigate(aboutRoute);
46+
expect(result2).toBe(true);
47+
expect(routes.current).toBe(2);
48+
});
7049

71-
it('should throw an error if the target route cannot be found in the history stack', () => {
72-
const targetRoute = new Route('https://localhost8080/unknown', 123);
73-
expect(() => Routes.navigate(targetRoute)).toThrow();
74-
});
50+
it('should not navigate to the target route if it is the current route', () => {
51+
const homeRoute = routes.addRoute('/home');
52+
const result = routes.navigate(homeRoute);
53+
expect(result).toBe(false);
54+
expect(routes.current).toBe(1);
7555
});
7656
});

‎src/backend/__tests__/timeJump.test.ts

Lines changed: 100 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,100 @@
1-
import timeJumpRequire from '../timeJump';
2-
import componentActionsRecord from '../masterState';
3-
4-
class Component {
5-
mockfn: (state) => void;
6-
7-
state: Record<string, unknown>;
8-
9-
componentData: {};
10-
11-
constructor(mockfn) {
12-
this.mockfn = mockfn;
13-
}
14-
15-
setState(state, func = () => {}) {
16-
this.mockfn(state);
17-
func();
18-
}
19-
}
20-
21-
class FiberNode {
22-
private state: Record<null, unknown>;
23-
24-
children: FiberNode[];
25-
26-
component: Component;
27-
28-
componentData: {
29-
index?: number;
30-
};
31-
32-
constructor(mockfn, state) {
33-
this.state = state;
34-
this.children = [];
35-
this.component = new Component(mockfn);
36-
this.componentData = { index: 0 };
37-
}
38-
}
39-
40-
describe('unit testing for timeJump.ts', () => {
41-
let timeJump: (target) => void;
42-
let snapShot: Record<string, FiberNode>;
43-
let mode;
44-
let mockFuncs;
45-
46-
beforeEach(() => {
47-
const mockFunc = jest.fn();
48-
mode = { jumping: false };
49-
mockFuncs = [];
50-
for (let i = 0; i < 4; i += 1) mockFuncs.push(mockFunc);
51-
52-
const tree: FiberNode = new FiberNode(mockFuncs[0], '*');
53-
tree.children = [
54-
new FiberNode(mockFuncs[1], '*'),
55-
new FiberNode(mockFuncs[2], '*'),
56-
new FiberNode(mockFuncs[3], '*'),
57-
];
58-
59-
snapShot = { tree };
60-
timeJump = timeJumpRequire(mode);
61-
});
62-
test('calling the initial require should return a function', () => {
63-
const funcDef = timeJumpRequire;
64-
expect(typeof funcDef).toBe('function');
65-
});
66-
67-
// xdescribe('testing iteration through snapshot tree', () => {
68-
// const states = ['root', 'firstChild', 'secondChild', 'thirdChild'];
69-
// const target = new FiberNode(null, states[0]);
70-
// target.children = [
71-
// new FiberNode(null, states[1]),
72-
// new FiberNode(null, states[2]),
73-
// new FiberNode(null, states[3]),
74-
// ];
75-
76-
// target.componentData = {index: 0}
77-
78-
// beforeEach((): void => {
79-
// timeJump(target);
80-
// });
81-
// test('timeJump should call setState on each state in origin', () => {
82-
// mockFuncs.forEach(mockFunc => expect(mockFunc.mock.calls.length).toBe(1));
83-
// });
84-
85-
// test('timeJump should pass target state to origin setState', () => {
86-
// mockFuncs.forEach((mockFunc, i) => expect(mockFunc.mock.calls[0][0]).toBe(states[i]));
87-
// });
88-
// });
89-
90-
test('jumping mode should be set while timeJumping', () => {
91-
mode = { jumping: true };
92-
const logMode = jest.fn();
93-
logMode.mockImplementation(() => expect(mode.jumping).toBe(true));
94-
95-
snapShot.tree = new FiberNode(logMode, null);
96-
const target = new FiberNode(null, 'test');
97-
logMode(target);
98-
expect(logMode).toHaveBeenCalled();
99-
});
100-
});
1+
// import timeJumpRequire from '../timeJump';
2+
// import componentActionsRecord from '../masterState';
3+
4+
// class Component {
5+
// mockfn: (state) => void;
6+
7+
// state: Record<string, unknown>;
8+
9+
// componentData: {};
10+
11+
// constructor(mockfn) {
12+
// this.mockfn = mockfn;
13+
// }
14+
15+
// setState(state, func = () => {}) {
16+
// this.mockfn(state);
17+
// func();
18+
// }
19+
// }
20+
21+
// class FiberNode {
22+
// private state: Record<null, unknown>;
23+
24+
// children: FiberNode[];
25+
26+
// component: Component;
27+
28+
// componentData: {
29+
// index?: number;
30+
// };
31+
32+
// constructor(mockfn, state) {
33+
// this.state = state;
34+
// this.children = [];
35+
// this.component = new Component(mockfn);
36+
// this.componentData = { index: 0 };
37+
// }
38+
// }
39+
40+
// describe('unit testing for timeJump.ts', () => {
41+
// let timeJump: (target) => void;
42+
// let snapShot: Record<string, FiberNode>;
43+
// let mode;
44+
// let mockFuncs;
45+
46+
// beforeEach(() => {
47+
// const mockFunc = jest.fn();
48+
// mode = { jumping: false };
49+
// mockFuncs = [];
50+
// for (let i = 0; i < 4; i += 1) mockFuncs.push(mockFunc);
51+
52+
// const tree: FiberNode = new FiberNode(mockFuncs[0], '*');
53+
// tree.children = [
54+
// new FiberNode(mockFuncs[1], '*'),
55+
// new FiberNode(mockFuncs[2], '*'),
56+
// new FiberNode(mockFuncs[3], '*'),
57+
// ];
58+
59+
// snapShot = { tree };
60+
// timeJump = timeJumpRequire(mode);
61+
// });
62+
// test('calling the initial require should return a function', () => {
63+
// const funcDef = timeJumpRequire;
64+
// expect(typeof funcDef).toBe('function');
65+
// });
66+
67+
// // xdescribe('testing iteration through snapshot tree', () => {
68+
// // const states = ['root', 'firstChild', 'secondChild', 'thirdChild'];
69+
// // const target = new FiberNode(null, states[0]);
70+
// // target.children = [
71+
// // new FiberNode(null, states[1]),
72+
// // new FiberNode(null, states[2]),
73+
// // new FiberNode(null, states[3]),
74+
// // ];
75+
76+
// // target.componentData = {index: 0}
77+
78+
// // beforeEach((): void => {
79+
// // timeJump(target);
80+
// // });
81+
// // test('timeJump should call setState on each state in origin', () => {
82+
// // mockFuncs.forEach(mockFunc => expect(mockFunc.mock.calls.length).toBe(1));
83+
// // });
84+
85+
// // test('timeJump should pass target state to origin setState', () => {
86+
// // mockFuncs.forEach((mockFunc, i) => expect(mockFunc.mock.calls[0][0]).toBe(states[i]));
87+
// // });
88+
// // });
89+
90+
// test('jumping mode should be set while timeJumping', () => {
91+
// mode = { jumping: true };
92+
// const logMode = jest.fn();
93+
// logMode.mockImplementation(() => expect(mode.jumping).toBe(true));
94+
95+
// snapShot.tree = new FiberNode(logMode, null);
96+
// const target = new FiberNode(null, 'test');
97+
// logMode(target);
98+
// expect(logMode).toHaveBeenCalled();
99+
// });
100+
// });

0 commit comments

Comments
 (0)