From 193d219eafe3f11ae4633fd540582b03ca6090c1 Mon Sep 17 00:00:00 2001 From: Julian Weigt Date: Wed, 24 Aug 2016 17:39:52 +0200 Subject: [PATCH 1/4] Added test for yanking --- tests/end2end/data/hints/simple2.html | 14 ++++++++++++++ tests/end2end/features/hints.feature | 9 +++++++++ 2 files changed, 23 insertions(+) create mode 100644 tests/end2end/data/hints/simple2.html diff --git a/tests/end2end/data/hints/simple2.html b/tests/end2end/data/hints/simple2.html new file mode 100644 index 000000000..32613bdcc --- /dev/null +++ b/tests/end2end/data/hints/simple2.html @@ -0,0 +1,14 @@ + + + + + + + + Simple links + + + First link + Second link + + diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature index fe3ba056f..55dda14b9 100644 --- a/tests/end2end/features/hints.feature +++ b/tests/end2end/features/hints.feature @@ -81,6 +81,15 @@ Feature: Using hints And I hint with args "all userscript (testdata)/userscripts/echo_hint_text" and follow a Then the message "Follow me!" should be shown + Scenario: Yanking + When selection is supported + And I run :debug-set-fake-clipboard + And I open data/hints/simple2.html + And I hint with args "links yank" and follow a + And I hint with args "links yank-primary" and follow s + Then the clipboard should contain "http://localhost:(port)/data/hello.txt" + And the primary selection should contain "http://localhost:(port)/data/hello2.txt" + Scenario: Yanking to primary selection without it being supported (#1336) When selection is not supported And I run :debug-set-fake-clipboard From 853e75e3db201273b9ef85f67e4f8464ad07a76c Mon Sep 17 00:00:00 2001 From: Julian Weigt Date: Thu, 25 Aug 2016 13:41:47 +0200 Subject: [PATCH 2/4] Split test for yanking --- tests/end2end/data/hints/simple2.html | 14 -------------- tests/end2end/features/hints.feature | 13 +++++++++---- 2 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 tests/end2end/data/hints/simple2.html diff --git a/tests/end2end/data/hints/simple2.html b/tests/end2end/data/hints/simple2.html deleted file mode 100644 index 32613bdcc..000000000 --- a/tests/end2end/data/hints/simple2.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - Simple links - - - First link - Second link - - diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature index 55dda14b9..f1ad97f29 100644 --- a/tests/end2end/features/hints.feature +++ b/tests/end2end/features/hints.feature @@ -81,14 +81,19 @@ Feature: Using hints And I hint with args "all userscript (testdata)/userscripts/echo_hint_text" and follow a Then the message "Follow me!" should be shown - Scenario: Yanking + Scenario: Yanking to clipboard When selection is supported And I run :debug-set-fake-clipboard - And I open data/hints/simple2.html + And I open data/hints/html/simple.html And I hint with args "links yank" and follow a - And I hint with args "links yank-primary" and follow s Then the clipboard should contain "http://localhost:(port)/data/hello.txt" - And the primary selection should contain "http://localhost:(port)/data/hello2.txt" + + Scenario: Yanking to primary selection + When selection is supported + And I run :debug-set-fake-clipboard + And I open data/hints/html/simple.html + And I hint with args "links yank-primary" and follow a + Then the primary selection should contain "http://localhost:(port)/data/hello.txt" Scenario: Yanking to primary selection without it being supported (#1336) When selection is not supported From fc3c93d3dd61fe279cc1b15325d14292f39b9525 Mon Sep 17 00:00:00 2001 From: Julian Weigt Date: Tue, 30 Aug 2016 11:30:32 +0200 Subject: [PATCH 3/4] run test for clipboard also if selection is not supported --- tests/end2end/features/hints.feature | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature index f1ad97f29..d590987f7 100644 --- a/tests/end2end/features/hints.feature +++ b/tests/end2end/features/hints.feature @@ -82,8 +82,7 @@ Feature: Using hints Then the message "Follow me!" should be shown Scenario: Yanking to clipboard - When selection is supported - And I run :debug-set-fake-clipboard + When I run :debug-set-fake-clipboard And I open data/hints/html/simple.html And I hint with args "links yank" and follow a Then the clipboard should contain "http://localhost:(port)/data/hello.txt" From d80ac2f129304ba1d562224e70fb8eb7c360237b Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 1 Sep 2016 22:05:36 +0200 Subject: [PATCH 4/4] Update authors --- README.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.asciidoc b/README.asciidoc index 4a95cec67..8c06602a1 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -176,6 +176,7 @@ Contributors, sorted by the number of commits in descending order: * Peter Vilim * Clayton Craft * Oliver Caldwell +* Julian Weigt * knaggita * Jonas Schürmann * error800 @@ -185,7 +186,6 @@ Contributors, sorted by the number of commits in descending order: * Zach-Button * Tomasz Kramkowski * Peter Rice -* Julian Weigt * Ismail S * Halfwit * David Vogt