Skip to content
Snippets Groups Projects
Commit cae98b7d authored by Kateryna Kostiuk's avatar Kateryna Kostiuk Committed by Sébastien Blin
Browse files

invitations: do not count banned contacts


Exclude banned contacts from total number of pending invitations.

Change-Id: I62a58de8b499719e5c9dd31f1df84c57ed2c023b
Reviewed-by: default avatarSebastien Blin <sebastien.blin@savoirfairelinux.com>
parent 9b66899b
No related branches found
No related tags found
No related merge requests found
......@@ -181,6 +181,7 @@ ContactModel::pendingRequestCount() const
int pendingRequestCount = 0;
auto i = std::for_each(pimpl_->contacts.begin(), pimpl_->contacts.end(),
[&pendingRequestCount] (const auto& c) {
if (!c.second.isBanned)
pendingRequestCount += static_cast<int>(c.second.profileInfo.type == profile::Type::PENDING);
});
return pendingRequestCount;
......
......@@ -237,6 +237,17 @@ ContactModelTester::testCountPendingRequests()
CPPUNIT_ASSERT_EQUAL(accInfo_.contactModel->pendingRequestCount(), 1);
}
void
ContactModelTester::testCountPendingRequestsWithBlockedContact()
{
CPPUNIT_ASSERT(accInfo_.contactModel->hasPendingRequests());
CPPUNIT_ASSERT_EQUAL(accInfo_.contactModel->pendingRequestCount(), 1);
CPPUNIT_ASSERT_NO_THROW(accInfo_.contactModel->getContact("pending0"));
accInfo_.contactModel->removeContact("pending0", true);
CPPUNIT_ASSERT(!accInfo_.contactModel->hasPendingRequests());
CPPUNIT_ASSERT_EQUAL(accInfo_.contactModel->pendingRequestCount(), 0);
}
void
ContactModelTester::tearDown()
{
......
......@@ -112,6 +112,10 @@ public:
* Count contact requests
*/
void testCountPendingRequests();
/**
* Count contact requests when banned contacts exists
*/
void testCountPendingRequestsWithBlockedContact();
/**
* Method automatically called after each test by CppUnit
*/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment