Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Logbook clocking #103

Merged
merged 13 commits into from
Nov 14, 2019
Merged

Logbook clocking #103

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a11b48d
Add the ability to clock in/out of items
jamesnvc Nov 13, 2019
03d9c2a
Make log book entries show up in editing
jamesnvc Nov 13, 2019
43cc3d4
Run prettier on changed files
jamesnvc Nov 13, 2019
4b0faa7
Allow editing timestamps in logbook
jamesnvc Nov 13, 2019
409958f
Use logBookEntries to determine if header as content as well
jamesnvc Nov 13, 2019
5b189c1
Show "Clock In" or "Clock Out" based on state of entries in header
jamesnvc Nov 13, 2019
8b93691
Include durations in logbook entries
jamesnvc Nov 13, 2019
b622e67
Update AgendaModal unit test, due to change in data model
jamesnvc Nov 13, 2019
e7c66ee
Fix padding logic for timestamps & logbook
jamesnvc Nov 13, 2019
5d9a011
Add basic unit test for logbook
jamesnvc Nov 13, 2019
6a6f52f
Add integration test for using clock in/out button
jamesnvc Nov 13, 2019
22d705d
Wrap CLOCK: in logbook entries in a span to facilitate testing
jamesnvc Nov 13, 2019
f499b37
Test that clocking in/out creates log entries
jamesnvc Nov 13, 2019
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
Add integration test for using clock in/out button
  • Loading branch information
@jamesnvc
jamesnvc committed Nov 13, 2019
commit 6a6f52f6baf51f7b9aff162ed297acd8534ad284
29 changes: 29 additions & 0 deletions src/components/OrgFile/OrgFile.integration.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,35 @@ Some description content
expect(queryByText('TODO')).toBeFalsy();
expect(queryByText('DONE')).toBeTruthy();
});

test('Can clock in & out of an event', () => {
const { getByText, queryByText } = render(
<MemoryRouter keyLength={0}>
<Provider store={store}>
<OrgFile path="fixtureTestFile.org" />
</Provider>
</MemoryRouter>
);

expect(queryByText('Clock In')).toBeFalsy();
expect(queryByText('Clock Out')).toBeFalsy();

fireEvent.click(getByText('Top level header'));

expect(queryByText('Clock In')).toBeTruthy();
expect(queryByText('Clock Out')).toBeFalsy();

fireEvent.click(getByText('Clock In'));

expect(queryByText('Clock In')).toBeFalsy();
expect(queryByText('Clock Out')).toBeTruthy();

fireEvent.click(getByText('Clock Out'));

expect(queryByText('Clock In')).toBeTruthy();
expect(queryByText('Clock Out')).toBeFalsy();

});
});

describe('Renders everything starting from an Org file', () => {
Expand Down