Skip to content

GitLab

T
tangled
Commit 19ec1910 authored by miguelg's avatar miguelg Committed by Commit bot
Browse files
Options

Swap hasPermission with permissionState in browser_tests 

BUG=479246

Review URL: https://codereview.chromium.org/1093923005

Cr-Commit-Position: refs/heads/master@{#327036}
parent cc7c635f
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
chrome/browser/push_messaging/push_messaging_browsertest.cc
View file @ 19ec1910
...@@ -561,22 +561,22 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, ...@@ -561,22 +561,22 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
notification_manager()->GetNotificationAt(0).tag()); notification_manager()->GetNotificationAt(0).tag());
// Verify that the renderer process hasn't crashed. // Verify that the renderer process hasn't crashed.
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - granted", script_result); EXPECT_EQ("permission status - granted", script_result);
} }
#endif #endif
IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, HasPermissionSaysDefault) { IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, PermissionStateSaysDefault) {
std::string script_result; std::string script_result;
ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result)); ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
ASSERT_EQ("ok - service worker registered", script_result); ASSERT_EQ("ok - service worker registered", script_result);
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
ASSERT_EQ("permission status - default", script_result); ASSERT_EQ("permission status - default", script_result);
} }
IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, HasPermissionSaysGranted) { IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, PermissionStateSaysGranted) {
std::string script_result; std::string script_result;
ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result)); ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
...@@ -589,11 +589,11 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, HasPermissionSaysGranted) { ...@@ -589,11 +589,11 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, HasPermissionSaysGranted) {
ASSERT_TRUE(RunScript("subscribePush()", &script_result)); ASSERT_TRUE(RunScript("subscribePush()", &script_result));
EXPECT_EQ(std::string(kPushMessagingEndpoint) + " - 1-0", script_result); EXPECT_EQ(std::string(kPushMessagingEndpoint) + " - 1-0", script_result);
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - granted", script_result); EXPECT_EQ("permission status - granted", script_result);
} }
IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, HasPermissionSaysDenied) { IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, PermissionStateSaysDenied) {
std::string script_result; std::string script_result;
ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result)); ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
...@@ -607,7 +607,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, HasPermissionSaysDenied) { ...@@ -607,7 +607,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, HasPermissionSaysDenied) {
EXPECT_EQ("AbortError - Registration failed - permission denied", EXPECT_EQ("AbortError - Registration failed - permission denied",
script_result); script_result);
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - denied", script_result); EXPECT_EQ("permission status - denied", script_result);
} }
...@@ -662,7 +662,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, ...@@ -662,7 +662,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
EXPECT_EQ("true - subscribed", script_result); EXPECT_EQ("true - subscribed", script_result);
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - granted", script_result); EXPECT_EQ("permission status - granted", script_result);
scoped_refptr<content::MessageLoopRunner> message_loop_runner = scoped_refptr<content::MessageLoopRunner> message_loop_runner =
...@@ -675,7 +675,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, ...@@ -675,7 +675,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
message_loop_runner->Run(); message_loop_runner->Run();
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - default", script_result); EXPECT_EQ("permission status - default", script_result);
ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
...@@ -691,7 +691,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, ...@@ -691,7 +691,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
EXPECT_EQ("true - subscribed", script_result); EXPECT_EQ("true - subscribed", script_result);
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - granted", script_result); EXPECT_EQ("permission status - granted", script_result);
scoped_refptr<content::MessageLoopRunner> message_loop_runner = scoped_refptr<content::MessageLoopRunner> message_loop_runner =
...@@ -709,7 +709,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, ...@@ -709,7 +709,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
message_loop_runner->Run(); message_loop_runner->Run();
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - default", script_result); EXPECT_EQ("permission status - default", script_result);
ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
...@@ -725,7 +725,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, ...@@ -725,7 +725,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
EXPECT_EQ("true - subscribed", script_result); EXPECT_EQ("true - subscribed", script_result);
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - granted", script_result); EXPECT_EQ("permission status - granted", script_result);
scoped_refptr<content::MessageLoopRunner> message_loop_runner = scoped_refptr<content::MessageLoopRunner> message_loop_runner =
...@@ -743,7 +743,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, ...@@ -743,7 +743,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
message_loop_runner->Run(); message_loop_runner->Run();
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - denied", script_result); EXPECT_EQ("permission status - denied", script_result);
ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
...@@ -759,7 +759,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, ...@@ -759,7 +759,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
EXPECT_EQ("true - subscribed", script_result); EXPECT_EQ("true - subscribed", script_result);
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - granted", script_result); EXPECT_EQ("permission status - granted", script_result);
scoped_refptr<content::MessageLoopRunner> message_loop_runner = scoped_refptr<content::MessageLoopRunner> message_loop_runner =
...@@ -772,7 +772,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, ...@@ -772,7 +772,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
message_loop_runner->Run(); message_loop_runner->Run();
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - default", script_result); EXPECT_EQ("permission status - default", script_result);
ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
...@@ -788,7 +788,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, ...@@ -788,7 +788,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
EXPECT_EQ("true - subscribed", script_result); EXPECT_EQ("true - subscribed", script_result);
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - granted", script_result); EXPECT_EQ("permission status - granted", script_result);
scoped_refptr<content::MessageLoopRunner> message_loop_runner = scoped_refptr<content::MessageLoopRunner> message_loop_runner =
...@@ -806,7 +806,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, ...@@ -806,7 +806,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
message_loop_runner->Run(); message_loop_runner->Run();
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - default", script_result); EXPECT_EQ("permission status - default", script_result);
ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
...@@ -822,7 +822,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, ...@@ -822,7 +822,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
EXPECT_EQ("true - subscribed", script_result); EXPECT_EQ("true - subscribed", script_result);
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - granted", script_result); EXPECT_EQ("permission status - granted", script_result);
scoped_refptr<content::MessageLoopRunner> message_loop_runner = scoped_refptr<content::MessageLoopRunner> message_loop_runner =
...@@ -840,7 +840,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, ...@@ -840,7 +840,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
message_loop_runner->Run(); message_loop_runner->Run();
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - denied", script_result); EXPECT_EQ("permission status - denied", script_result);
ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
...@@ -856,7 +856,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, ...@@ -856,7 +856,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
EXPECT_EQ("true - subscribed", script_result); EXPECT_EQ("true - subscribed", script_result);
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - granted", script_result); EXPECT_EQ("permission status - granted", script_result);
scoped_refptr<content::MessageLoopRunner> message_loop_runner = scoped_refptr<content::MessageLoopRunner> message_loop_runner =
...@@ -880,7 +880,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, ...@@ -880,7 +880,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
message_loop_runner->Run(); message_loop_runner->Run();
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - granted", script_result); EXPECT_EQ("permission status - granted", script_result);
ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
...@@ -900,7 +900,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, ...@@ -900,7 +900,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
EXPECT_EQ("true - subscribed", script_result); EXPECT_EQ("true - subscribed", script_result);
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - granted", script_result); EXPECT_EQ("permission status - granted", script_result);
scoped_refptr<content::MessageLoopRunner> message_loop_runner = scoped_refptr<content::MessageLoopRunner> message_loop_runner =
...@@ -941,7 +941,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, ...@@ -941,7 +941,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
// The Push service should not unsubcribe |origin| because at no point it was // The Push service should not unsubcribe |origin| because at no point it was
// left without permission to use Push. // left without permission to use Push.
ASSERT_TRUE(RunScript("hasPermission()", &script_result)); ASSERT_TRUE(RunScript("permissionState()", &script_result));
EXPECT_EQ("permission status - granted", script_result); EXPECT_EQ("permission status - granted", script_result);
ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); ASSERT_TRUE(RunScript("hasSubscription()", &script_result));
......
chrome/test/data/push_messaging/push_test.js
View file @ 19ec1910
...@@ -103,9 +103,9 @@ function subscribePush() { ...@@ -103,9 +103,9 @@ function subscribePush() {
}).catch(sendErrorToTest); }).catch(sendErrorToTest);
} }
function hasPermission() { function permissionState() {
navigator.serviceWorker.ready.then(function(swRegistration) { navigator.serviceWorker.ready.then(function(swRegistration) {
return swRegistration.pushManager.hasPermission() return swRegistration.pushManager.permissionState()
.then(function(permission) { .then(function(permission) {
sendResultToTest('permission status - ' + permission); sendResultToTest('permission status - ' + permission);
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment