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.

Sign up for GitHub

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

Fixes contribution that is split #5050

Merged
merged 1 commit into from
Mar 25, 2020
Merged

Fixes contribution that is split #5050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
203 changes: 146 additions & 57 deletions components/brave_rewards/browser/rewards_service_browsertest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,14 @@ namespace brave_test_resp {
std::string uphold_auth_resp_;
std::string uphold_transactions_resp_;
std::string uphold_commit_resp_;

std::string contribution_;
std::string reconcile_;
std::string current_reconcile_;
std::string register_;
std::string register_credential_;
std::string surveyor_voting_;
std::string surveyor_voting_credential_;
} // namespace brave_test_resp

class BraveRewardsBrowserTest
Expand Down Expand Up @@ -391,6 +399,30 @@ class BraveRewardsBrowserTest
braveledger_uphold::GetAPIUrl("/v0/me"),
base::CompareCase::INSENSITIVE_ASCII)) {
*response = GetUpholdUser();
} else if (URLMatches(url, WALLET_PROPERTIES, PREFIX_V2,
ServerTypes::LEDGER)) {
GURL gurl(url);
if (gurl.has_query()) {
*response = brave_test_resp::reconcile_;
} else {
*response = brave_test_resp::current_reconcile_;
}

} else if (URLMatches(url, RECONCILE_CONTRIBUTION, PREFIX_V2,
ServerTypes::LEDGER)) {
*response = brave_test_resp::contribution_;
} else if (URLMatches(url, REGISTER_VIEWING, PREFIX_V2,
ServerTypes::LEDGER)) {
if (url.find(REGISTER_VIEWING "/") != std::string::npos)
*response = brave_test_resp::register_credential_;
else
*response = brave_test_resp::register_;
} else if (URLMatches(url, SURVEYOR_BATCH_VOTING, PREFIX_V2,
ServerTypes::LEDGER)) {
if (url.find(SURVEYOR_BATCH_VOTING "/") != std::string::npos)
*response = brave_test_resp::surveyor_voting_credential_;
else
*response = brave_test_resp::surveyor_voting_;
}
}

Expand Down Expand Up @@ -456,6 +488,16 @@ class BraveRewardsBrowserTest
wait_for_multiple_tip_completed_loop_->Run();
}

void WaitForMultipleACReconcileCompleted(int32_t needed) {
multiple_ac_reconcile_needed_ = needed;
if (multiple_ac_reconcile_completed_) {
return;
}

wait_for_multiple_ac_completed_loop_.reset(new base::RunLoop);
wait_for_multiple_ac_completed_loop_->Run();
}

void WaitForInsufficientFundsNotification() {
if (insufficient_notification_would_have_already_shown_) {
return;
Expand Down Expand Up @@ -711,6 +753,26 @@ class BraveRewardsBrowserTest
ASSERT_TRUE(base::ReadFileToString(
path.AppendASCII("uphold_commit_resp.json"),
&brave_test_resp::uphold_commit_resp_));

ASSERT_TRUE(
base::ReadFileToString(path.AppendASCII("contribution_resp.json"),
&brave_test_resp::contribution_));
ASSERT_TRUE(base::ReadFileToString(path.AppendASCII("reconcile_resp.json"),
&brave_test_resp::reconcile_));
ASSERT_TRUE(
base::ReadFileToString(path.AppendASCII("current_reconcile_resp.json"),
&brave_test_resp::current_reconcile_));
ASSERT_TRUE(base::ReadFileToString(path.AppendASCII("register_resp.json"),
&brave_test_resp::register_));
ASSERT_TRUE(base::ReadFileToString(
path.AppendASCII("register_credential_resp.json"),
&brave_test_resp::register_credential_));
ASSERT_TRUE(
base::ReadFileToString(path.AppendASCII("surveyor_voting_resp.json"),
&brave_test_resp::surveyor_voting_));
ASSERT_TRUE(base::ReadFileToString(
path.AppendASCII("surveyor_voting_credential_resp.json"),
&brave_test_resp::surveyor_voting_credential_));
}

void UpdateContributionBalance(double amount, bool verified = false) {
Expand Down Expand Up @@ -1349,6 +1411,17 @@ class BraveRewardsBrowserTest
if (wait_for_ac_completed_loop_) {
wait_for_ac_completed_loop_->Quit();
}

// Multiple ac
multiple_ac_reconcile_count_++;
multiple_ac_reconcile_status_.push_back(converted_result);

if (multiple_ac_reconcile_count_ == multiple_ac_reconcile_needed_) {
multiple_ac_reconcile_completed_ = true;
if (wait_for_multiple_ac_completed_loop_) {
wait_for_multiple_ac_completed_loop_->Quit();
}
}
}

if (converted_type == ledger::RewardsType::ONE_TIME_TIP ||
Expand Down Expand Up @@ -1484,6 +1557,22 @@ class BraveRewardsBrowserTest
UpdateContributionBalance(amount, should_contribute);
}

void SetUpUpholdWallet(
const double balance,
const ledger::WalletStatus status = ledger::WalletStatus::VERIFIED) {
verified_wallet_ = true;
external_balance_ = balance;

auto wallet = ledger::ExternalWallet::New();
wallet->token = "token";
wallet->address = external_wallet_address_;
wallet->status = status;
wallet->one_time_string = "";
wallet->user_name = "Brave Test";
wallet->transferred = true;
rewards_service()->SaveExternalWallet("uphold", std::move(wallet));
}

MOCK_METHOD1(OnGetEnvironment, void(ledger::Environment));
MOCK_METHOD1(OnGetDebug, void(bool));
MOCK_METHOD1(OnGetReconcileTime, void(int32_t));
Expand Down Expand Up @@ -1511,8 +1600,16 @@ class BraveRewardsBrowserTest
bool ac_reconcile_completed_ = false;
ledger::Result ac_reconcile_status_ = ledger::Result::LEDGER_ERROR;
std::unique_ptr<base::RunLoop> wait_for_tip_completed_loop_;

std::unique_ptr<base::RunLoop> wait_for_multiple_ac_completed_loop_;
bool multiple_ac_reconcile_completed_ = false;
int32_t multiple_ac_reconcile_count_ = 0;
int32_t multiple_ac_reconcile_needed_ = 0;
std::vector<ledger::Result> multiple_ac_reconcile_status_;

bool tip_reconcile_completed_ = false;
ledger::Result tip_reconcile_status_ = ledger::Result::LEDGER_ERROR;

std::unique_ptr<base::RunLoop> wait_for_multiple_tip_completed_loop_;
bool multiple_tip_reconcile_completed_ = false;
int32_t multiple_tip_reconcile_count_ = 0;
Expand Down Expand Up @@ -1541,7 +1638,6 @@ class BraveRewardsBrowserTest
double verified_wallet_ = false;
const std::string external_wallet_address_ =
"abe5f454-fedd-4ea9-9203-470ae7315bb3";
bool first_url_ac_called_ = false;
};

IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest, RenderWelcome) {
Expand Down Expand Up @@ -2050,7 +2146,6 @@ IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest, AutoContributeWhenACOff) {

// Trigger contribution process
rewards_service()->StartMonthlyContributionForTest();
ASSERT_FALSE(first_url_ac_called_);
}

// #6 - Tip verified publisher
Expand Down Expand Up @@ -2659,17 +2754,7 @@ IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,

IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
TipWithVerifiedWallet) {
verified_wallet_ = true;
external_balance_ = 50.0;

auto wallet = ledger::ExternalWallet::New();
wallet->token = "token";
wallet->address = external_wallet_address_;
wallet->status = ledger::WalletStatus::VERIFIED;
wallet->one_time_string = "";
wallet->user_name = "Brave Test";
wallet->transferred = true;
rewards_service()->SaveExternalWallet("uphold", std::move(wallet));
SetUpUpholdWallet(50.0);

// Enable Rewards
EnableRewards();
Expand All @@ -2689,17 +2774,7 @@ IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,

IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest,
MultipleTipsProduceMultipleFeesWithVerifiedWallet) {
verified_wallet_ = true;
external_balance_ = 50.0;

auto wallet = ledger::ExternalWallet::New();
wallet->token = "token";
wallet->address = external_wallet_address_;
wallet->status = ledger::WalletStatus::VERIFIED;
wallet->one_time_string = "";
wallet->user_name = "Brave Test";
wallet->transferred = true;
rewards_service()->SaveExternalWallet("uphold", std::move(wallet));
SetUpUpholdWallet(50.0);

// Enable Rewards
EnableRewards();
Expand Down Expand Up @@ -2760,17 +2835,7 @@ IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest, TipConnectedPublisherAnon) {
IN_PROC_BROWSER_TEST_F(
BraveRewardsBrowserTest,
TipConnectedPublisherAnonAndConnected) {
verified_wallet_ = true;
external_balance_ = 50.0;

auto wallet = ledger::ExternalWallet::New();
wallet->token = "token";
wallet->address = external_wallet_address_;
wallet->status = ledger::WalletStatus::CONNECTED;
wallet->one_time_string = "";
wallet->user_name = "Brave Test";
wallet->transferred = true;
rewards_service()->SaveExternalWallet("uphold", std::move(wallet));
SetUpUpholdWallet(50.0);

// Enable Rewards
EnableRewards();
Expand All @@ -2793,17 +2858,7 @@ IN_PROC_BROWSER_TEST_F(
IN_PROC_BROWSER_TEST_F(
BraveRewardsBrowserTest,
TipConnectedPublisherConnected) {
verified_wallet_ = true;
external_balance_ = 50.0;

auto wallet = ledger::ExternalWallet::New();
wallet->token = "token";
wallet->address = external_wallet_address_;
wallet->status = ledger::WalletStatus::CONNECTED;
wallet->one_time_string = "";
wallet->user_name = "Brave Test";
wallet->transferred = true;
rewards_service()->SaveExternalWallet("uphold", std::move(wallet));
SetUpUpholdWallet(50.0, ledger::WalletStatus::CONNECTED);

// Enable Rewards
EnableRewards();
Expand All @@ -2827,17 +2882,7 @@ IN_PROC_BROWSER_TEST_F(
IN_PROC_BROWSER_TEST_F(
BraveRewardsBrowserTest,
TipConnectedPublisherVerified) {
verified_wallet_ = true;
external_balance_ = 50.0;

auto wallet = ledger::ExternalWallet::New();
wallet->token = "token";
wallet->address = external_wallet_address_;
wallet->status = ledger::WalletStatus::VERIFIED;
wallet->one_time_string = "";
wallet->user_name = "Brave Test";
wallet->transferred = true;
rewards_service()->SaveExternalWallet("uphold", std::move(wallet));
SetUpUpholdWallet(50.0);

// Enable Rewards
EnableRewards();
Expand Down Expand Up @@ -3060,3 +3105,47 @@ IN_PROC_BROWSER_TEST_F(BraveRewardsBrowserTest, ShowACPercentInThePanel) {
EXPECT_NE(js_result.ExtractString().find("100%"), std::string::npos);
}
}

IN_PROC_BROWSER_TEST_F(
BraveRewardsBrowserTest,
SplitProcessorAutoContribution) {
SetUpUpholdWallet(50.0);

EnableRewards();

// Claim promotion using panel (30BAT)
const bool use_panel = true;
ClaimPromotion(use_panel);

VisitPublisher("3zsistemi.si", true);

// 30 form unblinded and 20 from uphold
rewards_service()->SetContributionAmount(50.0);

// Trigger contribution process
rewards_service()->StartMonthlyContributionForTest();

// Wait for reconciliation to complete successfully
WaitForMultipleACReconcileCompleted(2);
ASSERT_EQ(multiple_ac_reconcile_status_[0], ledger::Result::LEDGER_OK);
ASSERT_EQ(multiple_ac_reconcile_status_[1], ledger::Result::LEDGER_OK);

// Check monthly report
ASSERT_TRUE(ExecJs(contents(),
"document.querySelector(\"[data-test-id='showMonthlyReport']\").click();",
content::EXECUTE_SCRIPT_DEFAULT_OPTIONS,
content::ISOLATED_WORLD_ID_CONTENT_END));


WaitForSelector(contents(), "#transactionTable");

ASSERT_NE(ElementInnerText("#transactionTable").find("-30.0BAT"),
std::string::npos);

ASSERT_NE(ElementInnerText("#transactionTable").find("-20.0BAT"),
std::string::npos);

// Check that summary table shows the appropriate contribution
ASSERT_NE(ElementInnerText("[color=contribute]").find("-50.0BAT"),
std::string::npos);
}
1 change: 1 addition & 0 deletions components/brave_rewards/resources/ui/components/modalActivity/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ export default class ModalActivity extends React.PureComponent<Props, State> {

return (
<TableTransactions
id={'transactionTable'}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Question: noticed that you're using id here instead of data-test-id. Any particular reason?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

id is prop that is accepted in the component. Would be good to refactor component to set data-test-id like you said

rows={transactionRows}
>
{getLocale('noActivity')}
Expand Down
2 changes: 1 addition & 1 deletion components/brave_rewards/resources/ui/components/walletSummary/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ export default class WalletSummary extends React.PureComponent<Props, {}> {
</div>
{
onActivity
? <StyledActivity onClick={onActivity}>
? <StyledActivity onClick={onActivity} data-test-id={'showMonthlyReport'}>
<StyledActivityIcon>
<WalletInfoIcon />
</StyledActivityIcon>
Expand Down
16 changes: 16 additions & 0 deletions test/data/rewards-data/contribution_resp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"signature":"28a00fb8a4b663b9a6e38e8e712a3df, iay57CDbWSG9Y2z39QVgx0nSSexW4OAWwjQdBuq+EN 4BaXMtejRWXjKZ17aAfWLkj08t8ClSQCXFUo0QPkQvL 1 CdbDycAPfzVRsfT3p3jH8pdyFjuW1cySuu68jcovI0n 3p+RP29bqtPgACqJn98xWhUepfoV1ZQ2o4LfTOyHY9H\n",
"payload":{
"adFree":{
"fee":{
"USD":5
},
"votes":100,
"altcurrency":"BAT",
"probi":"25000000000000000000"
}
},
"surveyorId":"FuznYc8NaAXt+At2S+DdaM/rsEyHWd3vFpLpbCLm/z7",
"surveyVK":"==========ANONLOGIN_VK_BEG==========\n6SWJBmkQXkPm1/0Sge4ezHWVXRCtdbGFwcb5XZnjEH2 O4cvn69IzJiH5znUsFK45e4KNoccd4vHmtaozGQgEj 1\n2MHE1Qepdw64bc69nN58JDslzeI36AHr5VfRQfmB/VC 6xtkMq6YI56oVETjouerencG2CJ4pP1Y0PPEPWAyi84 1\n6belVbSubm7yHJFFD5JIz8BwCUBGzHawZH/ILqiSZGh 6r6Rpi8hGcQWa+regtXCtzx5uJI+BG3dzln6/DuKVGe 1\n9XqLkmga7sBZRBeESqNIs2HlUr71C7VQ13mG1Ias2W mg+JzzbVuJKLYABVE975tWtKT0o7dxJOBk16zUdNhc 1\n8yNeactDzb+RTNHNIrQSsvT00wEDP0cRdMkrD0vQW5A 4tga6SJf+aU3ewRmEa2+azykll3d77VTsfvTCVFbNWb y3h8BC+KIIU54hv02sISKzRpSMN3kam1sFfY6Dp2Xq 31AENnYtE0dGLqMhr0t+pDKx/dPJ1rO4hncDfqfaj2Z 1 0\n===========ANONLOGIN_VK_END==========",
"registrarVK":"==========ANONLOGIN_VK_BEG==========\nx3EmZXFb2jD7OocZz6l7o638S45k2kKrX5BrWp1Ox+ ANJXSauJVPNHKl/mmakFwxbkwJkJzfXe+c9+jxFtuX6 1\n5xMuqWE8J7HIHbW/UEJwFELYjTWRF10x7LMd7s46MVT 4DC6LqGM8zLz1pCsHA3qab48gkpeiQpNZAdb9owFvU6 1\n1tADCD6LdrEDQQDhRy1ijjAfhV9uKwlKKuhD6xXyPAZ BLOzUy+ZZh48riPnAHnUGal+ceCclccZXmoXXx92WHW 1\n7VRDst4U4iaT/9QNCwajEaqgRNtKPV1Dp5QuMjP019h HucbxBMGGAZBNLXGzfKsTlF+wAdmOFAvBRAo8i2Azd 1\n5SLk8SphICEkF+CNhN5g7IX2ih+Tb6w14LLlwupKw7y 96ANsdHzg0pwo2DDWOyAh1YPnION196pIT9xwISFZTA 3ef5G5d2c8cctdK4LuaxlSeEf1OZ100Sy5un5EjuHJB 77yFnY61GM7PHd6q3TLs2QS6c9PfrXD2idxaFq2DMd 1 0\n===========ANONLOGIN_VK_END=========="
}
5 changes: 5 additions & 0 deletions test/data/rewards-data/current_reconcile_resp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"paymentStamp":1551325017004,
"probi":"1000000000000000000",
"altcurrency":"BAT"
}
Loading