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

Users are not rewarded for viewing an NTP SI until the browser is restarted #12766

Merged
merged 1 commit into from
Mar 28, 2022

Conversation

tmancey
Copy link
Collaborator

@tmancey tmancey commented Mar 25, 2022

Resolves brave/brave-browser#13815

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • 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, npm run lint, 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:

Catalog should download after upgrading from 1.34.x to this version

@tmancey tmancey requested a review from a team as a code owner March 25, 2022 20:24
@tmancey tmancey self-assigned this Mar 25, 2022
@tmancey tmancey marked this pull request as draft March 25, 2022 20:25
@tmancey tmancey force-pushed the issues/13815 branch 7 times, most recently from 8b4fdb5 to eb1a297 Compare March 25, 2022 21:25
@tmancey tmancey marked this pull request as ready for review March 25, 2022 21:25
@tmancey tmancey requested a review from a team as a code owner March 25, 2022 21:25
@github-actions github-actions bot added rebase and removed rebase labels Mar 25, 2022
@@ -43,6 +44,10 @@ void Migration::FromVersion(const int from_version, ResultCallback callback) {
return;
}

// TODO(https://github.com/brave/brave-browser/issues/14728): Decouple catalog
// business logic once we have implemented database observers
ResetCatalog();
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Database migration deletes the catalog database tables, therefore we need to reset the catalog to force a new catalog to be fetched after upgrade

.WillByDefault(
Invoke([](const std::string& path) { g_prefs.erase(path); }));
.WillByDefault(Invoke([](const std::string& path) {
const std::string pref_path = GetUuidForCurrentTest(path);
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fixes a bug where mocks did not clear the pref due to using the wrong path

@tmancey tmancey marked this pull request as draft March 25, 2022 23:31
@tmancey tmancey marked this pull request as ready for review March 25, 2022 23:42
@github-actions github-actions bot added rebase and removed rebase labels Mar 25, 2022
@tmancey tmancey force-pushed the issues/13815 branch 4 times, most recently from 43d5fab to f6322b9 Compare March 28, 2022 15:59
@tmancey tmancey requested a review from moritzhaller March 28, 2022 15:59
ios/browser/api/ads/brave_ads.mm Outdated Show resolved Hide resolved
Copy link
Collaborator

@kylehickinson kylehickinson left a comment

Choose a reason for hiding this comment

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

iOS++

@tmancey tmancey merged commit 5d6e457 into master Mar 28, 2022
@tmancey tmancey deleted the issues/13815 branch March 28, 2022 18:48
@tmancey tmancey added this to the 1.39.x - Nightly milestone Mar 28, 2022
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.

Users are not rewarded for viewing an NTP SI until the browser is restarted
5 participants