fix(app): show correct git status for newly created/modified files by lmiller1990 · Pull Request #20744 · cypress-io/cypress

lmiller1990 · 2022-03-23T06:12:25Z

Closes https://cypress-io.atlassian.net/browse/UNIFY-863

User facing changelog

Show correct git status for untracked, staged and modified files
Align UI with Figma mocks (Should not show git status on folders, just files)
Fix bug where git status is not appearing on linux (git command not working in /bin/sh; default to $SHELL or /bin/bash for unix-like systems).
Add proper tests (create an actual git repo; not mocking the response)

Additional details

N/A

How has the user experience changed?

PR Tasks

Have tests been added/updated?
Has the original issue (or this PR, if no issue exists) been tagged with a release in ZenHub? (user-facing changes only)
Has a PR for user-facing changes been opened in cypress-documentation?
Have API changes been updated in the type definitions?
Have new configuration options been added to the cypress.schema.json?

cypress-bot · 2022-03-23T06:12:28Z

Thanks for taking the time to open a PR!

Create a Draft Pull Request if your PR is not ready for review. Mark the PR as Ready for Review when you're ready for a Cypress team member to review the PR.
Become familiar with the Code Review Checklist for guidelines on coding standards and what needs to be done before a PR can be merged.

cypress · 2022-03-23T06:46:28Z

Test summary

17788 • 0 • 217 • 0 • 1

Run details


Project	cypress
Status	Passed
Commit	`ec3e0b4`
Started	Mar 28, 2022 7:42 AM
Ended	Mar 28, 2022 7:54 AM
Duration	12:03 💡
OS	Linux Debian - 10.10
Browser	Multiple

View run in Cypress Dashboard ➡️

Flakiness

	cypress/e2e/commands/net_stubbing.cy.ts		1
1	network stubbing > waiting and aliasing > yields the expected interception when two requests are raced

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

lmiller1990 · 2022-03-24T02:50:05Z

packages/data-context/test/unit/sources/GitDataSource.spec.ts

+import { createTestDataContext, scaffoldMigrationProject } from '../helper'
+
+describe('GitDataSource', () => {
+  it(`gets correct status for files on ${os.platform()}`, async () => {


Making sure it runs on windows/linux/macos.

marktnoonan

I've done a bit of testing and seems to work great overall. There are two things to look at. First, when creating a spec from Cypress, it doesn't show the git status in the table, see filename.cy.ts here:

Second, in the mocks, before files are committed, the designs show "created" and "modified" without the name attached. Should we match that here?

Love the new tests!

marktnoonan · 2022-03-24T15:12:56Z

packages/data-context/src/sources/GitDataSource.ts

+// macOS/Linux: getInfoPosix
+// Windows: getInfoWindows
+// Where possible, we use SimpleGit to get other git info, like
+// the status of untracked files and the current git username.


Really happy to have this reasoning included

elevatebart · 2022-03-24T18:05:06Z

packages/types/src/git.ts

@@ -0,0 +1 @@
+export const gitStatusType = ['modified', 'created', 'unmodified'] as const


It's almost like we should have this model of files for everything in the constants.ts file.

I like this though.

lmiller1990 · 2022-03-25T08:05:43Z

@marktnoonan I have

changed UI not to show username for created/modified
fixed bugs where UI is not updating when you create a new spec from the UI
other small bugs I found

I put a video demo here to show the new UI and it working as expected: https://cypress-io.atlassian.net/browse/UNIFY-863?focusedCommentId=17183

This was a surprisingly complex ticket. Our virtualized spec list is a bit weird (well, how we compose useCachedSpecs and useCollapsibleTree - there's a computed property of a computed property, which seems like a code smell 🤔). We should revisit this - it was the cause of the UI not updating correctly, it was doing some caching, preventing the UI from updating.

Anyway, it works for now! Please re-review. cc @elevatebart for one more ✔️, thanks!

I have comments but am OOO today, so don't want my review to be blocking

marktnoonan · 2022-03-25T12:44:37Z

@lmiller1990 I'm confused by this Percy snapshot, and this one.

The first seems to show results where we should be on the empty state, and both show file.git.null in the UI. I am OOO the rest of the day and haven't looked any deeper into this. I've dismissed my change request since I won't be able to re-review until Monday.

I'd agree about revisiting the specs list, @ZachJW34 and I have talked about this as well. There are a couple of related problems it would be good to talk about together.

ryanthemanuel · 2022-03-25T13:05:37Z

Should foo.cy.js and blah.cy.js have been checked in? It looks like they're generated as part of a test

lmiller1990 · 2022-03-28T02:20:18Z

@marktnoonan thanks for catching this. I'd forgotten to update the stubs, in this file.

Happy to wait for your re-review if you are out, or get someone else to 👀. I don't really understand why the generated mock data has changed, and I don't know how to get it back to the original state. We might just need to re-approve these.

Far too much time has been wasted on these dynamic fixtures, I'm going to remove them. Ticket: https://cypress-io.atlassian.net/browse/UNIFY-1403.

@ryanthemanuel thanks, I removed those two junk testing files.

@elevatebart Can you please re-review?

* 10.0-release: fix(launchpad): show more specific error when default supportFile is missing (#20792) fix(app): show correct git status for newly created/modified files (#20744)

lmiller1990 added 2 commits March 23, 2022 13:05

use user shell for git command

60bc149

fix: support git status for staged and modified files

97c7b3b

lmiller1990 requested review from a team as code owners March 23, 2022 06:12

lmiller1990 requested review from rockhold and removed request for a team March 23, 2022 06:12

lmiller1990 changed the base branch from develop to 10.0-release March 23, 2022 06:13

lmiller1990 added 2 commits March 23, 2022 16:26

use simple git to get username

3a59b52

remove test file

6dfebf5

lmiller1990 changed the title ~~Lmiller1990/unify 863~~ fix(app): show correct git status for newly created/modified files Mar 23, 2022

lmiller1990 marked this pull request as draft March 23, 2022 06:34

lmiller1990 removed request for a team and rockhold March 23, 2022 06:34

lmiller1990 added 7 commits March 23, 2022 17:08

types

6761089

add default statusType

6dd4354

fix test

54890db

add test

69bc410

add e2e test

8a875e3

res. conflicts

45cca60

remove old code

252df1a

lmiller1990 commented Mar 24, 2022

View reviewed changes

lmiller1990 added 5 commits March 24, 2022 13:48

fix tests

aecdeb1

set email during tests

1de5f79

make test less flake

3c5cb62

add logging

92b9eb2

try move test to another file

372f78a

lmiller1990 force-pushed the lmiller1990/UNIFY-863 branch from 4c9178b to 372f78a Compare March 24, 2022 06:54

use debug instead of console.log

02883b9

lmiller1990 requested review from elevatebart and marktnoonan March 24, 2022 12:35

lmiller1990 marked this pull request as ready for review March 24, 2022 12:35

flotwig requested a review from ryanthemanuel March 24, 2022 15:36

marktnoonan previously requested changes Mar 24, 2022

View reviewed changes

elevatebart previously approved these changes Mar 24, 2022

View reviewed changes

Barthélémy Ledoux and others added 3 commits March 24, 2022 14:05

Merge branch '10.0-release' into lmiller1990/UNIFY-863

664a6b2

wip: live updates via subscription

0c1c197

fix bug in spec list stale cache

ad40e1b

lmiller1990 dismissed elevatebart’s stale review via ad40e1b March 25, 2022 05:44

lmiller1990 added 5 commits March 25, 2022 16:27

types

7027d03

fix test

4f53ce3

new git instance per test

416673a

do not show author for locally modified files

f287895

no status for folders

bd602bc

fix test

1d20bb3

remove old file and fix snapshot

ccca431

lmiller1990 added 2 commits March 28, 2022 12:30

fix types

bb6583d

update test stubs

ec3e0b4

marktnoonan approved these changes Mar 28, 2022

View reviewed changes

ryanthemanuel approved these changes Mar 28, 2022

View reviewed changes

lmiller1990 merged commit 7bb5571 into 10.0-release Mar 28, 2022

lmiller1990 deleted the lmiller1990/UNIFY-863 branch March 28, 2022 20:06

mike-plummer mentioned this pull request Jul 1, 2022

Support getting spec Git info when active shell differs in syntax from bash #22454

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(app): show correct git status for newly created/modified files#20744

fix(app): show correct git status for newly created/modified files#20744
lmiller1990 merged 31 commits into10.0-releasefrom
lmiller1990/UNIFY-863

lmiller1990 commented Mar 23, 2022 •

edited

Loading

Uh oh!

cypress-bot bot commented Mar 23, 2022

Uh oh!

cypress bot commented Mar 23, 2022 •

edited

Loading

Uh oh!

lmiller1990 Mar 24, 2022

Uh oh!

marktnoonan left a comment

Uh oh!

marktnoonan Mar 24, 2022

Uh oh!

elevatebart Mar 24, 2022

Uh oh!

lmiller1990 commented Mar 25, 2022 •

edited

Loading

Uh oh!

marktnoonan commented Mar 25, 2022

Uh oh!

ryanthemanuel commented Mar 25, 2022

Uh oh!

lmiller1990 commented Mar 28, 2022 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Comments

		@@ -0,0 +1 @@
		export const gitStatusType = ['modified', 'created', 'unmodified'] as const

Conversation

lmiller1990 commented Mar 23, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

User facing changelog

Additional details

How has the user experience changed?

PR Tasks

Uh oh!

cypress-bot bot commented Mar 23, 2022

Uh oh!

cypress bot commented Mar 23, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test summary

Run details

Flakiness

Uh oh!

lmiller1990 Mar 24, 2022

Choose a reason for hiding this comment

Uh oh!

marktnoonan left a comment

Choose a reason for hiding this comment

Uh oh!

marktnoonan Mar 24, 2022

Choose a reason for hiding this comment

Uh oh!

elevatebart Mar 24, 2022

Choose a reason for hiding this comment

Uh oh!

lmiller1990 commented Mar 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

marktnoonan commented Mar 25, 2022

Uh oh!

ryanthemanuel commented Mar 25, 2022

Uh oh!

lmiller1990 commented Mar 28, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Comments

lmiller1990 commented Mar 23, 2022 •

edited

Loading

cypress bot commented Mar 23, 2022 •

edited

Loading

lmiller1990 commented Mar 25, 2022 •

edited

Loading

lmiller1990 commented Mar 28, 2022 •

edited

Loading