Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

feat: ReacTime OSP iteration V25.0 #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MelKoppens wants to merge 54 commits into open-source-labs:master from oslabs-beta:master
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
e6054ad
link thickness and color differentiated per number of props
ljn16 Apr 27, 2024
87d24a7
added logistic function
MelKoppens Apr 29, 2024
78c60e1
changes
JoseSanchez1996 Apr 29, 2024
e7b51da
type issue
Apr 29, 2024
4c0add8
added heat map functionallity
ljn16 Apr 30, 2024
804fc47
added router-link style
ljn16 Apr 30, 2024
4dce894
stoke hover functionality
JoseSanchez1996 Apr 30, 2024
2461316
combined nav bars on the same line
ljn16 Apr 30, 2024
70a6728
Merge pull request #1 from oslabs-beta/links
MelKoppens Apr 30, 2024
f8bb363
y0
JoseSanchez1996 Apr 30, 2024
f419df6
Merge branch 'dev' of https://github.com/oslabs-beta/Reactime into dev
JoseSanchez1996 Apr 30, 2024
d1c9788
Merge branch 'dev' into links
JoseSanchez1996 Apr 30, 2024
b0eb94e
navbar overflow hidden
ljn16 May 1, 2024
659763a
on hover stroke update
JoseSanchez1996 May 1, 2024
bca0669
fixed 8 non-running tests
MelKoppens May 1, 2024
49aeced
intial attempt
May 1, 2024
44c3d56
preMVPpres
ljn16 May 2, 2024
d592ca9
working - strokeColor as state
JoseSanchez1996 May 3, 2024
a98226a
fixed some code
JoseSanchez1996 May 4, 2024
f175a16
minor
May 6, 2024
c68e81b
Merge branch 'dev' into freeze
May 6, 2024
98ae53d
.
ljn16 May 9, 2024
c5162d0
fixed axMap type
MelKoppens May 13, 2024
86cb9f5
relocated record button
ljn16 May 13, 2024
d5f000c
.
ljn16 May 13, 2024
b1e7c6f
activeTab error is fixed with a query function
May 14, 2024
86c8e9f
fixed map tab border raidus when not selected
ljn16 May 14, 2024
06d1e05
Merge pull request #3 from oslabs-beta/styles3
hali03 May 14, 2024
dc2af90
fixed jest library
MelKoppens May 14, 2024
9148285
Merge branch 'dev' into freeze
May 14, 2024
da6adb9
Merge pull request #4 from oslabs-beta/freeze
MelKoppens May 14, 2024
09729a0
jest
MelKoppens May 14, 2024
4e0152f
fixed jest libraries
MelKoppens May 14, 2024
a18a335
Merge pull request #5 from oslabs-beta/jest
MelKoppens May 14, 2024
6c94414
website fix
May 14, 2024
4109688
Co-authored-by: JoseSanchez1996 <JoseSanchez1996@users.noreply.github...
ljn16 May 14, 2024
4d1ab04
website
May 14, 2024
3f46c3a
removed unneeded comments
ljn16 May 14, 2024
5325cac
Merge pull request #7 from oslabs-beta/links
JoseSanchez1996 May 14, 2024
d4b8280
website
May 14, 2024
24f0c68
Merge pull request #8 from oslabs-beta/freeze
hali03 May 14, 2024
a9e7908
Revert "website"
hali03 May 15, 2024
c9528c0
Merge pull request #9 from oslabs-beta/revert-8-freeze
hali03 May 15, 2024
1b9cf23
Revert "Links"
hali03 May 15, 2024
ba53936
Merge pull request #10 from oslabs-beta/revert-7-links
hali03 May 15, 2024
8c28122
adjusted the readme files
MelKoppens May 15, 2024
2eb369e
fixed readme files
MelKoppens May 15, 2024
f30e042
Merge branch 'dev' into jest
MelKoppens May 15, 2024
ea4af70
updated links in readme
MelKoppens May 16, 2024
f17074d
Merge pull request #11 from oslabs-beta/jest
JoseSanchez1996 May 16, 2024
4c0dcc8
Merge pull request #12 from oslabs-beta/dev
JoseSanchez1996 May 16, 2024
ead3ce2
updated manifest.json with version
MelKoppens May 16, 2024
e78e112
Merge pull request #13 from oslabs-beta/jest
JoseSanchez1996 May 16, 2024
9f87674
Merge pull request #14 from oslabs-beta/dev
JoseSanchez1996 May 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed 8 non-running tests
  • Loading branch information
MelKoppens committed May 1, 2024
commit bca06694bca3d2eae4b675c3d98779fa2d8f9efa
5 changes: 3 additions & 2 deletions src/app/__tests__/ActionContainer.test.tsx
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ jest.mock('../components/Actions/RouteDescription', () => () => {
});

const MockSwitchApp = jest.fn();
jest.mock('../components/SwitchApp', () => () => {
jest.mock('../components/Actions/SwitchApp', () => () => {
MockSwitchApp();
return <div>MockSwitchApp</div>;
});
Expand All @@ -156,7 +156,8 @@ jest.mock('react-redux', () => ({
// const dispatch = jest.fn();

describe('unit testing for ActionContainer', () => {
const useDispatchMock = useDispatch as jest.Mock; //getting a reference to the mock function you setup during jest.mock configuration on line 18
const useDispatchMock = (useDispatch as unknown) as jest.Mock; // make the test run
// const useDispatchMock = useDispatch as jest.Mock; //getting a reference to the mock function you setup during jest.mock configuration on line 18
const dummyDispatch = jest.fn(); //separate mock function created because we need to explicitly define on line 30 what
useDispatchMock.mockReturnValue(dummyDispatch); //exactly useDispatchMock returns (which is a jest.fn())
beforeEach(() => {
Expand Down
3 changes: 2 additions & 1 deletion src/app/__tests__/ButtonContainer.test.tsx
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ global.URL.createObjectURL = jest.fn(() => 'https://pdf.com');
global.URL.revokeObjectURL = jest.fn();

describe('Unit testing for ButtonContainer', () => {
const useDispatchMock = useDispatch as jest.Mock; //getting a reference to the mock function you setup during jest.mock configuration on line 18
const useDispatchMock = (useDispatch as unknown) as jest.Mock; // make the test run
// const useDispatchMock = useDispatch as jest.Mock; //getting a reference to the mock function you setup during jest.mock configuration on line 18
const dummyDispatch = jest.fn(); //separate mock function created because we need to explicitly define on line 30 what
useDispatchMock.mockReturnValue(dummyDispatch); //exactly useDispatchMock returns (which is a jest.fn())
beforeEach;
Expand Down
23 changes: 14 additions & 9 deletions src/app/__tests__/ErrorContainer.test.tsx
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ const render = (component) => rtlRender(<Provider store={customStore}>{component
// };

const MockErrorMsg = jest.fn();
jest.mock('../components/ErrorMsg', () => () => {
jest.mock('../components/ErrorHandling/ErrorMsg', () => () => {
MockErrorMsg();
return <div>MockErrorMsg</div>;
});
Expand All @@ -142,51 +142,56 @@ jest.mock('../components/ErrorMsg', () => () => {
// const dispatch = jest.fn();
// mockeduseStoreContext.mockImplementation(() => [state, dispatch]);

// added to fix broken tests
const props = {
port: null,
};

describe('unit testing for ErrorContainer.tsx', () => {
test('logo image renders as expected', () => {
render(<ErrorContainer />);
render(<ErrorContainer {...props} />); // added {...props} to fix broken test
expect(screen.getByAltText('Reactime Logo')).toBeInTheDocument();
});

test('ErrorMsg component renders as expected', () => {
render(<ErrorContainer />);
render(<ErrorContainer {...props} />); // added {...props} to fix broken test
expect(screen.getByText('MockErrorMsg')).toBeInTheDocument();
});

test('Reactime website shows as expected', () => {
render(<ErrorContainer />);
render(<ErrorContainer {...props} />); // added {...props} to fix broken test
expect(screen.getByText('Please visit the Reactime Github for more info.')).toBeInTheDocument();
});

describe('Loading Checks show up as expected', () => {
test('Content script launching check shows', () => {
render(<ErrorContainer />);
render(<ErrorContainer {...props} />); // added {...props} to fix broken test
expect(
screen.getByText(`Checking if content script has been launched on current tab`),
).toBeInTheDocument();
});
test('React Dev Tool Install check shows', () => {
render(<ErrorContainer />);
render(<ErrorContainer {...props} />); // added {...props} to fix broken test
expect(
screen.getByText(`Checking if React Dev Tools has been installed`),
).toBeInTheDocument();
});
test('Compatible app check shows', () => {
render(<ErrorContainer />);
render(<ErrorContainer {...props} />); // added {...props} to fix broken test
expect(screen.getByText(`Checking if target is a compatible React app`)).toBeInTheDocument();
});
});

describe('Launching header shows correct tab info', () => {
test('When currentTitle has no target', () => {
render(<ErrorContainer />);
render(<ErrorContainer {...props} />); // added {...props} to fix broken test
expect(screen.getByText(`Launching Reactime on tab: No Target`)).toBeInTheDocument();
expect(screen.queryByText(`Launching Reactime on tab: Test Page`)).not.toBeInTheDocument();
});

test('When currentTitle has a target title', () => {
customInitialState.main.currentTitle = 'Test Page';
render(<ErrorContainer />);
render(<ErrorContainer {...props} />); // added {...props} to fix broken test
expect(screen.getByText(`Launching Reactime on tab: Test Page`)).toBeInTheDocument();
expect(screen.queryByText(`Launching Reactime on tab: No Target`)).not.toBeInTheDocument();
});
Expand Down
2 changes: 2 additions & 0 deletions src/app/__tests__/MainSlider.test.tsx
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const render = (component) => rtlRender(<Provider store={customStore}>{component
describe('Unit testing for MainSlider.jsx', () => {
const props = {
snapshotsLength: 1,
className: 'String' // added to fix the test
};

describe('When user only has one snapshot to view', () => {
Expand All @@ -51,6 +52,7 @@ describe('Unit testing for MainSlider.jsx', () => {
describe('When there are multiple snapshots and we are looking in between', () => {
const props = {
snapshotsLength: 3,
className: 'String' // added to fix the test
};

test('Component should have min, max, value with correct values to indicate slider position when there are multiple snapshots', () => {
Expand Down
7 changes: 4 additions & 3 deletions src/app/__tests__/TravelContainer.test.tsx
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,13 @@ const renderWithTheme = (component) => {
};

const mockSlider = jest.fn();
jest.mock('../components/MainSlider', () => (props) => {
jest.mock('../components/TimeTravel/MainSlider', () => (props) => {
mockSlider(props);
return <div>MockSlider</div>;
});

const mockDropDown = jest.fn();
jest.mock('../components/Dropdown', () => (props) => {
jest.mock('../components/TimeTravel/Dropdown', () => (props) => {
mockDropDown(props);
return <div>mockDropDown</div>;
});
Expand Down Expand Up @@ -182,7 +182,8 @@ describe('All elements appear in the TravelContainer module', () => {
});

describe('Testing play/pause button', () => {
const useDispatchMock = useDispatch as jest.Mock; //getting a reference to the mock function you setup during jest.mock configuration on line 154
const useDispatchMock = (useDispatch as unknown) as jest.Mock; // make the test run
// const useDispatchMock = useDispatch as jest.Mock; //getting a reference to the mock function you setup during jest.mock configuration on line 154
const dummyDispatch = jest.fn();
useDispatchMock.mockReturnValue(dummyDispatch);
beforeEach(() => {
Expand Down
3 changes: 2 additions & 1 deletion src/app/__tests__/TravelForwardBackward.test.tsx
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@ jest.mock('react-redux', () => ({
//needed to isolate the testing of the forward and backward buttons as behavior was affected when within the travelContainer file

describe('Testing backward and forward button', () => {
const useDispatchMock = useDispatch as jest.Mock; //getting a reference to the mock function you setup during jest.mock configuration on line 154
const useDispatchMock = (useDispatch as unknown) as jest.Mock; // make the test run
// const useDispatchMock = useDispatch as jest.Mock; //getting a reference to the mock function you setup during jest.mock configuration on line 154
const dummyDispatch = jest.fn();
useDispatchMock.mockReturnValue(dummyDispatch);
beforeEach(() => {
Expand Down
3 changes: 2 additions & 1 deletion src/app/__tests__/WebMetrics.test.tsx
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ jest.mock('react-redux', () => ({
...jest.requireActual('react-redux'), // Use the actual react-redux module except for the functions you want to mock
useDispatch: jest.fn(), // set up a mock function for useDispatch
}));
const useDispatchMock = useDispatch as jest.Mock; //getting a reference to the mock function you setup during jest.mock configuration on line 18
const useDispatchMock = (useDispatch as unknown) as jest.Mock; // make the test run
// const useDispatchMock = useDispatch as jest.Mock; //getting a reference to the mock function you setup during jest.mock configuration on line 18
const dummyDispatch = jest.fn(); //separate mock function created because we need to explicitly define on line 30 what
useDispatchMock.mockReturnValue(dummyDispatch); //exactly useDispatchMock returns (which is a jest.fn())
const customTabs = {
Expand Down
3 changes: 2 additions & 1 deletion src/app/__tests__/action.test.tsx
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ jest.mock('react-redux', () => ({
const render = (component) => rtlRender(<Provider store={store}>{component}</Provider>);

describe('Unit testing for Action.tsx', () => {
const useDispatchMock = useDispatch as jest.Mock; //getting a reference to the mock function you setup during jest.mock configuration on line 18
const useDispatchMock = (useDispatch as unknown) as jest.Mock; // attempt to make the test run
// const useDispatchMock = useDispatch as jest.Mock; //getting a reference to the mock function you setup during jest.mock configuration on line 18
const dummyDispatch = jest.fn(); //separate mock function created because we need to explicitly define on line 30 what
useDispatchMock.mockReturnValue(dummyDispatch); //exactly useDispatchMock returns (which is a jest.fn())
const props = {
Expand Down

AltStyle によって変換されたページ (->オリジナル) /