redcar-dev 0.12.17dev → 0.12.18dev

data/plugins/document_search/features/step_definitions/find_steps.rb

@@ -1,10 +1,14 @@
 
 When /^I open the incremental search speedbar$/ do
-  Redcar::DocumentSearch::OpenIncrementalSearchSpeedbarCommand.new.run
+  Swt.sync_exec do
+    Redcar::DocumentSearch::OpenIncrementalSearchSpeedbarCommand.new.run
+  end
 end
 
 When /^I open the find speedbar$/ do
-  Redcar::DocumentSearch::OpenFindSpeedbarCommand.new.run
+  Swt.sync_exec do
+    Redcar::DocumentSearch::OpenFindSpeedbarCommand.new.run
+  end
 end
 
 Then /^I should see the incremental search speedbar$/ do

data/plugins/edit_view/features/align_assignment.feature

@@ -4,65 +4,22 @@ Feature: Align Assignment
     When I open a new edit tab
 
   Scenario: align simple assignments
-    When I replace the contents with "a = 4\nbc = 5\nd = 123"
+    When I type "a = 4\nbc = 5\nd = 123"
     And I select all
-    And I run the command Redcar::EditView::AlignAssignmentCommand
+    And I select menu item "Edit|Formatting|Align Assignments"
     Then the contents should be "<c>a  = 4\nbc = 5\nd  = 123<s>"
 
-  Scenario: align rows that have empty lines
-    When I replace the contents with "a = 1\n\nab = 123"
-    And I select all
-    And I run the command Redcar::EditView::AlignAssignmentCommand
-    Then the contents should be "<c>a  = 1\n\nab = 123<s>"
-
-  Scenario: preserve trailing newline
+  Scenario: Operates on entire lines, not portions of lines
     Given the content is:
         """
         def foo
-        <c>  a = 1
+          a = 1
           bb = 2
           ccc = 3
-        <s>end
-        """
-    When I run the command Redcar::EditView::AlignAssignmentCommand
-    Then the content should be:
-        """
-        def foo
-        <c>  a   = 1
-          bb  = 2
-          ccc = 3<s>
-        end
-        """
-
-  Scenario: preserve non-selected indentation
-    Given the content is:
-        """
-        def foo
-          <c>a = 1
-          bb = 2
-          ccc = 3<s>
-        end
-        """
-    When I run the command Redcar::EditView::AlignAssignmentCommand
-    Then the content should be:
-        """
-        def foo
-        <c>  a   = 1
-          bb  = 2
-          ccc = 3<s>
-        end
-        """
-
-  Scenario: align the right hand side of the operator
-    Given the content is:
-        """
-        def foo
-        <c>  a = 1
-          bb =     2
-          ccc = 3<s>
         end
         """
-    When I run the command Redcar::EditView::AlignAssignmentCommand
+    And I select from (1,2) to (3,9)
+    And I select menu item "Edit|Formatting|Align Assignments"
     Then the content should be:
         """
         def foo
@@ -71,36 +28,3 @@ Feature: Align Assignment
           ccc = 3<s>
         end
         """
-  Scenario: aligning different length operators
-    Given the content is:
-        """
-        Integer === 1
-        two =~ /2/
-        @three||= 3333
-        bits &= 0b101010
-        """
-    And I select all
-    When I run the command Redcar::EditView::AlignAssignmentCommand
-    Then the content should be:
-        """
-        <c>Integer === 1
-        two      =~ /2/
-        @three  ||= 3333
-        bits &    = 0b101010<s>
-        """
-
-  Scenario: aligning hashes
-    Given the content is:
-        """
-        {:one => 1,
-        :two => 22,
-        :threee => 333}
-        """
-    And I select all
-    When I run the command Redcar::EditView::AlignAssignmentCommand
-    Then the content should be:
-        """
-        <c>{:one   => 1,
-        :two    => 22,
-        :threee => 333}<s>
-        """

data/plugins/edit_view/features/case_change.feature

@@ -5,63 +5,63 @@ Feature: Change Case
 
   Scenario: Upcase selected text
     When I replace the contents with "Curry Chicken"
-    And I select from 5 to 0
-    And I run the command Redcar::EditView::UpcaseTextCommand
+    And I select -5 from (0,5)
+    And I select menu item "Edit|Formatting|Convert Text|to Uppercase"
     Then the contents should be "<c>CURRY<s> Chicken"
 
   Scenario: Upcase selected text and preserve cursor position
     When I replace the contents with "Curry Chicken"
-    And I select from 0 to 5
-    And I run the command Redcar::EditView::UpcaseTextCommand
+    And I select 5 from (0,0)
+    And I select menu item "Edit|Formatting|Convert Text|to Uppercase"
     Then the contents should be "<s>CURRY<c> Chicken"
 
   Scenario: Upcase word if no selection
     When I replace the contents with "Curry Chicken"
-    And I move the cursor to 10
-    And I run the command Redcar::EditView::UpcaseTextCommand
+    And I move the cursor to (0,10)
+    And I select menu item "Edit|Formatting|Convert Text|to Uppercase"
     Then the contents should be "Curry CHIC<c>KEN"
 
   Scenario: Downcase text
     When I replace the contents with "CURRY CHICKEN"
-    And I select from 0 to 5
-    And I run the command Redcar::EditView::DowncaseTextCommand
+    And I select 5 from (0,0)
+    And I select menu item "Edit|Formatting|Convert Text|to Lowercase"
     Then the contents should be "<s>curry<c> CHICKEN"
 
   Scenario: Titlize text
     When I replace the contents with "curry chicken"
-    And I select from 0 to 13
-    And I run the command Redcar::EditView::TitlizeTextCommand
+    And I select 13 from (0,0)
+    And I select menu item "Edit|Formatting|Convert Text|to Titlecase"
     Then the contents should be "<s>Curry Chicken<c>"
     When I replace the contents with "CURRY CHICKEN"
-    And I select from 0 to 13
-    And I run the command Redcar::EditView::TitlizeTextCommand
+    And I select 13 from (0,0)
+    And I select menu item "Edit|Formatting|Convert Text|to Titlecase"
     Then the contents should be "<s>Curry Chicken<c>"
 
   Scenario: Opposite case
     When I replace the contents with "Curry Chicken"
-    And I select from 0 to 13
-    And I run the command Redcar::EditView::OppositeCaseTextCommand
+    And I select 13 from (0,0)
+    And I select menu item "Edit|Formatting|Convert Text|to Opposite Case"
     Then the contents should be "<s>cURRY cHICKEN<c>"
 
   Scenario: Camel case
     When I replace the contents with "curry_chicken"
-    And I move the cursor to 13
-    And I run the command Redcar::EditView::CamelCaseTextCommand
+    And I move the cursor to (0,13)
+    And I select menu item "Edit|Formatting|Convert Text|to CamelCase"
     Then the contents should be "CurryChicken<c>"
 
   Scenario: Underscore
     When I replace the contents with "CurryChicken"
-    And I move the cursor to 12
-    And I run the command Redcar::EditView::UnderscoreTextCommand
+    And I move the cursor to (0,12)
+    And I select menu item "Edit|Formatting|Convert Text|to snake_case"
     Then the contents should be "curry_chicke<c>n"
 
   Scenario: Pascal to Underscore to Camel Case rotation
     When I replace the contents with "CurryChicken"
-    And I move the cursor to 12
-    And I run the command Redcar::EditView::CamelSnakePascalRotateTextCommand
+    And I move the cursor to (0,12)
+    And I select menu item "Edit|Formatting|Convert Text|Toggle PascalCase-underscore-camelCase"
     Then the contents should be "curry_chicke<c>n"
-    When I run the command Redcar::EditView::CamelSnakePascalRotateTextCommand
+    And I select menu item "Edit|Formatting|Convert Text|Toggle PascalCase-underscore-camelCase"
     Then the contents should be "curryChicken<c>"
-    When I run the command Redcar::EditView::CamelSnakePascalRotateTextCommand
+    And I select menu item "Edit|Formatting|Convert Text|Toggle PascalCase-underscore-camelCase"
     Then the contents should be "CurryChicken<c>"
 

data/plugins/edit_view/features/cursor_navigation.feature

@@ -5,7 +5,7 @@ Feature: Cursor navigation
 
   Scenario: Move forward word works with multi-byte chars
     When I replace the contents with "<h1>'Oáy z' wee"
-    And I move the cursor to 0
+    And I move the cursor to (0,0)
     When I move to the next word
     Then the contents should be "<h1<c>>'Oáy z' wee"
     When I move to the next word
@@ -21,7 +21,7 @@ Feature: Cursor navigation
 
   Scenario: Move backward word works with multi-byte chars
     When I replace the contents with "<h1>'Oáy z' wee"
-    And I move the cursor to 15
+    And I move the cursor to (0,15)
     When I move to the previous word
     Then the contents should be "<h1>'Oáy z' <c>wee"
     When I move to the previous word

data/plugins/edit_view/features/cut_and_paste.feature

@@ -5,41 +5,41 @@ Feature: Cut and Paste
 
   Scenario: Cut removes the text
     When I replace the contents with "Frank"
-    And I select from 0 to 3
+    And I select 3 from (0,0)
     And I cut text
     Then I should not see "Fra" in the edit tab  
     And I should see "nk" in the edit tab  
 
   Scenario: Copy leaves the text
     When I replace the contents with "Frank"
-    And I select from 0 to 3
+    And I select 3 from (0,0)
     And I copy text
     Then I should see "Frank" in the edit tab  
 
   Scenario: Paste inserts the cut text
     When I replace the contents with "Frank"
-    And I select from 0 to 3
+    And I select 3 from (0,0)
     And I cut text
-    And I move the cursor to 2
+    And I move the cursor to (0,2)
     And I paste text
     Then the contents should be "nkFra<c>"
 
   Scenario: Paste inserts the copied text
     When I replace the contents with "Frank"
-    And I select from 0 to 3
+    And I select 3 from (0,0)
     And I copy text
-    And I move the cursor to 2
+    And I move the cursor to (0,2)
     And I paste text
     Then I should see "FrFraank" in the edit tab
     Then the contents should be "FrFra<c>ank"
 
   Scenario: Paste pastes the most recent copy
     When I replace the contents with "Frank"
-    And I select from 0 to 3
+    And I select 3 from (0,0)
     And I copy text
-    And I select from 3 to 5
+    And I select 2 from (0,3)
     And I copy text
-    And I move the cursor to 0
+    And I move the cursor to (0,0)
     And I paste text
     Then the contents should be "nk<c>Frank"
  

data/plugins/edit_view/features/indentation_commands.feature

@@ -3,40 +3,40 @@ Feature: Indentation commands
   Scenario: Increase indent, soft tabs, width 2
     When I open a new edit tab
     And tabs are soft, 2 spaces
-    And I run the command Redcar::Top::IncreaseIndentCommand
+    And I select menu item "Edit|Formatting|Increase Indent"
     Then the contents should be "  "
 
   Scenario: Decrease indent, soft tabs, width 2
     When I open a new edit tab
     And tabs are soft, 2 spaces
     And I replace the contents with "<c>    "
-    And I run the command Redcar::Top::DecreaseIndentCommand
+    And I select menu item "Edit|Formatting|Decrease Indent"
     Then the contents should be "  "
 
   Scenario: Increase indent, soft tabs, width 3
     When I open a new edit tab
     And tabs are soft, 3 spaces
-    And I run the command Redcar::Top::IncreaseIndentCommand
+    And I select menu item "Edit|Formatting|Increase Indent"
     Then the contents should be "   "
 
   Scenario: Decrease indent, soft tabs, width 3
     When I open a new edit tab
     And tabs are soft, 3 spaces
     And I replace the contents with "<c>      "
-    And I run the command Redcar::Top::DecreaseIndentCommand
+    And I select menu item "Edit|Formatting|Decrease Indent"
     Then the contents should be "   "
 
   Scenario: Increase indent, hard tabs, width 2
     When I open a new edit tab
     And tabs are hard
-    And I run the command Redcar::Top::IncreaseIndentCommand
+    And I select menu item "Edit|Formatting|Increase Indent"
     Then the contents should be "\t"
 
   Scenario: Decrease indent, hard tabs, width 2
     When I open a new edit tab
     And tabs are hard
     And I replace the contents with "<c>\t\t"
-    And I run the command Redcar::Top::DecreaseIndentCommand
+    And I select menu item "Edit|Formatting|Decrease Indent"
     Then the contents should be "\t"
 
   Scenario: auto-indent, soft tabs, width 2
@@ -44,6 +44,6 @@ Feature: Indentation commands
     When I open a new edit tab
     And tabs are soft, 2 spaces
     And I replace the contents with "def f\n\t1\t\t\nend\t"
-    And I select from 0 to 13
-    And I run the command Redcar::AutoIndenter::IndentCommand
+    And I select 13 from (0,0)
+    And I select menu item "Edit|Formatting|Indent"
     Then the contents should be "def f\n  1\nend"

data/plugins/edit_view/features/line_delimiter.feature

@@ -8,14 +8,14 @@ Feature: Line delimiter
   Scenario: Delete at end of line deletes delimiter (Windows)
     When I open a new edit tab
     And I replace the contents with "foo\r\nbar\r\nbaz\r\n"
-    And I move the cursor to 3
+    And I move the cursor to (0,3)
     And I press the Delete key in the edit tab
     Then the contents should be "foobar\r\nbaz\r\n"
     
   Scenario: Backspace at start of line deletes delimiter (Windows)
     When I open a new edit tab
     And I replace the contents with "foo\r\nbar\r\nbaz\r\n"
-    And I move the cursor to 5
+    And I move the cursor to (1,0)
     And I press the Backspace key in the edit tab
     Then the contents should be "foobar\r\nbaz\r\n"
     
@@ -27,21 +27,21 @@ Feature: Line delimiter
   Scenario: Delete at end of line deletes delimiter (Unix)
     When I open a new edit tab
     And I replace the contents with "foo\nbar\nbaz\n"
-    And I move the cursor to 3
+    And I move the cursor to (0,3)
     And I press the Delete key in the edit tab
     Then the contents should be "foobar\nbaz\n"
     
   Scenario: Backspace at start of line deletes delimiter (Windows)
     When I open a new edit tab
     And I replace the contents with "foo\nbar\nbaz\n"
-    And I move the cursor to 4
+    And I move the cursor to (1,0)
     And I press the Backspace key in the edit tab
     Then the contents should be "foobar\nbaz\n"
     
   Scenario: End goes to end of line (Windows)
     When I open a new edit tab
     And I replace the contents with "foo\r\nbar\r\nbaz\r\n"
-    And I move the cursor to 0
-    And I run the command Redcar::Top::MoveEndCommand
-    Then the cursor should be at 3
+    And I move the cursor to (0,0)
+    And I select menu item "Edit|Document Navigation|End"
+    Then the cursor should be at (0,3)
     

data/plugins/edit_view/features/multiple_windows.feature

@@ -1,48 +1,48 @@
-Feature: Multiple windows
-
-  Scenario: Start with one window
-    Then there should be one window
-  
-  Scenario: Open a new window
-    When I open a new window
-    Then there should be 2 windows
-  
-  Scenario: Open two new windows
-    When I open a new window
-    And I open a new window
-    Then there should be 3 windows
-
-  Scenario Outline: Close a window
-    When I open a new window with title "Second"
-    And I close the window <how>
-    Then there should be one window
-    And the window should be titled "Redcar"
-
-    Examples:
-      | how             |
-      | with a command  | 
-      | through the gui |
-      
-  Scenario: A new window is focussed
-    When I open a new window with title "Second"
-    And I open a new edit tab
-    Then the window "Second" should have 1 tab
-  
-  Scenario: The focus returns the first window when I close the second
-    When I open a new window with title "Second"
-    And I close the window "Second" through the gui
-    And I open a new edit tab
-    Then the window "Redcar" should have 1 tab
-
-  Scenario Outline: Can focus on each window
-    When I open a new edit tab
-    And I open a new window with title "Second"
-    And I focus the window "Redcar" <how>
-    And I open a new edit tab
-    Then the window "Redcar" should have 2 tabs
-    Then the window "Second" should have 0 tabs
-
-    Examples:
-      | how             |
-      | with a command  | 
-      | through the gui |
+# Feature: Multiple windows
+# 
+#   Scenario: Start with one window
+#     Then there should be one window
+#   
+#   Scenario: Open a new window
+#     When I open a new window
+#     Then there should be 2 windows
+#   
+#   Scenario: Open two new windows
+#     When I open a new window
+#     And I open a new window
+#     Then there should be 3 windows
+# 
+#   Scenario Outline: Close a window
+#     When I open a new window with title "Second"
+#     And I close the window <how>
+#     Then there should be one window
+#     And the window should be titled "Redcar"
+# 
+#     Examples:
+#       | how             |
+#       | with a command  | 
+#       | through the gui |
+#       
+#   Scenario: A new window is focussed
+#     When I open a new window with title "Second"
+#     And I open a new edit tab
+#     Then the window "Second" should have 1 tab
+#   
+#   Scenario: The focus returns the first window when I close the second
+#     When I open a new window with title "Second"
+#     And I close the window "Second" through the gui
+#     And I open a new edit tab
+#     Then the window "Redcar" should have 1 tab
+# 
+#   Scenario Outline: Can focus on each window
+#     When I open a new edit tab
+#     And I open a new window with title "Second"
+#     And I focus the window "Redcar" <how>
+#     And I open a new edit tab
+#     Then the window "Redcar" should have 2 tabs
+#     Then the window "Second" should have 0 tabs
+# 
+#     Examples:
+#       | how             |
+#       | with a command  | 
+#       | through the gui |