tests: Move data/scroll.html to data/scroll/simple

This commit is contained in:
Florian Bruhin 2016-08-11 11:47:37 +02:00
parent e7584b9e1e
commit c12aeea670
5 changed files with 12 additions and 12 deletions

View File

@ -6,6 +6,6 @@
<title>Scrolling inside an iframe</title> <title>Scrolling inside an iframe</title>
</head> </head>
<body> <body>
<iframe style="margin: 50px;" src="/data/scroll.html"></iframe> <iframe style="margin: 50px;" src="/data/scroll/simple.html"></iframe>
</body> </body>
</html> </html>

View File

@ -488,7 +488,7 @@ Feature: Various utility commands.
Then the page should contain the plaintext "Local storage status: not working" Then the page should contain the plaintext "Local storage status: not working"
Scenario: :repeat-command Scenario: :repeat-command
Given I open data/scroll.html Given I open data/scroll/simple.html
And I run :tab-only And I run :tab-only
When I run :scroll down When I run :scroll down
And I run :repeat-command And I run :repeat-command
@ -496,7 +496,7 @@ Feature: Various utility commands.
Then the page should be scrolled vertically Then the page should be scrolled vertically
Scenario: :repeat-command with count Scenario: :repeat-command with count
Given I open data/scroll.html Given I open data/scroll/simple.html
And I run :tab-only And I run :tab-only
When I run :scroll down with count 3 When I run :scroll down with count 3
And I run :scroll up And I run :scroll up
@ -504,7 +504,7 @@ Feature: Various utility commands.
Then the page should not be scrolled Then the page should not be scrolled
Scenario: :repeat-command with not-normal command inbetween Scenario: :repeat-command with not-normal command inbetween
Given I open data/scroll.html Given I open data/scroll/simple.html
And I run :tab-only And I run :tab-only
When I run :scroll down with count 3 When I run :scroll down with count 3
And I run :scroll up And I run :scroll up

View File

@ -2,7 +2,7 @@ Feature: Scrolling
Tests the various scroll commands. Tests the various scroll commands.
Background: Background:
Given I open data/scroll.html Given I open data/scroll/simple.html
And I run :tab-only And I run :tab-only
## :scroll-px ## :scroll-px

View File

@ -863,13 +863,13 @@ Feature: Tab management
Scenario: :buffer with a matching title Scenario: :buffer with a matching title
When I open data/title.html When I open data/title.html
And I open data/search.html in a new tab And I open data/search.html in a new tab
And I open data/scroll.html in a new tab And I open data/scroll/simple.html in a new tab
And I run :buffer "Searching text" And I run :buffer "Searching text"
And I wait for "Current tab changed, focusing <qutebrowser.browser.* tab_id=* url='http://localhost:*/data/search.html'>" in the log And I wait for "Current tab changed, focusing <qutebrowser.browser.* tab_id=* url='http://localhost:*/data/search.html'>" in the log
Then the following tabs should be open: Then the following tabs should be open:
- data/title.html - data/title.html
- data/search.html (active) - data/search.html (active)
- data/scroll.html - data/scroll/simple.html
Scenario: :buffer with no matching title Scenario: :buffer with no matching title
When I run :buffer "invalid title" When I run :buffer "invalid title"
@ -878,11 +878,11 @@ Feature: Tab management
Scenario: :buffer with matching title and two windows Scenario: :buffer with matching title and two windows
When I open data/title.html When I open data/title.html
And I open data/search.html in a new tab And I open data/search.html in a new tab
And I open data/scroll.html in a new tab And I open data/scroll/simple.html in a new tab
And I open data/caret.html in a new window And I open data/caret.html in a new window
And I open data/paste_primary.html in a new tab And I open data/paste_primary.html in a new tab
And I run :buffer "Scrolling" And I run :buffer "Scrolling"
And I wait for "Focus object changed: <qutebrowser.browser.* tab_id=* url='http://localhost:*/data/scroll.html'>" in the log And I wait for "Focus object changed: <qutebrowser.browser.* tab_id=* url='http://localhost:*/data/scroll/simple.html'>" in the log
Then the session should look like: Then the session should look like:
windows: windows:
- active: true - active: true
@ -894,7 +894,7 @@ Feature: Tab management
- url: http://localhost:*/data/search.html - url: http://localhost:*/data/search.html
- active: true - active: true
history: history:
- url: http://localhost:*/data/scroll.html - url: http://localhost:*/data/scroll/simple.html
- tabs: - tabs:
- history: - history:
- url: http://localhost:*/data/caret.html - url: http://localhost:*/data/caret.html
@ -916,7 +916,7 @@ Feature: Tab management
Given I have a fresh instance Given I have a fresh instance
When I open data/title.html When I open data/title.html
And I open data/search.html in a new tab And I open data/search.html in a new tab
And I open data/scroll.html in a new tab And I open data/scroll/simple.html in a new tab
And I run :open -w http://localhost:(port)/data/caret.html And I run :open -w http://localhost:(port)/data/caret.html
And I open data/paste_primary.html in a new tab And I open data/paste_primary.html in a new tab
And I wait until data/caret.html is loaded And I wait until data/caret.html is loaded
@ -933,7 +933,7 @@ Feature: Tab management
history: history:
- url: http://localhost:*/data/search.html - url: http://localhost:*/data/search.html
- history: - history:
- url: http://localhost:*/data/scroll.html - url: http://localhost:*/data/scroll/simple.html
- tabs: - tabs:
- history: - history:
- url: http://localhost:*/data/caret.html - url: http://localhost:*/data/caret.html