From f4260a6e55ad78d333c55c7f19c25620d8a2e2fa Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Thu, 5 Dec 2024 16:13:43 +0100
Subject: [PATCH] pytest-bdd 8: Fix comments and remaining syntax issues

Looks like inline comments are not permitted anymore.
---
 tests/end2end/features/backforward.feature   | 2 +-
 tests/end2end/features/notifications.feature | 6 ++++--
 tests/end2end/features/search.feature        | 3 ++-
 tests/end2end/features/yankpaste.feature     | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/end2end/features/backforward.feature b/tests/end2end/features/backforward.feature
index 1121210da..8981e8777 100644
--- a/tests/end2end/features/backforward.feature
+++ b/tests/end2end/features/backforward.feature
@@ -50,7 +50,7 @@ Feature: Going back and forward.
         When I run :tab-only
         And I run :back -t
         Then the error "At beginning of history." should be shown
-        Then the session should look like:
+        And the session should look like:
             """
                 windows:
                 - tabs:
diff --git a/tests/end2end/features/notifications.feature b/tests/end2end/features/notifications.feature
index 498f2d72c..5f6e493a7 100644
--- a/tests/end2end/features/notifications.feature
+++ b/tests/end2end/features/notifications.feature
@@ -12,7 +12,8 @@ Feature: Notifications
         When I run :click-element id show-button
         Then the javascript message "notification shown" should be logged
         And 1 notification should be presented
-        And the notification should have image dimensions 64x64  # qutebrowser logo
+        # qutebrowser logo
+        And the notification should have image dimensions 64x64
 
     Scenario: Notification containing escaped characters
         Given the notification server supports body markup
@@ -90,7 +91,8 @@ Feature: Notifications
         And the javascript message "i=3 notification shown" should be logged
         And "Ignoring notification tag 'counter' due to PyQt bug" should be logged
         And 3 notifications should be presented
-        And the notification should have title "i=3"  # last one
+        # last one
+        And the notification should have title "i=3"
 
     @pyqtwebengine>=5.15.0
     Scenario: User closes presented notification
diff --git a/tests/end2end/features/search.feature b/tests/end2end/features/search.feature
index 48a013b25..8b9dbada3 100644
--- a/tests/end2end/features/search.feature
+++ b/tests/end2end/features/search.feature
@@ -113,7 +113,8 @@ Feature: Searching on a page
         When I set search.ignore_case to smart
         And I run :search Foo
         And I wait for "search found Foo with flags FindCaseSensitively" in the log
-        Then "Foo" should be found  # even though foo was first
+        # even though foo was first
+        Then "Foo" should be found
 
     ## :search-next
 
diff --git a/tests/end2end/features/yankpaste.feature b/tests/end2end/features/yankpaste.feature
index e0b371c44..25ce81736 100644
--- a/tests/end2end/features/yankpaste.feature
+++ b/tests/end2end/features/yankpaste.feature
@@ -278,12 +278,12 @@ Feature: Yanking and pasting.
             """
 
     Scenario: Pasting multiple urls with an empty one
-        And I put "http://localhost:(port)/data/hello.txt\n\nhttp://localhost:(port)/data/hello2.txt" into the clipboard
+        When I put "http://localhost:(port)/data/hello.txt\n\nhttp://localhost:(port)/data/hello2.txt" into the clipboard
         And I run :open -t {clipboard}
         Then no crash should happen
 
     Scenario: Pasting multiple urls with an almost empty one
-        And I put "http://localhost:(port)/data/hello.txt\n \nhttp://localhost:(port)/data/hello2.txt" into the clipboard
+        When I put "http://localhost:(port)/data/hello.txt\n \nhttp://localhost:(port)/data/hello2.txt" into the clipboard
         And I run :open -t {clipboard}
         Then no crash should happen