rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/The-Compiler/qutebrowser into pintab

Browse Source
This commit is contained in:
thuck 2016-11-07 21:25:36 +01:00
commit 49b2a19925
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.asciidoc
View File

@ -156,8 +156,8 @@ Contributors, sorted by the number of commits in descending order:
* Felix Van der Jeugt * Felix Van der Jeugt
* Martin Tournoij * Martin Tournoij
* Daniel Karbach * Daniel Karbach
* Raphael Pierzina
* Kevin Velghe * Kevin Velghe
* Raphael Pierzina
* Joel Torstensson * Joel Torstensson
* Patric Schmitz * Patric Schmitz
* Tarcisio Fedrizzi * Tarcisio Fedrizzi

4
scripts/dev/get_coredumpctl_traces.py
View File

@ -77,7 +77,11 @@ def get_info(pid):
for line in output.split('\n'): for line in output.split('\n'):
if not line.strip(): if not line.strip():
continue continue
try:
key, value = line.split(':', maxsplit=1) key, value = line.split(':', maxsplit=1)
except ValueError:
# systemd stack output
continue
data[key.strip()] = value.strip() data[key.strip()] = value.strip()
return data return data

6
tests/end2end/features/yankpaste.feature
View File

@ -263,11 +263,11 @@ Feature: Yanking and pasting.
And I run :click-element id qute-textarea And I run :click-element id qute-textarea
And I wait for "Clicked editable element!" in the log And I wait for "Clicked editable element!" in the log
And I run :insert-text Hello world And I run :insert-text Hello world
And I press the keys "<Ctrl+a>" And I run :jseval console.log("textarea contents: " + document.getElementById('qute-textarea').value);
And I run :yank selection # Enable javascript again for the other tests
And I set content -> allow-javascript to true And I set content -> allow-javascript to true
# Compare # Compare
Then the clipboard should contain "Hello world" Then the javascript message "textarea contents: Hello world" should be logged
Scenario: Inserting text into a text field at specific position Scenario: Inserting text into a text field at specific position
When I set general -> log-javascript-console to info When I set general -> log-javascript-console to info