From d9f1c4595eaea394050ddb86cde66740292a710e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 19 Jun 2017 13:35:38 +0200
Subject: [PATCH] Make "the option ... should be set to ..." unambiguous

Otherwise, it'd collide with the cookie check.
---
 tests/end2end/features/completion.feature |  2 +-
 tests/end2end/features/conftest.py        |  2 +-
 tests/end2end/features/set.feature        | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/end2end/features/completion.feature b/tests/end2end/features/completion.feature
index c6dca3906..84dd50ce3 100644
--- a/tests/end2end/features/completion.feature
+++ b/tests/end2end/features/completion.feature
@@ -98,7 +98,7 @@ Feature: Using completion
     #     And I run :completion-item-focus next
     #     And I set colors.statusbar.normal.bg to red
     #     And I run :command-accept
-    #     Then colors.statusbar.normal.bg should be set to yellow
+    #     Then the option colors.statusbar.normal.bg should be set to yellow
 
     Scenario: Deleting an open tab via the completion
         Given I have a fresh instance
diff --git a/tests/end2end/features/conftest.py b/tests/end2end/features/conftest.py
index 6988ef130..0b8e309c8 100644
--- a/tests/end2end/features/conftest.py
+++ b/tests/end2end/features/conftest.py
@@ -631,7 +631,7 @@ def check_not_scrolled(request, quteproc):
     assert y == 0
 
 
-@bdd.then(bdd.parsers.parse("{option} should be set to {value}"))
+@bdd.then(bdd.parsers.parse("the option {option} should be set to {value}"))
 def check_option(quteproc, option, value):
     actual_value = quteproc.get_setting(option)
     assert actual_value == value
diff --git a/tests/end2end/features/set.feature b/tests/end2end/features/set.feature
index bc7111267..e9ae8a11b 100644
--- a/tests/end2end/features/set.feature
+++ b/tests/end2end/features/set.feature
@@ -7,7 +7,7 @@ Feature: Setting settings.
 
     Scenario: Using :set
         When I run :set colors.statusbar.normal.bg magenta
-        Then colors.statusbar.normal.bg should be set to magenta
+        Then the option colors.statusbar.normal.bg should be set to magenta
 
     Scenario: Without value
         When I run :set colors.statusbar.normal.bg
@@ -20,7 +20,7 @@ Feature: Setting settings.
     Scenario: Toggling an option
         When I run :set auto_save.config false
         And I run :set auto_save.config!
-        Then auto_save.config should be set to true
+        Then the option auto_save.config should be set to true
 
     Scenario: Toggling a non-bool option
         When I run :set colors.statusbar.normal.bg!
@@ -29,22 +29,22 @@ Feature: Setting settings.
     Scenario: Cycling an option
         When I run :set colors.statusbar.normal.bg magenta
         And I run :set colors.statusbar.normal.bg green magenta blue yellow
-        Then colors.statusbar.normal.bg should be set to blue
+        Then the option colors.statusbar.normal.bg should be set to blue
 
     Scenario: Cycling an option through the end of the list
         When I run :set colors.statusbar.normal.bg yellow
         And I run :set colors.statusbar.normal.bg green magenta blue yellow
-        Then colors.statusbar.normal.bg should be set to green
+        Then the option colors.statusbar.normal.bg should be set to green
 
     Scenario: Cycling an option that's not on the list
         When I run :set colors.statusbar.normal.bg red
         And I run :set colors.statusbar.normal.bg green magenta blue yellow
-        Then colors.statusbar.normal.bg should be set to green
+        Then the option colors.statusbar.normal.bg should be set to green
 
     Scenario: Cycling through a single option
         When I run :set colors.statusbar.normal.bg red
         And I run :set colors.statusbar.normal.bg red
-        Then colors.statusbar.normal.bg should be set to red
+        Then the option colors.statusbar.normal.bg should be set to red
 
     Scenario: Getting an option
         When I run :set colors.statusbar.normal.bg magenta
@@ -68,7 +68,7 @@ Feature: Setting settings.
         # We don't actually check if the option is temporary as this isn't easy
         # to check.
         When I run :set -t colors.statusbar.normal.bg green
-        Then colors.statusbar.normal.bg should be set to green
+        Then the option colors.statusbar.normal.bg should be set to green
 
     # qute://settings isn't actually implemented on QtWebEngine, but this works
     # (and displays a page saying it's not available)
@@ -90,7 +90,7 @@ Feature: Setting settings.
         And I press the key "<Escape>"
         # an explicit Tab to unfocus the input field seems to stabilize the tests
         And I press the key "<Tab>"
-        Then ignore_case should be set to always
+        Then the option ignore_case should be set to always
 
     Scenario: Focusing input fields in qute://settings and entering invalid value
         When I open qute://settings