Reset allowed/blocked URLs between specs
* Prevents duplicates when using `before(:each)` * Consistent with other settings
This commit is contained in:
parent
3804dd5406
commit
4491ba80ae
|
@ -50,3 +50,7 @@ bool BlacklistedRequestHandler::isBlacklisted(QUrl url) {
|
||||||
void BlacklistedRequestHandler::blockUrl(const QString &url) {
|
void BlacklistedRequestHandler::blockUrl(const QString &url) {
|
||||||
m_urlBlacklist.append(url);
|
m_urlBlacklist.append(url);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void BlacklistedRequestHandler::reset() {
|
||||||
|
m_urlBlacklist.clear();
|
||||||
|
}
|
||||||
|
|
|
@ -13,6 +13,7 @@ class BlacklistedRequestHandler : public RequestHandler {
|
||||||
);
|
);
|
||||||
void setUrlBlacklist(QStringList urlBlacklist);
|
void setUrlBlacklist(QStringList urlBlacklist);
|
||||||
void blockUrl(const QString &);
|
void blockUrl(const QString &);
|
||||||
|
void reset();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
RequestHandler *m_next;
|
RequestHandler *m_next;
|
||||||
|
|
|
@ -62,3 +62,7 @@ bool UnknownUrlHandler::isUnknown(QUrl url) {
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void UnknownUrlHandler::reset() {
|
||||||
|
m_allowedUrls.clear();
|
||||||
|
}
|
||||||
|
|
|
@ -16,6 +16,7 @@ class UnknownUrlHandler : public RequestHandler {
|
||||||
);
|
);
|
||||||
void allowUrl(const QString &);
|
void allowUrl(const QString &);
|
||||||
void setMode(Mode);
|
void setMode(Mode);
|
||||||
|
void reset();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QStringList m_allowedUrls;
|
QStringList m_allowedUrls;
|
||||||
|
|
|
@ -138,6 +138,8 @@ void WebPageManager::reset() {
|
||||||
m_networkAccessManager->reset();
|
m_networkAccessManager->reset();
|
||||||
m_customHeadersRequestHandler->reset();
|
m_customHeadersRequestHandler->reset();
|
||||||
m_currentPage->resetLocalStorage();
|
m_currentPage->resetLocalStorage();
|
||||||
|
m_blacklistedRequestHandler->reset();
|
||||||
|
m_unknownUrlHandler->reset();
|
||||||
while (!m_pages.isEmpty()) {
|
while (!m_pages.isEmpty()) {
|
||||||
WebPage *page = m_pages.takeFirst();
|
WebPage *page = m_pages.takeFirst();
|
||||||
page->deleteLater();
|
page->deleteLater();
|
||||||
|
|
Loading…
Reference in New Issue