Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor existing tests

Browse Source
This commit is contained in:
Francois Marier
2020-05-13 17:31:36 -07:00
parent d34d7d9cf4
commit 9580f41483
1 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderer/brave_content_settings_agent_impl_browsertest.cc
+61 -55
View File
@@ -89,8 +89,9 @@ class BraveContentSettingsAgentImplBrowserTest : public InProcessBrowserTest {
ASSERT_TRUE(embedded_test_server()->Start());
url_ = embedded_test_server()->GetURL("a.com", "/iframe.html");
iframe_url_ = embedded_test_server()->GetURL("b.com", "/simple.html");
image_url_ = embedded_test_server()->GetURL("b.com", "/logo.png");
cross_site_url_ = embedded_test_server()->GetURL("b.com", "/simple.html");
cross_site_image_url_ =
embedded_test_server()->GetURL("b.com", "/logo.png");
top_level_page_url_ = embedded_test_server()->GetURL("a.com", "/");
top_level_page_pattern_ =
ContentSettingsPattern::FromString("http://a.com/*");
@@ -136,17 +137,17 @@ class BraveContentSettingsAgentImplBrowserTest : public InProcessBrowserTest {
}
const GURL& url() { return url_; }
const GURL& iframe_url() { return iframe_url_; }
const GURL& image_url() { return image_url_; }
const GURL& cross_site_url() { return cross_site_url_; }
const GURL& cross_site_image_url() { return cross_site_image_url_; }
std::string create_image_script() {
std::string create_image_script(const GURL& url) {
std::string s;
s = " var img = document.createElement('img');"
" img.onload = function () {"
" domAutomationController.send(img.src);"
" };"
" img.src = '" +
image_url().spec() +
url.spec() +
"';"
" document.body.appendChild(img);";
return s;
@@ -228,7 +229,8 @@ class BraveContentSettingsAgentImplBrowserTest : public InProcessBrowserTest {
void BlockThirdPartyFingerprinting() {
brave_shields::SetFingerprintingControlType(browser()->profile(),
ControlType::BLOCK_THIRD_PARTY, top_level_page_url());
ControlType::BLOCK_THIRD_PARTY,
top_level_page_url());
}
void SetFingerprintingDefault() {
@@ -275,9 +277,9 @@ class BraveContentSettingsAgentImplBrowserTest : public InProcessBrowserTest {
embedded_test_server()->GetURL(origin, path));
}
void NavigateIframe() {
ASSERT_TRUE(NavigateIframeToURL(contents(), kIframeID, iframe_url()));
ASSERT_EQ(child_frame()->GetLastCommittedURL(), iframe_url());
void NavigateIframe(const GURL& url) {
ASSERT_TRUE(NavigateIframeToURL(contents(), kIframeID, url));
ASSERT_EQ(child_frame()->GetLastCommittedURL(), url);
}
template <typename T>
@@ -287,8 +289,8 @@ class BraveContentSettingsAgentImplBrowserTest : public InProcessBrowserTest {
private:
GURL url_;
GURL iframe_url_;
GURL image_url_;
GURL cross_site_url_;
GURL cross_site_image_url_;
GURL top_level_page_url_;
ContentSettingsPattern top_level_page_pattern_;
ContentSettingsPattern first_party_pattern_;
@@ -321,7 +323,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
// The iframe should have the same result as the top frame because farbling is
// based on the top frame's session token.
hash = -1;
NavigateIframe();
NavigateIframe(cross_site_url());
EXPECT_TRUE(
ExecuteScriptAndExtractInt(child_frame(), kGetImageDataScript, &hash));
EXPECT_EQ(kExpectedImageDataHashFarblingBalanced, hash);
@@ -427,17 +429,19 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
EXPECT_EQ(ExecScriptGetStr(kReferrerScript, contents()), "");
EXPECT_TRUE(GetLastReferrer(url()).empty());
// Sub-resources loaded within the page get their referrer spoofed.
EXPECT_EQ(ExecScriptGetStr(create_image_script(), contents()),
image_url().spec());
EXPECT_EQ(GetLastReferrer(image_url()), iframe_url().GetOrigin().spec());
// Cross-origin iframe navigations get their referrer spoofed.
NavigateIframe();
// Cross-site sub-resources within the page get their referrer spoofed.
EXPECT_EQ(
ExecScriptGetStr(create_image_script(cross_site_image_url()), contents()),
cross_site_image_url().spec());
EXPECT_EQ(GetLastReferrer(cross_site_image_url()),
cross_site_url().GetOrigin().spec());
// Cross-site iframe navigations get their referrer spoofed.
NavigateIframe(cross_site_url());
EXPECT_EQ(ExecScriptGetStr(kReferrerScript, child_frame()),
iframe_url().GetOrigin().spec());
EXPECT_EQ(GetLastReferrer(iframe_url()), iframe_url().GetOrigin().spec());
cross_site_url().GetOrigin().spec());
EXPECT_EQ(GetLastReferrer(cross_site_url()),
cross_site_url().GetOrigin().spec());
}
IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
@@ -449,17 +453,19 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
EXPECT_EQ(ExecScriptGetStr(kReferrerScript, contents()), "");
EXPECT_TRUE(GetLastReferrer(url()).empty());
// Sub-resources loaded within the page get their referrer spoofed.
EXPECT_EQ(ExecScriptGetStr(create_image_script(), contents()),
image_url().spec());
EXPECT_EQ(GetLastReferrer(image_url()), image_url().GetOrigin().spec());
// Cross-origin iframe navigations get their referrer spoofed.
NavigateIframe();
// Cross-site sub-resources within the page get their referrer spoofed.
EXPECT_EQ(
ExecScriptGetStr(create_image_script(cross_site_image_url()), contents()),
cross_site_image_url().spec());
EXPECT_EQ(GetLastReferrer(cross_site_image_url()),
cross_site_image_url().GetOrigin().spec());
// Cross-site iframe navigations get their referrer spoofed.
NavigateIframe(cross_site_url());
EXPECT_EQ(ExecScriptGetStr(kReferrerScript, child_frame()),
iframe_url().GetOrigin().spec());
EXPECT_EQ(GetLastReferrer(iframe_url()), iframe_url().GetOrigin().spec());
cross_site_url().GetOrigin().spec());
EXPECT_EQ(GetLastReferrer(cross_site_url()),
cross_site_url().GetOrigin().spec());
}
IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
@@ -471,16 +477,16 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
EXPECT_EQ(ExecScriptGetStr(kReferrerScript, contents()), "");
EXPECT_TRUE(GetLastReferrer(url()).empty());
// Sub-resources loaded within the page get the page URL as referrer.
EXPECT_EQ(ExecScriptGetStr(create_image_script(), contents()),
image_url().spec());
EXPECT_EQ(GetLastReferrer(image_url()), url().spec());
// Cross-site sub-resources within the page get the page URL as referrer.
EXPECT_EQ(
ExecScriptGetStr(create_image_script(cross_site_image_url()), contents()),
cross_site_image_url().spec());
EXPECT_EQ(GetLastReferrer(cross_site_image_url()), url().spec());
// A cross-origin iframe navigation gets the URL of the first one as
// A cross-site iframe navigation gets the URL of the first one as
// referrer.
NavigateIframe();
EXPECT_EQ(GetLastReferrer(iframe_url()), url());
NavigateIframe(cross_site_url());
EXPECT_EQ(GetLastReferrer(cross_site_url()), url());
EXPECT_EQ(ExecScriptGetStr(kReferrerScript, child_frame()), url().spec());
}
@@ -494,16 +500,16 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
EXPECT_EQ(ExecScriptGetStr(kReferrerScript, contents()), "");
EXPECT_TRUE(GetLastReferrer(url()).empty());
// Sub-resources loaded within the page get the page URL as referrer.
EXPECT_EQ(ExecScriptGetStr(create_image_script(), contents()),
image_url().spec());
EXPECT_EQ(GetLastReferrer(image_url()), url().spec());
// Cross-site sub-resources within the page get the page URL as referrer.
EXPECT_EQ(
ExecScriptGetStr(create_image_script(cross_site_image_url()), contents()),
cross_site_image_url().spec());
EXPECT_EQ(GetLastReferrer(cross_site_image_url()), url().spec());
// A cross-origin iframe navigation gets the URL of the first one as
// referrer.
NavigateIframe();
EXPECT_EQ(GetLastReferrer(iframe_url()), url());
NavigateIframe(cross_site_url());
EXPECT_EQ(GetLastReferrer(cross_site_url()), url());
EXPECT_EQ(ExecScriptGetStr(kReferrerScript, child_frame()), url().spec());
}
@@ -512,7 +518,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
NavigateToPageWithIframe();
CheckCookie(child_frame(), kTestCookie);
NavigateIframe();
NavigateIframe(cross_site_url());
CheckCookie(child_frame(), kEmptyCookie);
}
@@ -523,7 +529,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
NavigateToPageWithIframe();
CheckCookie(child_frame(), kTestCookie);
NavigateIframe();
NavigateIframe(cross_site_url());
CheckCookie(child_frame(), kEmptyCookie);
}
@@ -533,7 +539,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest, BlockCookies) {
NavigateToPageWithIframe();
CheckCookie(contents(), kEmptyCookie);
NavigateIframe();
NavigateIframe(cross_site_url());
CheckCookie(child_frame(), kEmptyCookie);
}
@@ -543,7 +549,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest, AllowCookies) {
NavigateToPageWithIframe();
CheckCookie(contents(), kTestCookie);
NavigateIframe();
NavigateIframe(cross_site_url());
CheckCookie(child_frame(), kTestCookie);
}
@@ -559,7 +565,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
NavigateToPageWithIframe();
CheckCookie(contents(), kEmptyCookie);
NavigateIframe();
NavigateIframe(cross_site_url());
CheckCookie(child_frame(), kTestCookie);
}
@@ -575,7 +581,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
NavigateToPageWithIframe();
CheckCookie(contents(), kTestCookie);
NavigateIframe();
NavigateIframe(cross_site_url());
CheckCookie(child_frame(), kEmptyCookie);
}
@@ -587,7 +593,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
NavigateToPageWithIframe();
CheckCookie(contents(), kTestCookie);
NavigateIframe();
NavigateIframe(cross_site_url());
CheckCookie(child_frame(), kTestCookie);
}
@@ -598,7 +604,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
NavigateToPageWithIframe();
CheckCookie(contents(), kTestCookie);
NavigateIframe();
NavigateIframe(cross_site_url());
CheckCookie(child_frame(), kTestCookie);
}
@@ -610,7 +616,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentSettingsAgentImplBrowserTest,
NavigateToPageWithIframe();
CheckCookie(contents(), kEmptyCookie);
NavigateIframe();
NavigateIframe(cross_site_url());
CheckCookie(child_frame(), kEmptyCookie);
}