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

TASK: Remove obsolote apply button from dateInput snapshot #3757

Merged
merged 1 commit into from
Mar 18, 2024

Conversation

grebaldi
Copy link
Contributor

@grebaldi grebaldi commented Mar 17, 2024

On our 8.3 branch, jest complains:

  ● <DateInput/> › should format time in 24 hour format

    expect(received).toMatchSnapshot()

    Snapshot name: `<DateInput/> should format time in 24 hour format 1`

    - Snapshot  - 16
    + Received  +  0

    @@ -83,23 +83,7 @@
              }
            }
            timeFormat="HH:m"
            utc={false}
          />
    -     <ThemedButton
    -       _refHandler={[Function]}
    -       className="applyBtnClassName"
    -       composeTheme="deeply"
    -       disabled={false}
    -       hoverStyle="brand"
    -       isActive={false}
    -       isFocused={false}
    -       mapThemrProps={[Function]}
    -       onClick={[Function]}
    -       size="regular"
    -       style="brand"
    -       type="button"
    -     >
    -       applyLabel
    -     </ThemedButton>
        </UnmountClosed>
      </div>

This is due to a conflict between these two PRs:

With both combined, jest tries to match the snapshot and finds (correctly so) that the "Apply" button is missing.

This PR removes the obsolete part from said snapshot.

@grebaldi grebaldi changed the base branch from 9.0 to 8.3 March 17, 2024 15:34
@github-actions github-actions bot added 8.3 and removed 9.0 labels Mar 17, 2024
@grebaldi grebaldi force-pushed the task/merge-foo-3737-vs-3736 branch from dfa15ef to 6f7422e Compare March 17, 2024 15:36
Copy link
Member

@mhsdesign mhsdesign left a comment

Choose a reason for hiding this comment

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

Ah yes well that explains it ^^

Thanks for fixing this ;) !!!

@ahaeslich ahaeslich merged commit 2c409b5 into neos:8.3 Mar 18, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants