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

tests: Fix various issues with new config

Browse Source
This commit is contained in:
Florian Bruhin 2017-06-16 17:52:28 +02:00
parent ab1b80967f
commit 88fb5bbd82
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/config/configdata.yml
View File

@ -92,7 +92,7 @@ searchengines:
desc: >- desc: >-
Definitions of search engines which can be used via the address bar. Definitions of search engines which can be used via the address bar.
The searchengine named `DEFAULT` is used when `auto_search` is true and The searchengine named `DEFAULT` is used when `auto_search` is turned on and
something else than a URL was entered to be opened. Other search engines can something else than a URL was entered to be opened. Other search engines can
be used by prepending the search engine name to the search term, e.g. `:open be used by prepending the search engine name to the search term, e.g. `:open
google qutebrowser`. The string `{}` will be replaced by the search term, google qutebrowser`. The string `{}` will be replaced by the search term,

8
tests/end2end/features/completion.feature
View File

@ -89,14 +89,14 @@ Feature: Using completion
- data/hello3.txt (active) - data/hello3.txt (active)
Scenario: Updating the value completion in realtime Scenario: Updating the value completion in realtime
Given I set colors.statusbar.bg to green Given I set colors.statusbar.normal.bg to green
When I run :set-cmd-text -s :set colors statusbar.bg When I run :set-cmd-text -s :set colors statusbar.bg
And I set colors.statusbar.bg to yellow And I set colors.statusbar.normal.bg to yellow
And I run :completion-item-focus next And I run :completion-item-focus next
And I run :completion-item-focus next And I run :completion-item-focus next
And I set colors.statusbar.bg to red And I set colors.statusbar.normal.bg to red
And I run :command-accept And I run :command-accept
Then colors -> statusbar.bg should be yellow Then colors.statusbar.normal.bg should be yellow
Scenario: Deleting an open tab via the completion Scenario: Deleting an open tab via the completion
Given I have a fresh instance Given I have a fresh instance

6
tests/end2end/features/conftest.py
View File

@ -631,7 +631,7 @@ def check_not_scrolled(request, quteproc):
assert y == 0 assert y == 0
@bdd.then(bdd.parsers.parse("{section} -> {option} should be {value}")) @bdd.then(bdd.parsers.parse("{section} should be {value}"))
def check_option(quteproc, section, option, value): def check_option(quteproc, option, value):
actual_value = quteproc.get_setting(section, option) actual_value = quteproc.get_setting(option)
assert actual_value == value assert actual_value == value

4
tests/end2end/features/downloads.feature
View File

@ -97,7 +97,7 @@ Feature: Downloading things from a website.
Scenario: Quitting with finished downloads and confirm-quit=downloads (issue 846) Scenario: Quitting with finished downloads and confirm-quit=downloads (issue 846)
Given I have a fresh instance Given I have a fresh instance
When I set downloads.location.prompt to false When I set downloads.location.prompt to false
And I set confirm_quit to downloads And I set confirm_quit to [downloads]
And I open data/downloads/download.bin without waiting And I open data/downloads/download.bin without waiting
And I wait until the download is finished And I wait until the download is finished
And I run :close And I run :close
@ -601,7 +601,7 @@ Feature: Downloading things from a website.
Scenario: Downloading invalid URL Scenario: Downloading invalid URL
When I set downloads.location.prompt to false When I set downloads.location.prompt to false
And I set auto_search to false And I set auto_search to never
And I run :download foo! And I run :download foo!
Then the error "Invalid URL" should be shown Then the error "Invalid URL" should be shown

2
tests/end2end/features/editor.feature
View File

@ -54,7 +54,7 @@ Feature: Opening external editors
Then the error "Only one of -t/-b/-w can be given!" should be shown Then the error "Only one of -t/-b/-w can be given!" should be shown
Scenario: Editing a URL with invalid URL Scenario: Editing a URL with invalid URL
When I set auto_search to false When I set auto_search to never
And I open data/hello.txt And I open data/hello.txt
And I set up a fake editor replacing "http://localhost:(port)/data/hello.txt" by "foo!" And I set up a fake editor replacing "http://localhost:(port)/data/hello.txt" by "foo!"
And I run :edit-url And I run :edit-url

2
tests/end2end/features/history.feature
View File

@ -109,7 +109,7 @@ Feature: Page history
@qtwebengine_skip @qtwebkit_ng_skip @qtwebengine_skip @qtwebkit_ng_skip
Scenario: Opening a valid URL which turns out invalid Scenario: Opening a valid URL which turns out invalid
When I set auto_search to true When I set auto_search to naive
And I run :open http://foo%40bar@baz And I run :open http://foo%40bar@baz
Then "QFSFileEngine::open: No file name specified" should be logged Then "QFSFileEngine::open: No file name specified" should be logged
And "Error while loading : Host not found" should be logged And "Error while loading : Host not found" should be logged

2
tests/end2end/features/open.feature
View File

@ -27,7 +27,7 @@ Feature: Opening pages
Then data/numbers/2.txt should be loaded Then data/numbers/2.txt should be loaded
Scenario: :open with invalid URL Scenario: :open with invalid URL
When I set auto_search to false When I set auto_search to never
And I run :open foo! And I run :open foo!
Then the error "Invalid URL" should be shown Then the error "Invalid URL" should be shown

16
tests/end2end/features/set.feature
View File

@ -6,11 +6,11 @@ Feature: Setting settings.
Given I set messages.timeout to 100 Given I set messages.timeout to 100
Scenario: Using :set Scenario: Using :set
When I run :set colors.statusbar.bg magenta When I run :set colors.statusbar.normal.bg magenta
Then colors.statusbar.bg should be magenta Then colors.statusbar.normal.bg should be magenta
Scenario: Without value Scenario: Without value
When I run :set colors.statusbar.bg When I run :set colors.statusbar.normal.bg
Then the error "set: The following arguments are required: value" should be shown Then the error "set: The following arguments are required: value" should be shown
Scenario: Invalid option Scenario: Invalid option
@ -29,22 +29,22 @@ Feature: Setting settings.
Scenario: Cycling an option Scenario: Cycling an option
When I run :set colors statusbar.bg magenta When I run :set colors statusbar.bg magenta
And I run :set colors statusbar.bg green magenta blue yellow And I run :set colors statusbar.bg green magenta blue yellow
Then colors.statusbar.bg should be blue Then colors.statusbar.normal.bg should be blue
Scenario: Cycling an option through the end of the list Scenario: Cycling an option through the end of the list
When I run :set colors statusbar.bg yellow When I run :set colors statusbar.bg yellow
And I run :set colors statusbar.bg green magenta blue yellow And I run :set colors statusbar.bg green magenta blue yellow
Then colors.statusbar.bg should be green Then colors.statusbar.normal.bg should be green
Scenario: Cycling an option that's not on the list Scenario: Cycling an option that's not on the list
When I run :set colors statusbar.bg red When I run :set colors statusbar.bg red
And I run :set colors statusbar.bg green magenta blue yellow And I run :set colors statusbar.bg green magenta blue yellow
Then colors.statusbar.bg should be green Then colors.statusbar.normal.bg should be green
Scenario: Cycling through a single option Scenario: Cycling through a single option
When I run :set colors statusbar.bg red When I run :set colors statusbar.bg red
And I run :set colors statusbar.bg red And I run :set colors statusbar.bg red
Then colors.statusbar.bg should be red Then colors.statusbar.normal.bg should be red
Scenario: Getting an option Scenario: Getting an option
When I run :set colors statusbar.bg magenta When I run :set colors statusbar.bg magenta
@ -68,7 +68,7 @@ Feature: Setting settings.
# We don't actually check if the option is temporary as this isn't easy # We don't actually check if the option is temporary as this isn't easy
# to check. # to check.
When I run :set -t colors statusbar.bg green When I run :set -t colors statusbar.bg green
Then colors.statusbar.bg should be green Then colors.statusbar.normal.bg should be green
# qute://settings isn't actually implemented on QtWebEngine, but this works # qute://settings isn't actually implemented on QtWebEngine, but this works
# (and displays a page saying it's not available) # (and displays a page saying it's not available)

2
tests/end2end/features/urlmarks.feature
View File

@ -20,7 +20,7 @@ Feature: quickmarks and bookmarks
Then the error "Title must be provided if url has been provided" should be shown Then the error "Title must be provided if url has been provided" should be shown
Scenario: Saving a bookmark with an invalid url Scenario: Saving a bookmark with an invalid url
When I set auto_search to false When I set auto_search to never
And I run :bookmark-add foo! "some example title" And I run :bookmark-add foo! "some example title"
Then the error "Invalid URL" should be shown Then the error "Invalid URL" should be shown

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

@ -145,7 +145,7 @@ Feature: Yanking and pasting.
url: http://localhost:*/data/hello.txt url: http://localhost:*/data/hello.txt
Scenario: Pasting an invalid URL Scenario: Pasting an invalid URL
When I set auto_search to false When I set auto_search to never
And I put "foo bar" into the clipboard And I put "foo bar" into the clipboard
And I run :open {clipboard} And I run :open {clipboard}
Then the error "Invalid URL" should be shown Then the error "Invalid URL" should be shown
@ -169,7 +169,7 @@ Feature: Yanking and pasting.
# FIXME:conf # FIXME:conf
# Scenario: Pasting multiline text # Scenario: Pasting multiline text
# When I set auto_search to true # When I set auto_search to naive
# And I set searchengines.DEFAULT to http://localhost:(port)/data/hello.txt?q={} # And I set searchengines.DEFAULT to http://localhost:(port)/data/hello.txt?q={}
# And I put the following lines into the clipboard: # And I put the following lines into the clipboard:
# this url: # this url:
@ -183,7 +183,7 @@ Feature: Yanking and pasting.
# FIXME:conf # FIXME:conf
# Scenario: Pasting multiline whose first line looks like a URI # Scenario: Pasting multiline whose first line looks like a URI
# When I set auto_search to true # When I set auto_search to naive
# And I set searchengines.DEFAULT to http://localhost:(port)/data/hello.txt?q={} # And I set searchengines.DEFAULT to http://localhost:(port)/data/hello.txt?q={}
# And I put the following lines into the clipboard: # And I put the following lines into the clipboard:
# text: # text: