branch: externals/ruby-end
commit 18edd3af0bb5a3930b4a100a8dd7e9eb2ac92b5f
Author: Johan Andersson <[email protected]>
Commit: Johan Andersson <[email protected]>
Fix feature indentation.
---
features/ruby-end.feature | 164 +++++++++++++++++++++-------------------------
1 file changed, 76 insertions(+), 88 deletions(-)
diff --git a/features/ruby-end.feature b/features/ruby-end.feature
index ea6db83355..b06f43374e 100644
--- a/features/ruby-end.feature
+++ b/features/ruby-end.feature
@@ -5,14 +5,14 @@ Feature: Insert end
Background:
Given I am in buffer "*ruby-end*"
- And the buffer is empty
- And ruby-mode is active
- And ruby-end-mode is active
+ And the buffer is empty
+ And ruby-mode is active
+ And ruby-end-mode is active
Scenario: Keyword at beginning of line
When I type "if"
- And I press "SPC"
- And I type "condition"
+ And I press "SPC"
+ And I type "condition"
Then I should see:
"""
if condition
@@ -22,9 +22,9 @@ Feature: Insert end
Scenario: Whitespace before keyword
When I type " "
- When I type "if"
- And I press "SPC"
- And I type "condition"
+ And I type "if"
+ And I press "SPC"
+ And I type "condition"
Then I should see:
"""
if condition
@@ -34,9 +34,9 @@ Feature: Insert end
Scenario: Text before keyword
When I type "x"
- And I type "if"
- And I press "SPC"
- And I type "condition"
+ And I type "if"
+ And I press "SPC"
+ And I type "condition"
Then I should see:
"""
xif condition
@@ -44,25 +44,19 @@ Feature: Insert end
Scenario: Text after keyword
When I type "condition"
- And I go to the beginning of the line
- And I type "if"
- And I press "SPC"
+ And I go to the beginning of the line
+ And I type "if"
+ And I press "SPC"
Then I should see:
"""
if condition
"""
- But I should not see:
- """
- if
-
- endcondition
- """
Scenario: Other character before keyword
When I type "!"
- And I type "if"
- And I press "SPC"
- And I type "condition"
+ And I type "if"
+ And I press "SPC"
+ And I type "condition"
Then I should see:
"""
!if condition
@@ -70,12 +64,12 @@ Feature: Insert end
Scenario: Nested expansion
When I type "class"
- And I press "SPC"
- And I type "User"
- And I go to the end of next line
- And I type "def"
- And I press "SPC"
- And I type "email"
+ And I press "SPC"
+ And I type "User"
+ And I go to the end of next line
+ And I type "def"
+ And I press "SPC"
+ And I type "email"
Then I should see:
"""
class User
@@ -87,21 +81,21 @@ Feature: Insert end
Scenario: Only exact keywords expand
When I type "xif"
- And I press "SPC"
- And I type "condition"
+ And I press "SPC"
+ And I type "condition"
Then I should see "xif condition"
- And end should not be insterted
+ And end should not be insterted
Scenario: Do not insert newline
Given insert newline is turned off
- When I type "if"
- And I press "SPC"
- And I type "condition"
- Then I should see:
- """
- if condition
- end
- """
+ When I type "if"
+ And I press "SPC"
+ And I type "condition"
+ Then I should see:
+ """
+ if condition
+ end
+ """
# NOTE:
# I have to hax these two scenarios, since running Emacs in batch
@@ -109,68 +103,62 @@ Feature: Insert end
Scenario: In comment
Given I insert "# if "
- And I set face to be comment
- And I go back one character
- And I press "SPC"
- And I type "condition"
+ And I set face to be comment
+ And I go back one character
+ And I press "SPC"
+ And I type "condition"
Then end should not be insterted
Scenario: In string
Given I insert "'if'"
- And I set face to be string
- And I go back one character
- And I press "SPC"
- And I type "condition"
+ And I set face to be string
+ And I go back one character
+ And I press "SPC"
+ And I type "condition"
Then end should not be insterted
Scenario: Statement modifier with modifier checking
Given I enable checking of statement modifiers
- When I type "return value if"
- And I press "SPC"
- And I type "condition"
- Then I should see:
- """
- return value if condition
- """
- But I should not see:
- """
- return values if condition
-
- end
- """
+ When I type "return value if"
+ And I press "SPC"
+ And I type "condition"
+ Then I should see:
+ """
+ return value if condition
+ """
Scenario: Keyword at beginning of line with modifier checking
Given I enable checking of statement modifiers
- When I type "if"
- And I press "SPC"
- And I type "condition"
- Then I should see:
- """
- if condition
-
- end
- """
+ When I type "if"
+ And I press "SPC"
+ And I type "condition"
+ Then I should see:
+ """
+ if condition
+
+ end
+ """
Scenario: Whitespace before keyword with modifier checking
Given I enable checking of statement modifiers
- When I type " "
- When I type "if"
- And I press "SPC"
- And I type "condition"
- Then I should see:
- """
- if condition
-
- end
- """
+ When I type " "
+ When I type "if"
+ And I press "SPC"
+ And I type "condition"
+ Then I should see:
+ """
+ if condition
+
+ end
+ """
Scenario: Block with modifier checking
Given I enable checking of statement modifiers
- When I type "collection.each do"
- And I press "SPC"
- Then I should see:
- """
- collection.each do
-
- end
- """
+ When I type "collection.each do"
+ And I press "SPC"
+ Then I should see:
+ """
+ collection.each do
+
+ end
+ """
