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.

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

chore: minor style updates & fix a windows test #24558

Merged
merged 25 commits into from Nov 8, 2022
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
cb86749
wait for config initialization to be complete
marktnoonan Nov 6, 2022
a2ac561
increase timeout for cy-in-cy on windows
marktnoonan Nov 6, 2022
2060532
run more CI steps on this branch
marktnoonan Nov 6, 2022
57fdfc3
tweak border, fix double scrollbar
marktnoonan Nov 6, 2022
430d356
reach choose a browser page before login in launchpad test
marktnoonan Nov 7, 2022
ed3c0ff
revert timeout change
marktnoonan Nov 7, 2022
69559fb
chore: update vite in system test
lmiller1990 Nov 7, 2022
af43f3f
Merge branch 'develop' into marktnoonan/windows-test-updates
lmiller1990 Nov 7, 2022
2bf78a6
Fixing value for monthIndex to Date.UTC
warrensplayer Nov 7, 2022
7ef06fa
chore: fix test date
astone123 Nov 7, 2022
71a9418
Merge branch 'develop' into marktnoonan/windows-test-updates
astone123 Nov 7, 2022
75d25ca
chore: fix tests in reporter-ct-mount-hover.cy.ts
astone123 Nov 7, 2022
5cca59a
try fixing some flake
lmiller1990 Nov 8, 2022
12174a4
fix yarn lock
lmiller1990 Nov 8, 2022
aeaae33
conditionally skip flaky test on windows
lmiller1990 Nov 8, 2022
1924e6a
note on skipped test
lmiller1990 Nov 8, 2022
79ccaae
chore: skip flaky tests on windows only [skip ci]
lmiller1990 Nov 8, 2022
4cb9aef
Merge remote-tracking branch 'origin/develop' into marktnoonan/window…
lmiller1990 Nov 8, 2022
46a480f
Merge branch 'develop' into marktnoonan/windows-test-updates
lmiller1990 Nov 8, 2022
995dc7e
Merge branch 'marktnoonan/windows-test-updates' of https://github.com…
lmiller1990 Nov 8, 2022
4d4bb26
update exports and snaps
lmiller1990 Nov 8, 2022
223b35b
correctly use describe instead of it
lmiller1990 Nov 8, 2022
3fff7d1
fix types
lmiller1990 Nov 8, 2022
aa5c5fa
do not run windows anymore
lmiller1990 Nov 8, 2022
6b61388
add comment [skip ci]
lmiller1990 Nov 8, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
Expand Up @@ -27,7 +27,7 @@ mainBuildFilters: &mainBuildFilters
branches:
only:
- develop
- 'release/11.0.0'
- 'marktnoonan/windows-test-updates'

# 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 @@ -36,7 +36,7 @@ macWorkflowFilters: &darwin-workflow-filters
when:
or:
- equal: [ develop, << pipeline.git.branch >> ]
- equal: [ 'release/11.0.0', << pipeline.git.branch >> ]
- equal: [ 'marktnoonan/windows-test-updates', << pipeline.git.branch >> ]
- matches:
pattern: "-release$"
value: << pipeline.git.branch >>
Expand All @@ -45,7 +45,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
when:
or:
- equal: [ develop, << pipeline.git.branch >> ]
- equal: [ 'release/11.0.0', << pipeline.git.branch >> ]
- equal: [ 'marktnoonan/windows-test-updates', << pipeline.git.branch >> ]
- matches:
pattern: "-release$"
value: << pipeline.git.branch >>
Expand All @@ -63,7 +63,7 @@ windowsWorkflowFilters: &windows-workflow-filters
when:
or:
- equal: [ develop, << pipeline.git.branch >> ]
- equal: [ 'release/11.0.0', << pipeline.git.branch >> ]
- equal: [ 'marktnoonan/windows-test-updates', << pipeline.git.branch >> ]
- matches:
pattern: "-release$"
value: << pipeline.git.branch >>
Expand Down Expand Up @@ -130,7 +130,7 @@ commands:
- run:
name: Check current branch to persist artifacts
command: |
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/11.0.0" ]]; then
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "marktnoonan/windows-test-updates" ]]; then
echo "Not uploading artifacts or posting install comment for this branch."
circleci-agent step halt
fi
Expand Down
5 changes: 3 additions & 2 deletions packages/launchpad/cypress/e2e/top-nav-launchpad.cy.ts
Expand Up @@ -472,7 +472,7 @@ describe('Launchpad Top Nav Workflows', () => {
cy.findByTestId(headerBarId).findByTestId('user-avatar-title').should('be.visible')
})

it('if the project has no runs, shows "record your first run" prompt after clicking', () => {
it('if the project has no runs, shows "record your first run" prompt after choosing testing type', () => {
cy.remoteGraphQLIntercept((obj) => {
if (obj.result?.data?.cloudProjectBySlug?.runs?.nodes?.length) {
obj.result.data.cloudProjectBySlug.runs.nodes = []
Expand All @@ -483,10 +483,11 @@ describe('Launchpad Top Nav Workflows', () => {

cy.contains('Component Testing').click()

cy.contains(defaultMessages.setupWizard.chooseBrowser.title).should('be.visible')

mockLogInActionsForUser(mockUserNoName)

logIn({ expectedNextStepText: 'Continue', displayName: mockUserNoName.email })

cy.contains('[data-cy=standard-modal] h2', defaultMessages.specPage.banners.record.title).should('be.visible')
cy.contains('[data-cy=standard-modal]', defaultMessages.specPage.banners.record.content).should('be.visible')
cy.contains('button', 'Copy').should('be.visible')
Expand Down
4 changes: 2 additions & 2 deletions packages/launchpad/src/migration/MajorVersionWelcome.vue
Expand Up @@ -2,13 +2,13 @@
<div class="bg-no-repeat bg-cover h-screen min-h-700px lp-wrapper">
<div
ref="wrapper"
class="border-transparent rounded mx-auto bg-gray-50/50 border-4px max-w-80vw top-7vh w-716px relative overflow-hidden"
class="rounded mx-auto bg-gray-50/50 border-color-[rgba(0,0,0,0.05)] border-4px max-w-80vw top-7vh w-716px relative overflow-hidden"
>
<div
ref="scroller"
class="bg-white rounded-b max-h-72vh pb-90px overflow-scroll"
>
<div class="h-full overflow-scroll">
<div class="h-full">
<div class="p-16px">
<h1 class="font-medium mt-4px text-center mb-32px tracking-tighter text-22px text-gray-1000">
{{ t('majorVersionWelcome.title') }}
Expand Down