Skip to content

internal: Redesign single test view when studio is open #32008

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

Merged
merged 349 commits into from
Jul 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
349 commits
Select commit Hold shift + click to select a range
b9ba96c
update yarn.lock
ryanthemanuel Jun 26, 2025
4becd76
index on mabel/issue-31677-reporter-redesign: 5e2503f339 Merge branch…
Jun 26, 2025
e907ef9
WIP on mabel/issue-31677-reporter-redesign: 5e2503f339 Merge branch '…
Jun 26, 2025
069b55a
Merge commit 'stash' into mabel/issue-31677-reporter-redesign
Jun 26, 2025
f32d6fc
index on mabel/issue-31677-reporter-redesign: 5e2503f339 Merge branch…
Jun 26, 2025
4a1d454
WIP on mabel/issue-31677-reporter-redesign: 5e2503f339 Merge branch '…
Jun 26, 2025
5c76e49
Merge commit 'stash' into mabel/issue-31677-reporter-redesign
Jun 26, 2025
9c67b81
Merge branch 'release/15.0.0' into mabel/issue-31677-reporter-redesign
jennifer-shehane Jun 26, 2025
25db731
index on mabel/issue-31677-reporter-redesign: 5e2503f339 Merge branch…
Jun 26, 2025
ea3824b
WIP on mabel/issue-31677-reporter-redesign: 5e2503f339 Merge branch '…
Jun 26, 2025
dbcd55d
Merge commit 'stash' into mabel/issue-31677-reporter-redesign
Jun 26, 2025
4a99f86
handle open in ide and new test button shadows/padding/alignment
mabela416 Jun 26, 2025
a2e002e
Merge remote-tracking branch 'refs/remotes/origin/mabel/issue-31677-r…
mabela416 Jun 26, 2025
ba6342c
link issue to TODO
mabela416 Jun 26, 2025
250ee62
Merge branch 'release/15.0.0' into mabel/issue-31677-reporter-redesign
jennifer-shehane Jun 26, 2025
7941739
only add pointer-events:none to tests and not suites
mabela416 Jun 27, 2025
2286fef
fix failing tests
mabela416 Jun 27, 2025
8d11bd6
Merge remote-tracking branch 'refs/remotes/origin/mabel/issue-31677-r…
mabela416 Jun 27, 2025
33cedef
Merge branch 'release/15.0.0' into mabel/issue-31677-reporter-redesign
mabela416 Jun 27, 2025
94c4b8d
Update cache-version.txt
ryanthemanuel Jun 27, 2025
21c677b
fix failing test
mabela416 Jun 27, 2025
2cebdd3
fix clear sessions width
mabela416 Jun 27, 2025
e1dafa6
Merge branch 'release/15.0.0' into mabel/issue-31677-reporter-redesign
mabela416 Jun 27, 2025
89ab5de
yarnlock update
jennifer-shehane Jun 27, 2025
61ad3de
remove unused style
mabela416 Jun 27, 2025
d2b7adb
remove unused style
mabela416 Jun 27, 2025
7a0f7a4
Merge remote-tracking branch 'refs/remotes/origin/mabel/issue-31677-r…
mabela416 Jun 27, 2025
3b59a94
add caching when calculating children states in the suite-model
mabela416 Jun 27, 2025
f5c4517
Revert "add caching when calculating children states in the suite-model"
mabela416 Jun 27, 2025
2077f9a
Remove * css style for reporter box-sizing - I don't see this impacti…
jennifer-shehane Jun 27, 2025
d275ee8
have css only target languages we support showing in Cypress App
jennifer-shehane Jun 27, 2025
4ed2196
Remove normalize.scss
jennifer-shehane Jun 27, 2025
b366676
Remove more global css resets to improve rendering performance
jennifer-shehane Jun 27, 2025
ca8ab11
Merge branch 'release/15.0.0' into mabel/issue-31677-reporter-redesign
jennifer-shehane Jun 27, 2025
ea8ae0d
remove running state
mabela416 Jun 30, 2025
7ca24d9
memoize components in runnable-and-suite
mabela416 Jun 30, 2025
4fc9559
fix failing test
mabela416 Jun 30, 2025
0f771f7
Merge branch 'mabel/issue-31677-reporter-redesign' into mabel/issue-1…
mabela416 Jun 30, 2025
6fa304b
bump cache
mabela416 Jun 30, 2025
dbdbda1
Merge branch 'release/15.0.0' into mabel/issue-31677-reporter-redesign
mabela416 Jun 30, 2025
b4af125
skip failing tests related to active states
mabela416 Jun 30, 2025
2236a35
Merge branch 'mabel/issue-31677-reporter-redesign' into mabel/issue-1…
mabela416 Jun 30, 2025
d474722
add clearSuiteId function
mabela416 Jul 1, 2025
9a59792
misc: begin work on reporter redesign
jennifer-shehane May 9, 2025
180c665
remove info icon on failing tests
jennifer-shehane May 13, 2025
aeee992
Add new queued icon to tests
jennifer-shehane May 13, 2025
e2f4690
bump react-icon
jennifer-shehane May 16, 2025
c1efe2a
add some styles for the header
mabela416 Jun 5, 2025
4d58dfd
add some styles and icons to describe blocks
mabela416 Jun 6, 2025
6c6e90f
display chevron down on describe hover
mabela416 Jun 6, 2025
9f685ef
add css for red-400
mabela416 Jun 9, 2025
9701003
only display collapsible describes if there are tests in the suite
mabela416 Jun 9, 2025
accc3e8
add new test on describe hover
mabela416 Jun 9, 2025
c416ed9
add describe focus styles
mabela416 Jun 9, 2025
a0a05a0
add describe focus styles scss
mabela416 Jun 9, 2025
5784de2
fix add commands to test wand placement
mabela416 Jun 9, 2025
d9dcc53
update stats icon with describe and test hover and focus
mabela416 Jun 11, 2025
52657c8
update test status icons
mabela416 Jun 12, 2025
593e1d5
handles some of the test body styles and states
mabela416 Jun 12, 2025
f3ac768
add ellipsis to runnable title and flex shrink to icons
mabela416 Jun 12, 2025
e48c03a
fix command row stylings
mabela416 Jun 13, 2025
25a90df
fix session alignment
mabela416 Jun 13, 2025
385e135
fix collapsible indicator styles
mabela416 Jun 13, 2025
66fc5ba
handle attempt styling
mabela416 Jun 13, 2025
eafc8b4
fix failing tests
mabela416 Jun 13, 2025
3c77325
add back command status borders
mabela416 Jun 13, 2025
1815b8a
fix suites.cy.ts tests and make some styling fixes
mabela416 Jun 16, 2025
482329e
fix styles for New test button on focused/hovered suites
mabela416 Jun 16, 2025
b258f39
fix header test
mabela416 Jun 16, 2025
02dbfc9
attempt spacing fixes
mabela416 Jun 16, 2025
7d4cfc5
fix shortcuts test
mabela416 Jun 16, 2025
b818b4f
add open in ide on header hover
mabela416 Jun 17, 2025
166fc95
make some styling fixes to errors
mabela416 Jun 17, 2025
87798b2
make error styling changes
mabela416 Jun 17, 2025
d007711
update control icons and styles
mabela416 Jun 18, 2025
41c1c45
fix dotted line for suites
mabela416 Jun 18, 2025
db5ca4c
add test dots
mabela416 Jun 18, 2025
5a60c93
fix logic for displaying test dots
mabela416 Jun 18, 2025
7b1540e
use stop circle icon
mabela416 Jun 18, 2025
8b51d4b
refactor runnable and suite header icon
mabela416 Jun 18, 2025
a8ef959
only use test children to determine current suite state to display th…
mabela416 Jun 18, 2025
8520166
fix suites test
mabela416 Jun 18, 2025
d33ea54
fix suite and test icon alignments
mabela416 Jun 18, 2025
be00085
clean up some comments and unused variables
mabela416 Jun 18, 2025
d1b26b2
fix failing tests
mabela416 Jun 20, 2025
0754a6b
fix failing studio tests
mabela416 Jun 20, 2025
e52c3de
fix failing tests
mabela416 Jun 20, 2025
40484df
fix meta test
mabela416 Jun 20, 2025
5998aba
fix suite_model test
mabela416 Jun 20, 2025
c4efc64
add more tests for suite-model
mabela416 Jun 20, 2025
e27d32a
fix more tests
mabela416 Jun 20, 2025
70f0593
fix failing test
mabela416 Jun 23, 2025
d046985
fix padding for hook headers
mabela416 Jun 23, 2025
fc4bab8
handle font weight, describe aligment and status border widths
mabela416 Jun 23, 2025
0717882
fix rounded corners on hover of commands
mabela416 Jun 23, 2025
1bfe0dd
round status border when test is opened
mabela416 Jun 23, 2025
c58b933
handle chevron right/down when hovering when collapsible is open/closed
mabela416 Jun 23, 2025
25640db
add changelog entry
jennifer-shehane Jun 23, 2025
e94e784
yarn lock
jennifer-shehane Jun 23, 2025
260f49b
run on binary
jennifer-shehane Jun 23, 2025
b412ccc
bust circle cache
jennifer-shehane Jun 23, 2025
b13efa7
center align open in ide on command hover
mabela416 Jun 23, 2025
1295ed8
add padding to the bottom of the last suite/test
mabela416 Jun 23, 2025
0724626
fix attempt padding and connecting dots
mabela416 Jun 23, 2025
b97955e
update progress bar color to gray-900
mabela416 Jun 24, 2025
004955f
no jumping when opening test
mabela416 Jun 24, 2025
fe60345
top align describe/test text when the text wraps to the next line
mabela416 Jun 24, 2025
5e68beb
clean up new test button styles and add the linear gradient
mabela416 Jun 24, 2025
690d133
fix dotted line and describe/test padding
mabela416 Jun 25, 2025
c0c8c20
round out error border and remove double red border on errors
mabela416 Jun 25, 2025
51182a9
fix gap for stack trace
mabela416 Jun 25, 2025
d5080b5
only apply margin top to test and suite icons
mabela416 Jun 25, 2025
3ff22f4
change opacity of add commands to test wand icon
mabela416 Jun 25, 2025
a354d37
fix wand opacity test
mabela416 Jun 25, 2025
6839953
can we just remove this overflow: scroll?
jennifer-shehane Jun 25, 2025
fbd0733
clean up TODOs
mabela416 Jun 25, 2025
1e4cf70
fix error group line alignment
mabela416 Jun 25, 2025
2043f96
align open IDE tooltip in hooks
mabela416 Jun 25, 2025
f6100fa
fix padding between suites
mabela416 Jun 26, 2025
d1db209
remove purple border around describe in studio
mabela416 Jun 26, 2025
96ce791
Add tailwind css so that styles work in e2e tests
jennifer-shehane Jun 25, 2025
cecf0ca
fix studio buttons padding
mabela416 Jun 26, 2025
576e2a0
fix stack trace padding
mabela416 Jun 26, 2025
fa6b504
disable clicking for skipped and queued up tests
mabela416 Jun 26, 2025
547d869
fix 1px jumping when opening test
mabela416 Jun 26, 2025
df6b96a
handle open in ide and new test button shadows/padding/alignment
mabela416 Jun 26, 2025
b8429f1
circle cache
jennifer-shehane Jun 26, 2025
06b3bbf
update yarn.lock
ryanthemanuel Jun 26, 2025
af58d5d
index on mabel/issue-31677-reporter-redesign: 5e2503f339 Merge branch…
Jun 26, 2025
6fb378e
index on mabel/issue-31677-reporter-redesign: 5e2503f339 Merge branch…
Jun 26, 2025
a1e5d53
index on mabel/issue-31677-reporter-redesign: 5e2503f339 Merge branch…
Jun 26, 2025
0e49d31
link issue to TODO
mabela416 Jun 26, 2025
f378143
only add pointer-events:none to tests and not suites
mabela416 Jun 27, 2025
456835a
fix failing tests
mabela416 Jun 27, 2025
e53a429
Update cache-version.txt
ryanthemanuel Jun 27, 2025
5727cce
fix failing test
mabela416 Jun 27, 2025
8072366
fix clear sessions width
mabela416 Jun 27, 2025
105c8cf
remove unused style
mabela416 Jun 27, 2025
d1a63b9
yarnlock update
jennifer-shehane Jun 27, 2025
8c61382
add caching when calculating children states in the suite-model
mabela416 Jun 27, 2025
20fc38f
Revert "add caching when calculating children states in the suite-model"
mabela416 Jun 27, 2025
c2cdc91
Remove * css style for reporter box-sizing - I don't see this impacti…
jennifer-shehane Jun 27, 2025
738ba3f
have css only target languages we support showing in Cypress App
jennifer-shehane Jun 27, 2025
2d7d2a2
Remove normalize.scss
jennifer-shehane Jun 27, 2025
9062fab
Remove more global css resets to improve rendering performance
jennifer-shehane Jun 27, 2025
4040a57
remove running state
mabela416 Jun 30, 2025
8f2d9d5
memoize components in runnable-and-suite
mabela416 Jun 30, 2025
2a9a0e8
fix failing test
mabela416 Jun 30, 2025
604ba08
bump cache
mabela416 Jun 30, 2025
ec7b787
skip failing tests related to active states
mabela416 Jun 30, 2025
4eb0f03
Merge branch 'mabel/issue-31677-reporter-redesign' into mabel/issue-1…
mabela416 Jul 1, 2025
dac4683
clean up existing studio UI
mabela416 Jul 1, 2025
b78935c
refactor duration and openFileInIDEButtn
mabela416 Jul 2, 2025
f8ea4b1
Merge remote-tracking branch 'origin' into mabel/issue-10425-studio-r…
mabela416 Jul 7, 2025
b19e548
Merge branch 'release/15.0.0' into mabel/issue-10425-studio-redesign
mabela416 Jul 7, 2025
b1290fb
update workflows file
mabela416 Jul 7, 2025
cb99ec4
add single test component
mabela416 Jul 7, 2025
a9f43ba
save parentTitle to use in single test mode
mabela416 Jul 7, 2025
8b65a80
add single test component
mabela416 Jul 7, 2025
7d9ebb5
Merge remote-tracking branch 'refs/remotes/origin/mabel/issue-10425-s…
mabela416 Jul 7, 2025
87b35df
clean up studio commands
mabela416 Jul 8, 2025
d6ac3d1
remove adding studio commands as a hook
mabela416 Jul 8, 2025
fd2b589
clean up hook-model from studio commands
mabela416 Jul 8, 2025
c4acabf
use new singleTest component when studio is active and on single test…
mabela416 Jul 9, 2025
cb7597a
update reporter start to set single studio test active
mabela416 Jul 9, 2025
ebd6caa
actually set single test mode
mabela416 Jul 9, 2025
e118c24
Merge branch 'release/15.0.0' into mabel/issue-10425-studio-redesign
mabela416 Jul 9, 2025
768582f
clean up more old studio code
mabela416 Jul 9, 2025
27f6deb
fix styles for header title
mabela416 Jul 9, 2025
38f80c1
Merge remote-tracking branch 'refs/remotes/origin/mabel/issue-10425-s…
mabela416 Jul 9, 2025
82c1d06
fix hooks test
mabela416 Jul 9, 2025
0a1f9a7
whoops re-add deleted line
mabela416 Jul 9, 2025
b68d373
fix events.cy.ts test
mabela416 Jul 10, 2025
5bd0b83
fix runnables_store test
mabela416 Jul 10, 2025
671726d
fix test_model test
mabela416 Jul 10, 2025
bee69a5
fix test_errors test
mabela416 Jul 10, 2025
577cdb1
fix tests test
mabela416 Jul 10, 2025
4b0fbd0
fix studio-cloud test
mabela416 Jul 10, 2025
ad8ce4e
update waitForSpecToFinish
mabela416 Jul 10, 2025
78b236a
fix some studio tests maybe?
mabela416 Jul 11, 2025
80125b2
Merge branch 'release/15.0.0' into mabel/issue-10425-studio-redesign
mabela416 Jul 11, 2025
c1d32b4
fix some tests
mabela416 Jul 11, 2025
5a8882e
add back studio commands hook to tests
mabela416 Jul 11, 2025
bbf51a4
add back some of the events i removed that also need to be cleaned up…
mabela416 Jul 11, 2025
7ec5abc
fix some tests
mabela416 Jul 11, 2025
c94f3a1
add test for back button and open in ide button in single test mode
mabela416 Jul 11, 2025
add368b
add component test for StudioSingleTest component
mabela416 Jul 11, 2025
aeee691
wait for specs to finish to reduce flake when asserting on aut iframe
mabela416 Jul 14, 2025
188bc8a
add tests back
mabela416 Jul 14, 2025
4972c03
remove studio instructions modal
mabela416 Jul 14, 2025
d9e7f71
remove this branch from mac workflow
mabela416 Jul 14, 2025
6ef0aa6
try to fix the studio tests
mabela416 Jul 14, 2025
9f43761
check if aut-iframe is empty
mabela416 Jul 14, 2025
4d32385
add more checks to make sure aut is ready
mabela416 Jul 14, 2025
3bec4c1
Merge branch 'release/15.0.0' into mabel/issue-10425-studio-redesign
mabela416 Jul 14, 2025
1cec483
Merge remote-tracking branch 'origin' into mabel/issue-10425-studio-r…
mabela416 Jul 14, 2025
c5fb28d
Merge remote-tracking branch 'refs/remotes/origin/mabel/issue-10425-s…
mabela416 Jul 14, 2025
1609ea5
Merge remote-tracking branch 'origin/release/15.0.0' into mabel/issue…
mabela416 Jul 14, 2025
4b9ed46
add loading tests state to StudioSingleTest
mabela416 Jul 15, 2025
84d1a8e
Merge branch 'release/15.0.0' into mabel/issue-10425-studio-redesign
mabela416 Jul 15, 2025
496244a
fix single studio test
mabela416 Jul 15, 2025
768e7d6
Merge remote-tracking branch 'refs/remotes/origin/mabel/issue-10425-s…
mabela416 Jul 15, 2025
6ee9b1c
add more conditions for the studio tests
mabela416 Jul 15, 2025
294a258
make a few more changes to the existing tests
mabela416 Jul 15, 2025
f3dd66b
fix button styles
mabela416 Jul 15, 2025
1639de7
add scrollbar to single test
mabela416 Jul 15, 2025
d9f373e
hide studio commands hooks
mabela416 Jul 15, 2025
1826664
handle scroll to view in single test mode
mabela416 Jul 15, 2025
8c96ef7
Merge branch 'release/15.0.0' into mabel/issue-10425-studio-redesign
mabela416 Jul 15, 2025
a9ee429
Merge branch 'release/15.0.0' into mabel/issue-10425-studio-redesign
jennifer-shehane Jul 15, 2025
c67325e
show empty test state when test is errored
mabela416 Jul 15, 2025
61ce65f
update name to checkForStats
mabela416 Jul 15, 2025
b52782c
Merge remote-tracking branch 'refs/remotes/origin/mabel/issue-10425-s…
mabela416 Jul 15, 2025
05e598e
add useScrollIntoView hook
mabela416 Jul 15, 2025
027f556
update waitForSpecToFinish
mabela416 Jul 15, 2025
7121234
remove unused props
mabela416 Jul 15, 2025
c639a0c
allow stop button to work when studio is active
mabela416 Jul 15, 2025
7c78b52
clean up StudioTest.scss
mabela416 Jul 15, 2025
7d01583
remove runnable active and queued checks
mabela416 Jul 16, 2025
63a5c2d
fix order of operations in waitForSpecToFinish
mabela416 Jul 16, 2025
8c061e8
call studio:cancel event for back button in studio test mode
mabela416 Jul 16, 2025
0ecefe3
Merge branch 'release/15.0.0' into mabel/issue-10425-studio-redesign
mabela416 Jul 16, 2025
5b74748
remove studio commands check
mabela416 Jul 16, 2025
f91c0da
memoize scrollIntoView callback and add it as a dependency in useEffect
mabela416 Jul 16, 2025
45d4377
fix ts error
mabela416 Jul 16, 2025
83d5029
check if single test studio is active when waiting for spec
mabela416 Jul 17, 2025
d63e2b4
merge with release branch
mabela416 Jul 17, 2025
4c7bd85
fix launchStudio new test logic
mabela416 Jul 17, 2025
c77ea9e
Merge branch 'release/15.0.0' into mabel/issue-10425-studio-redesign
mabela416 Jul 17, 2025
8271204
allow shorcuts to work in studio mode
mabela416 Jul 17, 2025
07fd342
Merge remote-tracking branch 'refs/remotes/origin/mabel/issue-10425-s…
mabela416 Jul 17, 2025
82763cd
align test studio icon at the top
mabela416 Jul 17, 2025
aa891fc
refactor spec file name into its own component
mabela416 Jul 17, 2025
27ecd7c
update tests with new spec file name classname
mabela416 Jul 17, 2025
75a8026
add checkForStats and add tests for removing url parameters
mabela416 Jul 17, 2025
283c703
Merge remote-tracking branch 'origin/release/15.0.0' into mabel/issue…
mabela416 Jul 17, 2025
adc8266
Merge branch 'release/15.0.0' into mabel/issue-10425-studio-redesign
jennifer-shehane Jul 17, 2025
afe0782
remove spacing
mabela416 Jul 17, 2025
e3085c8
fix icon import
mabela416 Jul 17, 2025
5356841
fix tests.cy
mabela416 Jul 17, 2025
e7a2616
Merge remote-tracking branch 'refs/remotes/origin/mabel/issue-10425-s…
mabela416 Jul 17, 2025
2dc9dad
Merge branch 'release/15.0.0' into mabel/issue-10425-studio-redesign
mabela416 Jul 17, 2025
cbe5dbf
fix open file in ide test
mabela416 Jul 17, 2025
099fe7e
Merge remote-tracking branch 'refs/remotes/origin/mabel/issue-10425-s…
mabela416 Jul 17, 2025
66bba84
Merge branch 'release/15.0.0' into mabel/issue-10425-studio-redesign
mabela416 Jul 17, 2025
d3922d3
add style I accidentally removed
mabela416 Jul 17, 2025
bffecae
Merge remote-tracking branch 'refs/remotes/origin/mabel/issue-10425-s…
mabela416 Jul 17, 2025
687d088
Merge branch 'release/15.0.0' into mabel/issue-10425-studio-redesign
jennifer-shehane Jul 18, 2025
62237b2
Merge remote-tracking branch 'origin/release/15.0.0' into mabel/issue…
mabela416 Jul 18, 2025
1e3e32d
Merge remote-tracking branch 'refs/remotes/origin/mabel/issue-10425-s…
mabela416 Jul 18, 2025
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
16 changes: 4 additions & 12 deletions .circleci/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ mainBuildFilters: &mainBuildFilters
- /^release\/\d+\.\d+\.\d+$/
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
- 'update-v8-snapshot-cache-on-develop'
- 'feat/support_vite_7'
- 'mabel/issue-10425-studio-redesign'

# usually we don't build Mac app - it takes a long time
# but sometimes we want to really confirm we are doing the right thing
Expand All @@ -62,11 +62,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
- equal: [ develop, << pipeline.git.branch >> ]
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
- equal:
[
'feat/support_vite_7',
<< pipeline.git.branch >>
]
- equal: [ 'feat/support_vite_7', << pipeline.git.branch >> ]
- matches:
pattern: /^release\/\d+\.\d+\.\d+$/
value: << pipeline.git.branch >>
Expand All @@ -89,11 +85,7 @@ windowsWorkflowFilters: &windows-workflow-filters
- equal: [ develop, << pipeline.git.branch >> ]
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
- equal:
[
'feat/support_vite_7',
<< pipeline.git.branch >>
]
- equal: [ 'feat/support_vite_7', << pipeline.git.branch >> ]
- matches:
pattern: /^release\/\d+\.\d+\.\d+$/
value: << pipeline.git.branch >>
Expand Down Expand Up @@ -167,7 +159,7 @@ commands:
name: Set environment variable to determine whether or not to persist artifacts
command: |
echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "feat/support_vite_7" ]]; then
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "mabel/issue-10425-studio-redesign" ]]; then
export SHOULD_PERSIST_ARTIFACTS=true
fi' >> "$BASH_ENV"
# You must run `setup_should_persist_artifacts` command and be using bash before running this command
Expand Down
2 changes: 1 addition & 1 deletion packages/app/cypress/e2e/runner/runner.ui.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ describe('src/cypress/runner', () => {
})

cy.get('.open-in-ide-button').should('have.css', 'opacity', '0')
cy.get('.runnable-header-file-name').realHover()
cy.get('.spec-file-name').realHover()
cy.get('.open-in-ide-button').first().should('have.css', 'opacity', '1').click()

cy.withCtx((ctx, o) => {
Expand Down
9 changes: 3 additions & 6 deletions packages/app/cypress/e2e/studio/helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@ export function loadProjectAndRunSpec ({ projectName = 'experimental-studio' as
export function launchStudio ({ specName = 'spec.cy.js', createNewTest = false, cliArgs = [''] } = {}) {
loadProjectAndRunSpec({ specName, cliArgs })

// Should not show "Studio Commands" until we've started a new Studio session.
cy.get('[data-cy="hook-name-studio commands"]').should('not.exist')
const testTitle = createNewTest ? 'New Test' : 'visits a basic html page'

if (createNewTest) {
cy.contains('studio functionality').as('item')
} else {
cy.contains('visits a basic html page').as('item')
cy.contains(testTitle).as('item')
}

cy.get('@item')
Expand All @@ -42,7 +41,7 @@ export function launchStudio ({ specName = 'spec.cy.js', createNewTest = false,
// Studio re-executes spec before waiting for commands - wait for the spec to finish executing.
cy.waitForSpecToFinish()

cy.findByTestId('hook-name-studio commands').should('exist')
cy.get('[data-cy="studio-single-test-title"]').contains(testTitle)
}
}

Expand All @@ -59,8 +58,6 @@ export function assertClosingPanelWithoutChanges () {
cy.contains('cypress/e2e/index.html')
})

cy.findByTestId('hook-name-studio commands').should('not.exist')

cy.withCtx(async (ctx) => {
const spec = await ctx.actions.file.readFileInProject('cypress/e2e/spec.cy.js')

Expand Down
19 changes: 6 additions & 13 deletions packages/app/cypress/e2e/studio/studio-cloud.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe('Studio Cloud', () => {
})
})

it('immediately loads the studio panel', () => {
it('immediately loads the studio panel from existing test', () => {
const deferred = pDefer()

loadProjectAndRunSpec()
Expand All @@ -29,8 +29,6 @@ describe('Studio Cloud', () => {
.findByTestId('launch-studio')
.click()

// regular studio is not loaded until after the test finishes
cy.findByTestId('hook-name-studio commands').should('not.exist')
// cloud studio is loaded immediately
cy.findByTestId('studio-panel').then(() => {
// check for the loading panel from the app first
Expand All @@ -42,14 +40,15 @@ describe('Studio Cloud', () => {
cy.wait('@indexHtml')

// Studio re-executes spec before waiting for commands - wait for the spec to finish executing.
cy.waitForSpecToFinish()
cy.waitForSpecToFinish(undefined, undefined, false)

// Verify the studio panel is still open
cy.findByTestId('studio-panel')
cy.findByTestId('hook-name-studio commands')

cy.percySnapshot()
})

it('hides selector playground and studio controls when studio beta is available', () => {
it('hides selector playground and studio controls when experimentalStudio is enabled', () => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This selector playground state does not reset to the proper hide/show state after a user edits their cypress.config.js file. (This could be a followup ticket)

  • Removing 'experimentalStudio' from cypress.config.js does not then show the selector playground after the browser auto refreshes
  • Adding 'experimentalStudio' to cypress.config.js does not then remove the selector playground after the browser auto refreshes

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

launchStudio()

cy.findByTestId('studio-panel').should('be.visible')
Expand Down Expand Up @@ -136,8 +135,6 @@ describe('Studio Cloud', () => {
.findByTestId('launch-studio')
.click()

// regular studio is not loaded until after the test finishes
cy.findByTestId('hook-name-studio commands').should('not.exist')
// cloud studio is loaded immediately
cy.findByTestId('studio-panel').then(() => {
// check for the loading panel from the app first
Expand All @@ -153,7 +150,6 @@ describe('Studio Cloud', () => {

// Verify the studio panel is still open
cy.findByTestId('studio-panel')
cy.findByTestId('hook-name-studio commands')

// make sure studio is not loading
cy.findByTestId('loading-studio-panel').should('not.exist')
Expand Down Expand Up @@ -217,8 +213,6 @@ describe('Studio Cloud', () => {
.findByTestId('launch-studio')
.click()

// regular studio is not loaded until after the test finishes
cy.get('[data-cy="hook-name-studio commands"]').should('not.exist')
// cloud studio is loaded immediately
cy.findByTestId('studio-panel').then(() => {
// check for the loading panel from the app first
Expand All @@ -230,11 +224,10 @@ describe('Studio Cloud', () => {
cy.wait('@indexHtml')

// Studio re-executes spec before waiting for commands - wait for the spec to finish executing.
cy.waitForSpecToFinish()
cy.waitForSpecToFinish(undefined, undefined, false)

// Verify the studio panel is still open
cy.findByTestId('studio-panel')
cy.get('[data-cy="hook-name-studio commands"]')

// make sure studio is not loading
cy.get('[data-cy="loading-studio-panel"]').should('not.exist')
Expand Down
Loading
Loading