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

add debug logs and adjust tests to use them

Browse Source
This commit is contained in:
Marc Jauvin 2018-02-14 09:58:23 -05:00
parent b791dd3eb4
commit 620a966d1e
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qutebrowser/mainwindow/tabbedbrowser.py
View File

@ -678,7 +678,8 @@ class TabbedBrowser(tabwidget.TabWidget):
mm_instance = modeman.instance(self._win_id)
current_mode = mm_instance.mode
log.modes.debug("{}: mode before tab change: {}."
.format(mode_on_change, current_mode.name))
if mode_on_change == 'normal':
modes_to_leave += [usertypes.KeyMode.insert,
usertypes.KeyMode.passthrough]
@ -689,6 +690,8 @@ class TabbedBrowser(tabwidget.TabWidget):
if self._now_focused is not None:
objreg.register('last-focused-tab', self._now_focused, update=True,
scope='window', window=self._win_id)
log.modes.debug("{}: mode after tab change: {}."
.format(mode_on_change, mm_instance.mode.name))
self._now_focused = tab
self.current_tab_changed.emit(tab)
QTimer.singleShot(0, self._update_window_title)

27
tests/end2end/features/keyinput.feature
View File

@ -167,42 +167,39 @@ Feature: Keyboard input
Scenario: mode on change normal
Given I set tabs.mode_on_change to normal
And I clean up open tabs
When I open about:blank
And I run :enter-mode insert
And I open about:blank in a new tab
And I run :enter-mode passthrough
And I run :tab-focus 1
Then "Entering mode KeyMode.insert (reason: command)" should be logged
And "Leaving mode KeyMode.insert (reason: tab changed)" should be logged
And "Entering mode KeyMode.normal (reason: restore)" should not be logged
And "Entering mode KeyMode.passthrough (reason: command)" should be logged
And "Leaving mode KeyMode.passthrough (reason: tab changed)" should be logged
And "Entering mode KeyMode.insert (reason: restore)" should not be logged
And "normal: mode before tab change: insert." should be logged
And "normal: mode after tab change: normal." should be logged
Scenario: mode on change persist
Given I set tabs.mode_on_change to persist
And I clean up open tabs
When I open about:blank
And I run :enter-mode insert
And I open about:blank in a new tab
And I run :enter-mode passthrough
And I run :tab-focus 1
Then "Entering mode KeyMode.insert (reason: command)" should be logged
And "Leaving mode KeyMode.insert (reason: tab changed)" should not be logged
And "Entering mode KeyMode.normal (reason: restore)" should not be logged
And "Entering mode KeyMode.passthrough (reason: command)" should be logged
And "Leaving mode KeyMode.passthrough (reason: tab changed)" should not be logged
And "Entering mode KeyMode.insert (reason: restore)" should not be logged
And "persist: mode before tab change: insert." should be logged
And "persist: mode after tab change: insert." should be logged
Scenario: mode on change restore
Given I set tabs.mode_on_change to restore
And I clean up open tabs
When I open about:blank
And I run :enter-mode insert
And I open about:blank in a new tab
And I run :enter-mode passthrough
And I run :tab-focus 1
Then "Entering mode KeyMode.insert (reason: command)" should be logged
And "Leaving mode KeyMode.insert (reason: tab changed)" should not be logged
And "restore: mode before tab change: insert." should be logged
And "Entering mode KeyMode.normal (reason: restore)" should be logged
And "restore: mode after tab change: normal." should be logged
And "Entering mode KeyMode.passthrough (reason: command)" should be logged
And "Leaving mode KeyMode.passthrough (reason: tab changed)" should not be logged
And "restore: mode before tab change: passthrough." should be logged
And "Entering mode KeyMode.insert (reason: restore)" should be logged
And "restore: mode after tab change: insert." should be logged