redcar-dev 0.12.17dev → 0.12.18dev

Sign up to get free protection for your applications and to get access to all the features.
Files changed (155) hide show
  1. data/CHANGES +4 -2
  2. data/README.md +5 -41
  3. data/Rakefile +3 -35
  4. data/lib/redcar.rb +19 -17
  5. data/lib/redcar/runner.rb +1 -7
  6. data/lib/redcar_quick_start.rb +5 -5
  7. data/plugins/application/features/main_menu.feature +1 -1
  8. data/plugins/application/features/step_definitions/command_steps.rb +8 -7
  9. data/plugins/application/features/step_definitions/filter_list_dialog_steps.rb +25 -10
  10. data/plugins/application/features/step_definitions/key_steps.rb +6 -4
  11. data/plugins/application/features/step_definitions/menu_steps.rb +27 -26
  12. data/plugins/application/features/step_definitions/speedbar_steps.rb +28 -16
  13. data/plugins/application/features/step_definitions/tree_steps.rb +88 -64
  14. data/plugins/application/features/step_definitions/window_steps.rb +14 -10
  15. data/plugins/application/features/support/env.rb +85 -83
  16. data/plugins/application/spec/application/application_spec.rb +1 -1
  17. data/plugins/application/spec/application/clipboard_spec.rb +1 -1
  18. data/plugins/application/spec/application/command/executor_spec.rb +1 -1
  19. data/plugins/application/spec/application/command/history_spec.rb +1 -1
  20. data/plugins/application/spec/application/command_spec.rb +1 -1
  21. data/plugins/application/spec/application/keymap/builder_spec.rb +1 -1
  22. data/plugins/application/spec/application/menu/builder_spec.rb +1 -1
  23. data/plugins/application/spec/application/menu/menu_item_spec.rb +1 -1
  24. data/plugins/application/spec/application/menu_spec.rb +1 -1
  25. data/plugins/application/spec/application/navigation_history_spec.rb +2 -0
  26. data/plugins/application/spec/application/notebook_spec.rb +1 -1
  27. data/plugins/application/spec/application/sensitive_spec.rb +1 -1
  28. data/plugins/application/spec/application/speedbar_spec.rb +1 -1
  29. data/plugins/application/spec/application/treebook_spec.rb +1 -1
  30. data/plugins/application/spec/application/window_spec.rb +1 -1
  31. data/plugins/application/spec/spec_helper.rb +4 -6
  32. data/plugins/application_swt/lib/application_swt/dialogs/filter_list_dialog_controller.rb +1 -1
  33. data/plugins/application_swt/lib/application_swt/gradient.rb +15 -5
  34. data/plugins/application_swt/lib/application_swt/window.rb +1 -1
  35. data/plugins/application_swt/spec/application_swt/gradient_spec.rb +13 -14
  36. data/plugins/application_swt/spec/application_swt/menu/binding_translator_spec.rb +1 -1
  37. data/plugins/application_swt/spec/application_swt/menu_spec.rb +1 -1
  38. data/plugins/application_swt/spec/spec_helper.rb +1 -19
  39. data/plugins/auto_completer/features/auto_complete.feature +7 -7
  40. data/plugins/auto_completer/features/step_definitions/auto_complete_steps.rb +3 -1
  41. data/plugins/auto_completer/features/step_definitions/dependency_steps.rb +0 -0
  42. data/plugins/auto_indenter/features/java_style_indentation.feature +5 -3
  43. data/plugins/auto_indenter/features/ruby_style_indentation.feature +13 -13
  44. data/plugins/auto_indenter/features/step_definitions/indentation_steps.rb +3 -1
  45. data/plugins/auto_indenter/spec/auto_indenter/analyzer_spec.rb +1 -1
  46. data/plugins/auto_indenter/spec/spec_helper.rb +1 -5
  47. data/plugins/auto_pairer/features/auto_pairer.feature +1 -1
  48. data/plugins/comment/features/line_comment.feature +31 -26
  49. data/plugins/comment/features/selection_comment.feature +1 -1
  50. data/plugins/comment/features/step_definitions/comment_steps.rb +6 -2
  51. data/plugins/comment/vendor/comment_lib.json +2 -0
  52. data/plugins/core/lib/core.rb +26 -0
  53. data/plugins/core/spec/core/base_storage_spec.rb +1 -1
  54. data/plugins/core/spec/core/gui_spec.rb +1 -1
  55. data/plugins/core/spec/core/observable_spec.rb +2 -1
  56. data/plugins/core/spec/core/persistent_cache_spec.rb +1 -1
  57. data/plugins/core/spec/core/shared_storage_spec.rb +1 -1
  58. data/plugins/core/spec/core/storage_spec.rb +1 -1
  59. data/plugins/core/spec/core/task_queue_spec.rb +1 -3
  60. data/plugins/core/spec/spec_helper.rb +1 -4
  61. data/plugins/declarations/spec/declarations/file_spec.rb +1 -1
  62. data/plugins/declarations/spec/spec_helper.rb +1 -5
  63. data/plugins/document_search/features/find.feature +39 -39
  64. data/plugins/document_search/features/step_definitions/find_steps.rb +6 -2
  65. data/plugins/edit_view/features/align_assignment.feature +6 -82
  66. data/plugins/edit_view/features/case_change.feature +22 -22
  67. data/plugins/edit_view/features/cursor_navigation.feature +2 -2
  68. data/plugins/edit_view/features/cut_and_paste.feature +9 -9
  69. data/plugins/edit_view/features/indentation_commands.feature +8 -8
  70. data/plugins/edit_view/features/line_delimiter.feature +7 -7
  71. data/plugins/edit_view/features/multiple_windows.feature +48 -48
  72. data/plugins/edit_view/features/step_definitions/dependency_steps.rb +0 -0
  73. data/plugins/edit_view/features/step_definitions/editing_steps.rb +237 -127
  74. data/plugins/edit_view/features/step_definitions/grammar_steps.rb +5 -1
  75. data/plugins/edit_view/features/step_definitions/notebook_steps.rb +38 -24
  76. data/plugins/edit_view/features/step_definitions/tab_steps.rb +83 -45
  77. data/plugins/edit_view/features/step_definitions/window_steps.rb +75 -54
  78. data/plugins/edit_view/features/support/env.rb +4 -23
  79. data/plugins/edit_view/lib/edit_view/commands/align_assignment_command.rb +29 -30
  80. data/plugins/edit_view/lib/edit_view/document.rb +23 -0
  81. data/plugins/edit_view/spec/edit_view/commands/align_assignment_command_spec.rb +83 -0
  82. data/plugins/edit_view/spec/edit_view/document/indentation_spec.rb +1 -1
  83. data/plugins/edit_view/spec/edit_view/document_spec.rb +1 -1
  84. data/plugins/edit_view/spec/spec_helper.rb +1 -4
  85. data/plugins/edit_view_swt/spec/edit_view_swt/word_movement_spec.rb +1 -1
  86. data/plugins/edit_view_swt/spec/spec_helper.rb +1 -4
  87. data/plugins/html_view/features/fixtures/sample.html +1 -1
  88. data/plugins/html_view/features/step_definitions/html_view_steps.rb +40 -39
  89. data/plugins/java/features/syntax_check_java.feature +18 -16
  90. data/plugins/line_tools/features/step_definitions/line_tools_steps.rb +18 -6
  91. data/plugins/macros/features/block_selection_in_macros.feature +47 -47
  92. data/plugins/macros/features/step_definitions/macro_steps.rb +9 -3
  93. data/plugins/macros/features/step_definitions/prediction_steps.rb +6 -2
  94. data/plugins/macros/plugin.rb +2 -1
  95. data/plugins/macros/spec/macros/predictive/sequence_finder_spec.rb +1 -1
  96. data/plugins/macros/spec/spec_helper.rb +1 -6
  97. data/plugins/outline_view/features/outline_view.feature +5 -5
  98. data/plugins/outline_view/features/step_definitions/outline_steps.rb +29 -17
  99. data/plugins/plugin_manager_ui/lib/plugin_manager_ui.rb +1 -1
  100. data/plugins/project/features/close_directory_tree.feature +0 -12
  101. data/plugins/project/features/open_directory_tree.feature +1 -2
  102. data/plugins/project/features/step_definitions/directory_steps.rb +13 -5
  103. data/plugins/project/features/step_definitions/file_steps.rb +23 -9
  104. data/plugins/project/features/step_definitions/find_file_steps.rb +6 -2
  105. data/plugins/project/features/step_definitions/project_tree_steps.rb +6 -2
  106. data/plugins/project/features/watch_for_modified_files.feature +1 -1
  107. data/plugins/project/spec/project/adapters/remote_protocols/ftp_spec.rb +1 -1
  108. data/plugins/project/spec/project/adapters/remote_protocols/sftp_spec.rb +1 -1
  109. data/plugins/project/spec/project/adapters/remote_spec.rb +1 -1
  110. data/plugins/project/spec/project/dir_mirror_spec.rb +1 -1
  111. data/plugins/project/spec/project/file_list_spec.rb +1 -1
  112. data/plugins/project/spec/project/file_mirror_spec.rb +2 -1
  113. data/plugins/project/spec/spec_helper.rb +1 -4
  114. data/plugins/project_search/spec/project_search/binary_data_detector_spec.rb +1 -1
  115. data/plugins/project_search/spec/project_search/word_search_spec.rb +1 -1
  116. data/plugins/project_search/spec/spec_helper.rb +1 -4
  117. data/plugins/{application → redcar}/features/navigation_history.feature +8 -8
  118. data/plugins/redcar/features/step_definitions/font_steps.rb +9 -5
  119. data/plugins/redcar/redcar.rb +0 -26
  120. data/plugins/repl/features/step_definitions/repl_steps.rb +15 -5
  121. data/plugins/repl/plugin.rb +1 -1
  122. data/plugins/repl/spec/repl/repl_mirror_spec.rb +1 -1
  123. data/plugins/repl/spec/spec_helper.rb +1 -4
  124. data/plugins/ruby/spec/ruby/repl_mirror_spec.rb +1 -1
  125. data/plugins/ruby/spec/spec_helper.rb +1 -5
  126. data/plugins/runnables/features/parameter_input.feature +43 -43
  127. data/plugins/runnables/features/step_definitions/runnable_steps.rb +9 -3
  128. data/plugins/runnables/plugin.rb +2 -2
  129. data/plugins/runnables/spec/runnables/output_processor_spec.rb +1 -1
  130. data/plugins/runnables/spec/spec_helper.rb +1 -5
  131. data/plugins/scm_svn/features/add_and_commit.feature +1 -0
  132. data/plugins/scm_svn/features/checkout.feature +1 -0
  133. data/plugins/scm_svn/features/edit_and_index.feature +1 -0
  134. data/plugins/scm_svn/features/ignore_files.feature +1 -0
  135. data/plugins/scm_svn/features/merge.feature +1 -0
  136. data/plugins/scm_svn/features/resolve_conflict.feature +1 -0
  137. data/plugins/scm_svn/features/revert_and_delete.feature +1 -0
  138. data/plugins/scm_svn/features/step_definitions/branch_and_merge_steps.rb +14 -9
  139. data/plugins/scm_svn/features/support/env.rb +4 -4
  140. data/plugins/scm_svn/features/switch_branches.feature +1 -0
  141. data/plugins/scm_svn/features/update.feature +1 -0
  142. data/plugins/strip_trailing_spaces/features/strip_trailing_spaces.feature +4 -4
  143. data/plugins/test_runner/plugin.rb +3 -1
  144. data/plugins/test_runner/spec/run_test_command_spec.rb +58 -50
  145. data/plugins/test_runner/spec/spec_helper.rb +1 -5
  146. data/plugins/textmate/features/step_definitions/tree_steps.rb +2 -0
  147. data/plugins/todo_list/features/todo_list.feature +1 -1
  148. data/plugins/todo_list/spec/spec_helper.rb +1 -4
  149. data/plugins/todo_list/spec/todo_list/file_parser_spec.rb +1 -1
  150. data/plugins/tree_view_swt/lib/tree_view_swt.rb +2 -1
  151. data/plugins/web_bookmarks/features/step_definitions/web_steps.rb +1 -1
  152. metadata +48 -48
  153. data/lib/redcar/installer.rb +0 -178
  154. data/plugins/key_bindings/spec/spec_helper.rb +0 -5
  155. data/plugins/scm/spec/spec_helper.rb +0 -5
@@ -1,48 +1,48 @@
1
- #Feature: Block selection in macros
2
- # The macros should behave correctly around block selection mode.
3
- #
4
- # Background:
5
- # When I open a new edit tab
6
- # Given the content is:
7
- # """
8
- # foo
9
- # bar
10
- # baz
11
- # """
12
- # And I move to the start of the text
13
- #
14
- # Scenario: Set the correct block selection mode before running the macro
15
- # When I turn block selection on
16
- # And I start recording a macro
17
- # And I select down
18
- # And I select down
19
- # And I type "a"
20
- # And I stop recording a macro
21
- # And I turn block selection off
22
- # And I move to the start of the text
23
- # And I run the last recorded macro
24
- # Then the content should be:
25
- # """
26
- # aafoo
27
- # aabar
28
- # aabaz
29
- # """
30
- #
31
- # Scenario: Change block selection mode during the macro
32
- # And I start recording a macro
33
- # When I turn block selection on
34
- # And I select down
35
- # And I select down
36
- # And I type "a"
37
- # And I stop recording a macro
38
- # And I turn block selection off
39
- # And I move to the start of the text
40
- # And I run the last recorded macro
41
- # Then the content should be:
42
- # """
43
- # aafoo
44
- # aabar
45
- # aabaz
46
- # """
47
- #
1
+ Feature: Block selection in macros
2
+ The macros should behave correctly around block selection mode.
3
+
4
+ Background:
5
+ When I open a new edit tab
6
+ Given the content is:
7
+ """
8
+ foo
9
+ bar
10
+ baz
11
+ """
12
+ And I move to the start of the text
13
+
14
+ Scenario: Set the correct block selection mode before running the macro
15
+ When I turn block selection on
16
+ And I start recording a macro
17
+ And I select down
18
+ And I select down
19
+ And I type "a"
20
+ And I stop recording a macro
21
+ And I turn block selection off
22
+ And I move to the start of the text
23
+ And I run the last recorded macro
24
+ Then the content should be:
25
+ """
26
+ aafoo
27
+ aabar
28
+ aabaz
29
+ """
30
+
31
+ Scenario: Change block selection mode during the macro
32
+ And I start recording a macro
33
+ When I turn block selection on
34
+ And I select down
35
+ And I select down
36
+ And I type "a"
37
+ And I stop recording a macro
38
+ And I turn block selection off
39
+ And I move to the start of the text
40
+ And I run the last recorded macro
41
+ Then the content should be:
42
+ """
43
+ aafoo
44
+ aabar
45
+ aabaz
46
+ """
47
+
48
48
 
@@ -1,11 +1,17 @@
1
1
  When /I start recording a macro/ do
2
- Redcar::Macros::StartStopRecordingCommand.new.run(:env => {:tab => implicit_edit_tab})
2
+ Swt.sync_exec do
3
+ Redcar::Macros::StartStopRecordingCommand.new.run(:env => {:tab => implicit_edit_tab})
4
+ end
3
5
  end
4
6
 
5
7
  When /I stop recording a macro/ do
6
- Redcar::Macros::StartStopRecordingCommand.new.run(:env => {:tab => implicit_edit_tab})
8
+ Swt.sync_exec do
9
+ Redcar::Macros::StartStopRecordingCommand.new.run(:env => {:tab => implicit_edit_tab})
10
+ end
7
11
  end
8
12
 
9
13
  When /I run the last recorded macro/ do
10
- Redcar::Macros::RunLastCommand.new.run(:env => {:edit_view => implicit_edit_view})
14
+ Swt.sync_exec do
15
+ Redcar::Macros::RunLastCommand.new.run(:env => {:edit_view => implicit_edit_view})
16
+ end
11
17
  end
@@ -1,8 +1,12 @@
1
1
  When /^I press predict$/ do
2
- Redcar::Macros::PredictCommand.new.run
2
+ Swt.sync_exec do
3
+ Redcar::Macros::PredictCommand.new.run
4
+ end
3
5
  end
4
6
 
5
7
  When /^I press alternate predict$/ do
6
- Redcar::Macros::AlternatePredictCommand.new.run
8
+ Swt.sync_exec do
9
+ Redcar::Macros::AlternatePredictCommand.new.run
10
+ end
7
11
  end
8
12
 
@@ -5,5 +5,6 @@ Plugin.define do
5
5
  file "lib", "macros"
6
6
  object "Redcar::Macros"
7
7
  dependencies "application", ">0",
8
- "edit_view", ">0"
8
+ "edit_view", ">0",
9
+ "HTML View", ">0"
9
10
  end
@@ -1,5 +1,5 @@
1
1
 
2
- require File.dirname(__FILE__) + '/../../spec_helper'
2
+ require "spec_helper"
3
3
 
4
4
  describe Redcar::Macros::Predictive::SequenceFinder do
5
5
  SequenceFinder = Redcar::Macros::Predictive::SequenceFinder
@@ -1,6 +1 @@
1
-
2
- $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
3
- require 'redcar'
4
- Redcar.environment = :test
5
- Redcar.no_gui_mode!
6
- Redcar.load_unthreaded
1
+ Redcar.plugin_manager.load("macros")
@@ -33,12 +33,12 @@ Scenario: Something fancier
33
33
  And the outline view should have 88 entries
34
34
  And I should see "Redcar" at 0 with the "class" icon in the outline view
35
35
  When I set the outline filter to "delim"
36
- And I wait 2 seconds
36
+ And I wait "2" seconds
37
37
  Then the outline view should have 2 entries
38
38
  And I should see "delim" at 1 with the "alias" icon in the outline view
39
39
  And I should see "line_delimiter" at 0 with the "method" icon in the outline view
40
40
  When I set the outline filter to "selected"
41
- And I wait 2 seconds
41
+ And I wait "2" seconds
42
42
  Then the outline view should have 2 entries
43
43
  And I should see "selection_range_changed" at 0 with the "method" icon in the outline view
44
44
  And I should see "selected_text" at 1 with the "method" icon in the outline view
@@ -57,7 +57,7 @@ Scenario: Matching kinda similar names
57
57
  And I should see "file_handle" at 4 with the "method" icon in the outline view
58
58
  And I should see "file" at 5 with the "method" icon in the outline view
59
59
  When I set the outline filter to "file"
60
- And I wait 2 seconds
60
+ And I wait "2" seconds
61
61
  Then the outline view should have 5 entries
62
62
 
63
63
  Scenario: Simple Javascript
@@ -67,12 +67,12 @@ Scenario: Simple Javascript
67
67
  And the outline view should have 3 entries
68
68
  And I should see "SomeConstructor" at 0 with the "class" icon in the outline view
69
69
  When I set the outline filter to "some"
70
- And I wait 2 seconds
70
+ And I wait "2" seconds
71
71
  Then the outline view should have 2 entries
72
72
  And I should see "someMethod" at 1 with the "method" icon in the outline view
73
73
  And I should see "SomeConstructor" at 0 with the "class" icon in the outline view
74
74
  When I set the outline filter to "another"
75
- And I wait 2 seconds
75
+ And I wait "2" seconds
76
76
  Then the outline view should have 1 entry
77
77
  And I should see "anotherMethod" at 0 with the "method" icon in the outline view
78
78
  And I select the outline view
@@ -3,43 +3,55 @@ def outline_view
3
3
  end
4
4
 
5
5
  def outline_view_items
6
- outline_view.list.get_items.to_a
6
+ Swt.sync_exec do
7
+ outline_view.list.get_items.to_a
8
+ end
7
9
  end
8
10
 
9
11
  Then /^I open an outline view$/ do
10
- Redcar::OutlineView::OutlineViewDialog.new(Redcar.app.focussed_window.focussed_notebook_tab.document).open
12
+ Swt.sync_exec do
13
+ Redcar::OutlineView::OutlineViewDialog.new(Redcar.app.focussed_window.focussed_notebook_tab.document).open
14
+ end
11
15
  end
12
16
 
13
17
  Then /^there should be an outline view open$/ do
14
- outline_view.should_not be_nil
18
+ Swt.sync_exec do
19
+ outline_view.should_not be_nil
20
+ end
15
21
  end
16
22
 
17
23
  Then /^there should be no outline view open$/ do
18
- outline_view.should be_nil
24
+ Swt.sync_exec do
25
+ outline_view.should be_nil
26
+ end
19
27
  end
20
28
 
21
29
  When /^I set the outline filter to "(.*)"$/ do |text|
22
- outline_view.text.set_text(text)
30
+ Swt.sync_exec do
31
+ outline_view.text.set_text(text)
32
+ end
23
33
  end
24
34
 
25
35
  When /^I select the outline view$/ do
26
- outline_view.controller.selected
27
- end
28
-
29
- When /^I wait (\d+) seconds$/ do |time|
30
- Cucumber::Ast::StepInvocation.wait_time = time.to_f
36
+ Swt.sync_exec do
37
+ outline_view.controller.selected
38
+ end
31
39
  end
32
40
 
33
41
  Then /^the outline view should have (no|\d+) entr(?:y|ies)$/ do |num|
34
- num = (num == "no" ? 0 : num.to_i)
35
- outline_view_items.length.should == num
42
+ Swt.sync_exec do
43
+ num = (num == "no" ? 0 : num.to_i)
44
+ outline_view_items.length.should == num
45
+ end
36
46
  end
37
47
 
38
48
  Then /^I should see "(.*)" at (\d+)(?: with the "(.*)" icon )in the outline view$/ do |text, pos, icon|
39
- pos = pos.to_i
40
- outline_view_items[pos].text.should == text
41
- icon = Redcar::OutlineViewSWT::ICONS[icon.to_sym]
42
- item = outline_view_items[pos]
43
- item.get_image.should == icon
49
+ Swt.sync_exec do
50
+ pos = pos.to_i
51
+ outline_view_items[pos].text.should == text
52
+ icon = Redcar::OutlineViewSWT::ICONS[icon.to_sym]
53
+ item = outline_view_items[pos]
54
+ item.get_image.should == icon
55
+ end
44
56
  end
45
57
 
@@ -55,7 +55,7 @@ module Redcar
55
55
  class ReloadPluginsCommand < Redcar::Command
56
56
  def execute
57
57
  Redcar.add_plugin_sources(Redcar.plugin_manager)
58
- Redcar.plugin_manager.load_maximal
58
+ Redcar.plugin_manager.load_maximal
59
59
  end
60
60
  end
61
61
 
@@ -1,22 +1,12 @@
1
1
  @project-fixtures
2
2
  Feature: Close directory tree
3
3
 
4
- Scenario: Close and re-open directory stays in the same window
5
- Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
6
- When I open a directory
7
- Then there should be 1 windows
8
- When I close the directory
9
- When I open a directory
10
- Then there should be 1 windows
11
-
12
4
  Scenario: Close directory via close icon
13
5
  Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
14
6
  When I open a directory
15
7
  And I click the close button
16
8
  Then the tree width should be the minimum size
17
9
  And the window should have title "Redcar"
18
- When I open a directory
19
- Then there should be 1 windows
20
10
 
21
11
  Scenario: Close directory via "Close Tree" menu item
22
12
  Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
@@ -24,5 +14,3 @@ Feature: Close directory tree
24
14
  And I close the tree
25
15
  Then the tree width should be the minimum size
26
16
  And the window should have title "Redcar"
27
- When I open a directory
28
- Then there should be 1 windows
@@ -22,8 +22,7 @@ Feature: Open directory tree
22
22
  Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
23
23
  When I open a directory
24
24
  And I open "plugins/project/spec/fixtures/myproject" using the redcar command
25
- Then there should be 1 windows
26
- And the window should have title "myproject"
25
+ Then the window should have title "myproject"
27
26
 
28
27
  Scenario: Title of window reflects open project
29
28
  Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
@@ -1,14 +1,20 @@
1
1
 
2
2
  When /I open a directory/ do
3
- Redcar::Project::DirectoryOpenCommand.new.run
3
+ Swt.sync_exec do
4
+ Redcar::Project::DirectoryOpenCommand.new.run
5
+ end
4
6
  end
5
7
 
6
8
  When /I close the directory/ do
7
- Redcar::Project::Manager.focussed_project.close
9
+ Swt.sync_exec do
10
+ Redcar::Project::Manager.focussed_project.close
11
+ end
8
12
  end
9
13
 
10
14
  When /^I refresh the directory tree$/ do
11
- Redcar::Project::Manager.focussed_project.refresh
15
+ Swt.sync_exec do
16
+ Redcar::Project::Manager.focussed_project.refresh
17
+ end
12
18
  end
13
19
 
14
20
  When /^I move the myproject fixture away$/ do
@@ -18,8 +24,10 @@ When /^I move the myproject fixture away$/ do
18
24
  end
19
25
 
20
26
  When /^I open a "([^"]*)" as a subproject of the current directory$/ do |arg1|
21
- path = Redcar::Project::Manager.focussed_project.path
22
- Redcar::Project::Manager.open_subproject(path,path + arg1)
27
+ Swt.sync_exec do
28
+ path = Redcar::Project::Manager.focussed_project.path
29
+ Redcar::Project::Manager.open_subproject(path,path + arg1)
30
+ end
23
31
  end
24
32
 
25
33
  Then /^"([^"]*)" in the project configuration files$/ do |arg1|
@@ -1,28 +1,40 @@
1
1
 
2
2
  Given /^I have open a file$/ do
3
- Redcar::Project::OpenFileCommand.new.run
3
+ Swt.sync_exec do
4
+ Redcar::Project::OpenFileCommand.new.run
5
+ end
4
6
  end
5
7
 
6
8
  Given /^I will open a large file from the "([^"]*)" dialog$/ do |arg1|
7
- Given %Q|I will choose "plugins/project/spec/fixtures/winter.txt" from the "open_file" dialog|
8
- Redcar::Project::Manager.file_size_limit = 1
9
+ Swt.sync_exec do
10
+ Given %Q|I will choose "plugins/project/spec/fixtures/winter.txt" from the "open_file" dialog|
11
+ Redcar::Project::Manager.file_size_limit = 1
12
+ end
9
13
  end
10
14
 
11
15
  When /^I open a file$/ do
12
- Redcar::Project::OpenFileCommand.new.run
16
+ Swt.sync_exec do
17
+ Redcar::Project::OpenFileCommand.new.run
18
+ end
13
19
  end
14
20
 
15
21
  Given /^I have opened "([^\"]*)"$/ do |arg1|
16
- Redcar::Project::OpenFileCommand.new(File.expand_path(arg1)).run
22
+ Swt.sync_exec do
23
+ Redcar::Project::OpenFileCommand.new(File.expand_path(arg1)).run
24
+ end
17
25
  end
18
26
 
19
27
  Given /^I have opened "([^\"]*)" from the project$/ do |arg1|
20
- project = Redcar::Project::Manager.focussed_project
21
- Redcar::Project::OpenFileCommand.new(project.path + "/" + arg1).run
28
+ Swt.sync_exec do
29
+ project = Redcar::Project::Manager.focussed_project
30
+ Redcar::Project::OpenFileCommand.new(project.path + "/" + arg1).run
31
+ end
22
32
  end
23
33
 
24
34
  When /^I save the tab$/ do
25
- Redcar::Project::SaveFileCommand.new.run
35
+ Swt.sync_exec do
36
+ Redcar::Project::SaveFileCommand.new.run
37
+ end
26
38
  end
27
39
 
28
40
  When /^I touch the file "([^\"]*)"$/ do |fn|
@@ -35,7 +47,9 @@ When /^I put "([^\"]*)" into the file "([^\"]*)"$/ do |contents, path|
35
47
  end
36
48
 
37
49
  When /^I save the tab as$/ do
38
- Redcar::Project::SaveFileAsCommand.new.run
50
+ Swt.sync_exec do
51
+ Redcar::Project::SaveFileAsCommand.new.run
52
+ end
39
53
  end
40
54
 
41
55
  Then /^the file "([^"]*)" should be deletable$/ do |path|
@@ -1,7 +1,11 @@
1
1
  When /^I prefer not to see files like "([^"]*)" in the find file dialog$/ do |pattern|
2
- Redcar::Project::FileList.add_hide_file_pattern(/#{pattern}/)
2
+ Swt.sync_exec do
3
+ Redcar::Project::FileList.add_hide_file_pattern(/#{pattern}/)
4
+ end
3
5
  end
4
6
 
5
7
  When /^I open the find file dialog$/ do
6
- Redcar::Project::FindFileCommand.new.run
8
+ Swt.sync_exec do
9
+ Redcar::Project::FindFileCommand.new.run
10
+ end
7
11
  end
@@ -1,7 +1,11 @@
1
1
  Then /^"([^\"]*)" should be selected in the project tree$/ do |filename|
2
- Redcar::Project::Manager.focussed_project.tree.selection.first.text == filename
2
+ Swt.sync_exec do
3
+ Redcar::Project::Manager.focussed_project.tree.selection.first.text == filename
4
+ end
3
5
  end
4
6
 
5
7
  When /^I prefer to not highlight the focussed tab$/ do
6
- Redcar::Project::Manager.reveal_files = false
8
+ Swt.sync_exec do
9
+ Redcar::Project::Manager.reveal_files = false
10
+ end
7
11
  end
@@ -104,6 +104,6 @@ Feature: Watch for modified files
104
104
  And I focus the window "Redcar" through the gui
105
105
  Then my active tab should have an "exclamation" icon
106
106
  When I save the tab
107
- Then my active tab should have an "file" icon
107
+ Then my active tab should have an "document_attribute_t" icon
108
108
 
109
109