notifications: Rename/consolidate settings

2 files changed, 15 insertions, 15 deletions

diff --git a/tests/end2end/features/notifications.feature b/tests/end2end/features/notifications.feature
index 829bd9464..480bab4ad 100644
--- a/tests/end2end/features/notifications.feature
+++ b/tests/end2end/features/notifications.feature
@@ -5,7 +5,7 @@ Feature: Notifications
 
     Background:
         When I open data/javascript/notifications.html
-        And I set content.notifications to true
+        And I set content.notifications.enabled to true
         And I run :click-element id button
 
     Scenario: Notification is shown
diff --git a/tests/end2end/features/prompts.feature b/tests/end2end/features/prompts.feature
index 2bbef829b..028f1a7b9 100644
--- a/tests/end2end/features/prompts.feature
+++ b/tests/end2end/features/prompts.feature
@@ -84,7 +84,7 @@ Feature: Prompts
     Scenario: Blocking question interrupted by async one
         Given I have a fresh instance
         When I set content.javascript.alert to true
-        And I set content.notifications to ask
+        And I set content.notifications.enabled to ask
         And I open data/prompt/jsalert.html
         And I run :click-element id button
         And I wait for a prompt
@@ -101,7 +101,7 @@ Feature: Prompts
     @qtwebengine_notifications
     Scenario: Async question interrupted by async one
         Given I have a fresh instance
-        When I set content.notifications to ask
+        When I set content.notifications.enabled to ask
         And I open data/prompt/notifications.html in a new tab
         And I run :click-element id button
         And I wait for a prompt
@@ -117,7 +117,7 @@ Feature: Prompts
     @qtwebengine_notifications
     Scenario: Async question interrupted by blocking one
         Given I have a fresh instance
-        When I set content.notifications to ask
+        When I set content.notifications.enabled to ask
         And I set content.javascript.alert to true
         And I open data/prompt/notifications.html in a new tab
         And I run :click-element id button
@@ -278,7 +278,7 @@ Feature: Prompts
     @qtwebengine_notifications
     Scenario: Always rejecting notifications
         Given I have a fresh instance
-        When I set content.notifications to false
+        When I set content.notifications.enabled to false
         And I open data/prompt/notifications.html in a new tab
         And I run :click-element id button
         Then the javascript message "notification permission denied" should be logged
@@ -286,7 +286,7 @@ Feature: Prompts
     @qtwebengine_notifications
     Scenario: Always accepting notifications
         Given I have a fresh instance
-        When I set content.notifications to true
+        When I set content.notifications.enabled to true
         And I open data/prompt/notifications.html in a new tab
         And I run :click-element id button
         Then the javascript message "notification permission granted" should be logged
@@ -294,7 +294,7 @@ Feature: Prompts
     @qtwebengine_notifications
     Scenario: notifications with ask -> false
         Given I have a fresh instance
-        When I set content.notifications to ask
+        When I set content.notifications.enabled to ask
         And I open data/prompt/notifications.html in a new tab
         And I run :click-element id button
         And I wait for a prompt
@@ -304,18 +304,18 @@ Feature: Prompts
     @qtwebengine_notifications
     Scenario: notifications with ask -> false and save
         Given I have a fresh instance
-        When I set content.notifications to ask
+        When I set content.notifications.enabled to ask
         And I open data/prompt/notifications.html in a new tab
         And I run :click-element id button
         And I wait for a prompt
         And I run :prompt-accept --save no
         Then the javascript message "notification permission denied" should be logged
-        And the per-domain option content.notifications should be set to false for http://localhost:(port)
+        And the per-domain option content.notifications.enabled should be set to false for http://localhost:(port)
 
     @qtwebengine_notifications
     Scenario: notifications with ask -> true
         Given I have a fresh instance
-        When I set content.notifications to ask
+        When I set content.notifications.enabled to ask
         And I open data/prompt/notifications.html in a new tab
         And I run :click-element id button
         And I wait for a prompt
@@ -325,19 +325,19 @@ Feature: Prompts
     @qtwebengine_notifications
     Scenario: notifications with ask -> true and save
         Given I have a fresh instance
-        When I set content.notifications to ask
+        When I set content.notifications.enabled to ask
         And I open data/prompt/notifications.html in a new tab
         And I run :click-element id button
         And I wait for a prompt
         And I run :prompt-accept --save yes
         Then the javascript message "notification permission granted" should be logged
-        And the per-domain option content.notifications should be set to true for http://localhost:(port)
+        And the per-domain option content.notifications.enabled should be set to true for http://localhost:(port)
 
     # This actually gives us a denied rather than an aborted
     @xfail_norun
     Scenario: notifications with ask -> abort
         Given I have a fresh instance
-        When I set content.notifications to ask
+        When I set content.notifications.enabled to ask
         And I open data/prompt/notifications.html in a new tab
         And I run :click-element id button
         And I wait for a prompt
@@ -347,7 +347,7 @@ Feature: Prompts
     @qtwebengine_notifications
     Scenario: answering notification after closing tab
         Given I have a fresh instance
-        When I set content.notifications to ask
+        When I set content.notifications.enabled to ask
         And I open data/prompt/notifications.html in a new tab
         And I run :click-element id button
         And I wait for a prompt
@@ -521,7 +521,7 @@ Feature: Prompts
     @qtwebengine_notifications
     Scenario: Interrupting SSL prompt during a notification prompt
         Given I have a fresh instance
-        When I set content.notifications to ask
+        When I set content.notifications.enabled to ask
         And I set content.tls.certificate_errors to ask
         And I open data/prompt/notifications.html in a new tab
         And I run :click-element id button