Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions features/e2wm.feature
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Feature: Simple window management
Given I enabled e2wm
When I switch to "stwo" perspective
Then I should be in window "left"
And I switch to a buffer "recordable-1"
And I switch to buffer "recordable-1"
When I have a popup buffer "recordable-2"
Then I should be in window "right"
And I should be in buffer "recordable-2"
Expand All @@ -54,7 +54,7 @@ Feature: Simple window management
Given I enabled e2wm
When I switch to "stwo" perspective
And I switch to window "right"
And I switch to a buffer "recordable-1"
And I switch to buffer "recordable-1"
When I have a popup buffer "recordable-2"
Then I should be in window "left"
And I should be in buffer "recordable-2"
Expand All @@ -65,7 +65,7 @@ Feature: Simple window management
Given I enabled e2wm
When I switch to "stwo" perspective
Then I should be in window "left"
And I switch to a buffer "recordable-1"
And I switch to buffer "recordable-1"
And I execute a command that reopens buffer "recordable-2" in other window
Then I should be in window "right"
And I should be in buffer "recordable-2"
Expand All @@ -75,7 +75,7 @@ Feature: Simple window management
Scenario: Killing the blank buffer should not cause a problem (#42)
Given I enabled e2wm
When I switch to "code" perspective
And I switch to a buffer " *e2wm:blank*"
And I switch to buffer " *e2wm:blank*"
And I press "C-x k RET"
And I switch to buffer "recordable"
And I press "C-x k RET"
Expand Down
30 changes: 15 additions & 15 deletions features/history.feature
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Feature: History management
Scenario: Open three recordable buffers
Given I enabled e2wm
When I switch to "code" perspective
And I switch to a buffer "recordable-buffer-a"
And I switch to a buffer "recordable-buffer-b"
And I switch to a buffer "recordable-buffer-c"
And I switch to buffer "recordable-buffer-a"
And I switch to buffer "recordable-buffer-b"
And I switch to buffer "recordable-buffer-c"
Then I should have these buffers in history:
| Pointer | Buffer Name |
| -> | recordable-buffer-c |
Expand All @@ -18,12 +18,12 @@ Feature: History management
Scenario: Ignore unrecordable buffers
Given I enabled e2wm
When I switch to "code" perspective
And I switch to a buffer "unrecordable-buffer-1"
And I switch to a buffer "recordable-buffer-a"
And I switch to a buffer "unrecordable-buffer-2"
And I switch to a buffer "recordable-buffer-b"
And I switch to a buffer "unrecordable-buffer-3"
And I switch to a buffer "recordable-buffer-c"
And I switch to buffer "unrecordable-buffer-1"
And I switch to buffer "recordable-buffer-a"
And I switch to buffer "unrecordable-buffer-2"
And I switch to buffer "recordable-buffer-b"
And I switch to buffer "unrecordable-buffer-3"
And I switch to buffer "recordable-buffer-c"
Then I should have these buffers in history:
| Pointer | Buffer Name |
| -> | recordable-buffer-c |
Expand All @@ -33,9 +33,9 @@ Feature: History management
Scenario: Go back and forth
Given I enabled e2wm
When I switch to "code" perspective
And I switch to a buffer "recordable-buffer-a"
And I switch to a buffer "recordable-buffer-b"
And I switch to a buffer "recordable-buffer-c"
And I switch to buffer "recordable-buffer-a"
And I switch to buffer "recordable-buffer-b"
And I switch to buffer "recordable-buffer-c"
Then I should have these buffers in history:
| Pointer | Buffer Name |
| -> | recordable-buffer-c |
Expand Down Expand Up @@ -63,9 +63,9 @@ Feature: History management
Scenario: Open and then kill three recordable buffers
Given I enabled e2wm
When I switch to "code" perspective
And I switch to a buffer "recordable-buffer-a"
And I switch to a buffer "recordable-buffer-b"
And I switch to a buffer "recordable-buffer-c"
And I switch to buffer "recordable-buffer-a"
And I switch to buffer "recordable-buffer-b"
And I switch to buffer "recordable-buffer-c"
Then I should have these buffers in history:
| Pointer | Buffer Name |
| -> | recordable-buffer-c |
Expand Down
6 changes: 1 addition & 5 deletions features/step-definitions/e2wm-steps.el
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,6 @@
(lambda (buffer-name)
(pop-to-buffer (get-buffer-create buffer-name))))

(And "^I switch to a buffer \"\\(.+\\)\"$"
(lambda (buffer-name)
(switch-to-buffer (get-buffer-create buffer-name))))

(When "^I display buffer \"\\(.+\\)\"$"
(lambda (buffer-name)
(display-buffer (get-buffer-create buffer-name))))
Expand All @@ -108,7 +104,7 @@
(When "^I switch to window \"\\(.+\\)\" and open buffer \"\\(.+\\)\"$"
(lambda (window-name buffer-name)
(When "I switch to window \"%s\"" window-name)
(And "I switch to a buffer \"%s\"" buffer-name)))
(And "I switch to buffer \"%s\"" buffer-name)))

(When "^windows are distorted due to manual rearrangement$"
"Simulate manual rearrangement of window."
Expand Down