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

fix(iOS): DAUTests.testMondayOfCurrentWeekFormatted() unit test #27128

Merged
merged 2 commits into from
Jan 6, 2025

Conversation

StephenHeaps
Copy link
Collaborator

@StephenHeaps StephenHeaps commented Jan 6, 2025

  • Update unit test to grab the year directly from gregorian calendar using DateComponents so the year shouldn't need updated.

Resolves brave/brave-browser#43117
Resolves brave/brave-browser#43132

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

Run DAUTests.testMondayOfCurrentWeekFormatted()

@StephenHeaps StephenHeaps added CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows-x64 Do not run CI builds for Windows x64 CI/skip-macos-arm64 Do not run CI builds for macOS arm64 labels Jan 6, 2025
@StephenHeaps StephenHeaps self-assigned this Jan 6, 2025
@StephenHeaps StephenHeaps requested a review from a team as a code owner January 6, 2025 15:06
Comment on lines 271 to 272
let gregorianCalendarYear = gregorianCalendar.dateComponents([.year], from: Date()).year
XCTAssertEqual(gregorianCalendarYear, year)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Wouldn't this fail if the monday of the current week is in a previous year? For example from 2024-2025, if the current date was Jan 1 2025 (Wed), the monday of the week would be Dec 30 2024

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Hmm yeah I think you're right since we're looking backwards. Maybe better to check against gregorianCalendarYear - 1 for that case, ex:
XCTAssert(year >= (gregorianCalendarYear - 1) && year <= gregorianCalendarYear)

Copy link
Collaborator

Choose a reason for hiding this comment

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

Either that or use a fixed date for generating the current monday (which honestly may be safer anyways)

@StephenHeaps StephenHeaps enabled auto-merge (squash) January 6, 2025 16:10
@StephenHeaps StephenHeaps merged commit b375744 into master Jan 6, 2025
18 checks passed
@StephenHeaps StephenHeaps deleted the bugfix/ios-dau-test branch January 6, 2025 16:29
@github-actions github-actions bot added this to the 1.75.x - Nightly milestone Jan 6, 2025
@brave-builds
Copy link
Collaborator

Released in v1.75.150

brave-builds added a commit that referenced this pull request Jan 7, 2025
brave-builds added a commit that referenced this pull request Jan 7, 2025
kjozwiak pushed a commit that referenced this pull request Jan 7, 2025
kjozwiak pushed a commit that referenced this pull request Jan 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-android Do not run CI builds for Android CI/skip-macos-arm64 Do not run CI builds for macOS arm64 CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows-x64 Do not run CI builds for Windows x64
Projects
None yet
3 participants