redcar-dev 0.12.17dev → 0.12.18dev

data/plugins/macros/features/block_selection_in_macros.feature

@@ -1,48 +1,48 @@
-#Feature: Block selection in macros
-#  The macros should behave correctly around block selection mode.
-#
-#  Background:
-#    When I open a new edit tab
-#    Given the content is:
-#        """
-#        foo
-#        bar
-#        baz
-#        """
-#    And I move to the start of the text
-#    
-#  Scenario: Set the correct block selection mode before running the macro
-#    When I turn block selection on
-#    And I start recording a macro
-#    And I select down
-#    And I select down
-#    And I type "a"
-#    And I stop recording a macro
-#    And I turn block selection off
-#    And I move to the start of the text
-#    And I run the last recorded macro
-#    Then the content should be:
-#        """
-#        aafoo
-#        aabar
-#        aabaz
-#        """
-#        
-#  Scenario: Change block selection mode during the macro
-#    And I start recording a macro
-#    When I turn block selection on
-#    And I select down
-#    And I select down
-#    And I type "a"
-#    And I stop recording a macro
-#    And I turn block selection off
-#    And I move to the start of the text
-#    And I run the last recorded macro
-#    Then the content should be:
-#        """
-#        aafoo
-#        aabar
-#        aabaz
-#        """
-#
+Feature: Block selection in macros
+ The macros should behave correctly around block selection mode.
+
+ Background:
+   When I open a new edit tab
+   Given the content is:
+       """
+       foo
+       bar
+       baz
+       """
+   And I move to the start of the text
+   
+ Scenario: Set the correct block selection mode before running the macro
+   When I turn block selection on
+   And I start recording a macro
+   And I select down
+   And I select down
+   And I type "a"
+   And I stop recording a macro
+   And I turn block selection off
+   And I move to the start of the text
+   And I run the last recorded macro
+   Then the content should be:
+       """
+       aafoo
+       aabar
+       aabaz
+       """
+       
+ Scenario: Change block selection mode during the macro
+   And I start recording a macro
+   When I turn block selection on
+   And I select down
+   And I select down
+   And I type "a"
+   And I stop recording a macro
+   And I turn block selection off
+   And I move to the start of the text
+   And I run the last recorded macro
+   Then the content should be:
+       """
+       aafoo
+       aabar
+       aabaz
+       """
+
     

data/plugins/macros/features/step_definitions/macro_steps.rb

@@ -1,11 +1,17 @@
 When /I start recording a macro/ do
-  Redcar::Macros::StartStopRecordingCommand.new.run(:env => {:tab => implicit_edit_tab})
+  Swt.sync_exec do
+    Redcar::Macros::StartStopRecordingCommand.new.run(:env => {:tab => implicit_edit_tab})
+  end
 end
 
 When /I stop recording a macro/ do
-  Redcar::Macros::StartStopRecordingCommand.new.run(:env => {:tab => implicit_edit_tab})
+  Swt.sync_exec do
+    Redcar::Macros::StartStopRecordingCommand.new.run(:env => {:tab => implicit_edit_tab})
+  end
 end
 
 When /I run the last recorded macro/ do
-  Redcar::Macros::RunLastCommand.new.run(:env => {:edit_view => implicit_edit_view})
+  Swt.sync_exec do
+    Redcar::Macros::RunLastCommand.new.run(:env => {:edit_view => implicit_edit_view})
+  end
 end

data/plugins/macros/features/step_definitions/prediction_steps.rb

@@ -1,8 +1,12 @@
 When /^I press predict$/ do
-  Redcar::Macros::PredictCommand.new.run
+  Swt.sync_exec do
+    Redcar::Macros::PredictCommand.new.run
+  end
 end
 
 When /^I press alternate predict$/ do
-  Redcar::Macros::AlternatePredictCommand.new.run
+  Swt.sync_exec do
+    Redcar::Macros::AlternatePredictCommand.new.run
+  end
 end
 

data/plugins/macros/plugin.rb

@@ -5,5 +5,6 @@ Plugin.define do
   file "lib", "macros"
   object "Redcar::Macros"
   dependencies "application", ">0",
-              "edit_view",   ">0"
+              "edit_view",   ">0",
+              "HTML View",   ">0"
 end

data/plugins/macros/spec/macros/predictive/sequence_finder_spec.rb

@@ -1,5 +1,5 @@
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require "spec_helper"
 
 describe Redcar::Macros::Predictive::SequenceFinder do
   SequenceFinder = Redcar::Macros::Predictive::SequenceFinder

data/plugins/macros/spec/spec_helper.rb

@@ -1,6 +1 @@
-
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-require 'redcar'
-Redcar.environment = :test
-Redcar.no_gui_mode!
-Redcar.load_unthreaded
+Redcar.plugin_manager.load("macros")

data/plugins/outline_view/features/outline_view.feature

@@ -33,12 +33,12 @@ Scenario: Something fancier
   And the outline view should have 88 entries
   And I should see "Redcar" at 0 with the "class" icon in the outline view
   When I set the outline filter to "delim"
-  And I wait 2 seconds
+  And I wait "2" seconds
   Then the outline view should have 2 entries
   And I should see "delim" at 1 with the "alias" icon in the outline view
   And I should see "line_delimiter" at 0 with the "method" icon in the outline view
   When I set the outline filter to "selected"
-  And I wait 2 seconds
+  And I wait "2" seconds
   Then the outline view should have 2 entries
   And I should see "selection_range_changed" at 0 with the "method" icon in the outline view
   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
   And I should see "file_handle" at 4 with the "method" icon in the outline view
   And I should see "file" at 5 with the "method" icon in the outline view
   When I set the outline filter to "file"
-  And I wait 2 seconds
+  And I wait "2" seconds
   Then the outline view should have 5 entries
 
 Scenario: Simple Javascript
@@ -67,12 +67,12 @@ Scenario: Simple Javascript
   And the outline view should have 3 entries
   And I should see "SomeConstructor" at 0 with the "class" icon in the outline view
   When I set the outline filter to "some"
-  And I wait 2 seconds
+  And I wait "2" seconds
   Then the outline view should have 2 entries
   And I should see "someMethod" at 1 with the "method" icon in the outline view
   And I should see "SomeConstructor" at 0 with the "class" icon in the outline view
   When I set the outline filter to "another"
-  And I wait 2 seconds
+  And I wait "2" seconds
   Then the outline view should have 1 entry
   And I should see "anotherMethod" at 0 with the "method" icon in the outline view
   And I select the outline view

data/plugins/outline_view/features/step_definitions/outline_steps.rb

@@ -3,43 +3,55 @@ def outline_view
 end
 
 def outline_view_items
-  outline_view.list.get_items.to_a
+  Swt.sync_exec do
+    outline_view.list.get_items.to_a
+  end
 end
 
 Then /^I open an outline view$/ do
-  Redcar::OutlineView::OutlineViewDialog.new(Redcar.app.focussed_window.focussed_notebook_tab.document).open
+  Swt.sync_exec do
+    Redcar::OutlineView::OutlineViewDialog.new(Redcar.app.focussed_window.focussed_notebook_tab.document).open
+  end
 end
 
 Then /^there should be an outline view open$/ do
-  outline_view.should_not be_nil
+  Swt.sync_exec do
+    outline_view.should_not be_nil
+  end
 end
 
 Then /^there should be no outline view open$/ do
-  outline_view.should be_nil
+  Swt.sync_exec do
+    outline_view.should be_nil
+  end
 end
 
 When /^I set the outline filter to "(.*)"$/ do |text|
-  outline_view.text.set_text(text)
+  Swt.sync_exec do
+    outline_view.text.set_text(text)
+  end
 end
 
 When /^I select the outline view$/ do
-  outline_view.controller.selected
-end
-
-When /^I wait (\d+) seconds$/ do |time|
-  Cucumber::Ast::StepInvocation.wait_time = time.to_f
+  Swt.sync_exec do
+    outline_view.controller.selected
+  end
 end
 
 Then /^the outline view should have (no|\d+) entr(?:y|ies)$/ do |num|
-  num = (num == "no" ? 0 : num.to_i)
-  outline_view_items.length.should == num
+  Swt.sync_exec do
+    num = (num == "no" ? 0 : num.to_i)
+    outline_view_items.length.should == num
+  end
 end
 
 Then /^I should see "(.*)" at (\d+)(?: with the "(.*)" icon )in the outline view$/ do |text, pos, icon|
-  pos = pos.to_i
-  outline_view_items[pos].text.should == text
-  icon = Redcar::OutlineViewSWT::ICONS[icon.to_sym]
-  item = outline_view_items[pos]
-  item.get_image.should == icon
+  Swt.sync_exec do
+    pos = pos.to_i
+    outline_view_items[pos].text.should == text
+    icon = Redcar::OutlineViewSWT::ICONS[icon.to_sym]
+    item = outline_view_items[pos]
+    item.get_image.should == icon
+  end
 end
 

data/plugins/plugin_manager_ui/lib/plugin_manager_ui.rb

@@ -55,7 +55,7 @@ module Redcar
     class ReloadPluginsCommand < Redcar::Command
       def execute
         Redcar.add_plugin_sources(Redcar.plugin_manager)
-	Redcar.plugin_manager.load_maximal
+        Redcar.plugin_manager.load_maximal
       end
     end
 

data/plugins/project/features/close_directory_tree.feature

@@ -1,22 +1,12 @@
 @project-fixtures
 Feature: Close directory tree
 
-  Scenario: Close and re-open directory stays in the same window
-    Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
-    When I open a directory
-    Then there should be 1 windows
-    When I close the directory
-    When I open a directory
-    Then there should be 1 windows
-
   Scenario: Close directory via close icon
     Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
     When I open a directory
     And I click the close button
     Then the tree width should be the minimum size
     And the window should have title "Redcar"
-    When I open a directory
-    Then there should be 1 windows
 
   Scenario: Close directory via "Close Tree" menu item
     Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
@@ -24,5 +14,3 @@ Feature: Close directory tree
     And I close the tree
     Then the tree width should be the minimum size
     And the window should have title "Redcar"
-    When I open a directory
-    Then there should be 1 windows

data/plugins/project/features/open_directory_tree.feature

@@ -22,8 +22,7 @@ Feature: Open directory tree
     Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog
     When I open a directory
     And I open "plugins/project/spec/fixtures/myproject" using the redcar command
-    Then there should be 1 windows
-    And the window should have title "myproject"
+    Then the window should have title "myproject"
 
   Scenario: Title of window reflects open project
     Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog

data/plugins/project/features/step_definitions/directory_steps.rb

@@ -1,14 +1,20 @@
 
 When /I open a directory/ do
-  Redcar::Project::DirectoryOpenCommand.new.run
+  Swt.sync_exec do
+    Redcar::Project::DirectoryOpenCommand.new.run
+  end
 end
 
 When /I close the directory/ do
-  Redcar::Project::Manager.focussed_project.close
+  Swt.sync_exec do
+    Redcar::Project::Manager.focussed_project.close
+  end
 end
 
 When /^I refresh the directory tree$/ do
-  Redcar::Project::Manager.focussed_project.refresh
+  Swt.sync_exec do
+    Redcar::Project::Manager.focussed_project.refresh
+  end
 end
 
 When /^I move the myproject fixture away$/ do
@@ -18,8 +24,10 @@ When /^I move the myproject fixture away$/ do
 end
 
 When /^I open a "([^"]*)" as a subproject of the current directory$/ do |arg1|
-  path = Redcar::Project::Manager.focussed_project.path
-  Redcar::Project::Manager.open_subproject(path,path + arg1)
+  Swt.sync_exec do
+    path = Redcar::Project::Manager.focussed_project.path
+    Redcar::Project::Manager.open_subproject(path,path + arg1)
+  end
 end
 
 Then /^"([^"]*)" in the project configuration files$/ do |arg1|

data/plugins/project/features/step_definitions/file_steps.rb

@@ -1,28 +1,40 @@
 
 Given /^I have open a file$/ do
-  Redcar::Project::OpenFileCommand.new.run
+  Swt.sync_exec do
+    Redcar::Project::OpenFileCommand.new.run
+  end
 end
 
 Given /^I will open a large file from the "([^"]*)" dialog$/ do |arg1|
-  Given %Q|I will choose "plugins/project/spec/fixtures/winter.txt" from the "open_file" dialog|
-  Redcar::Project::Manager.file_size_limit = 1
+  Swt.sync_exec do
+    Given %Q|I will choose "plugins/project/spec/fixtures/winter.txt" from the "open_file" dialog|
+    Redcar::Project::Manager.file_size_limit = 1
+  end
 end
 
 When /^I open a file$/ do
-  Redcar::Project::OpenFileCommand.new.run
+  Swt.sync_exec do
+    Redcar::Project::OpenFileCommand.new.run
+  end
 end
 
 Given /^I have opened "([^\"]*)"$/ do |arg1|
-  Redcar::Project::OpenFileCommand.new(File.expand_path(arg1)).run
+  Swt.sync_exec do
+    Redcar::Project::OpenFileCommand.new(File.expand_path(arg1)).run
+  end
 end
 
 Given /^I have opened "([^\"]*)" from the project$/ do |arg1|
-  project = Redcar::Project::Manager.focussed_project
-  Redcar::Project::OpenFileCommand.new(project.path + "/" + arg1).run
+  Swt.sync_exec do
+    project = Redcar::Project::Manager.focussed_project
+    Redcar::Project::OpenFileCommand.new(project.path + "/" + arg1).run
+  end
 end
 
 When /^I save the tab$/ do
-  Redcar::Project::SaveFileCommand.new.run
+  Swt.sync_exec do
+    Redcar::Project::SaveFileCommand.new.run
+  end
 end
 
 When /^I touch the file "([^\"]*)"$/ do |fn|
@@ -35,7 +47,9 @@ When /^I put "([^\"]*)" into the file "([^\"]*)"$/ do |contents, path|
 end
 
 When /^I save the tab as$/ do
-  Redcar::Project::SaveFileAsCommand.new.run
+  Swt.sync_exec do
+    Redcar::Project::SaveFileAsCommand.new.run
+  end
 end
 
 Then /^the file "([^"]*)" should be deletable$/ do |path|

data/plugins/project/features/step_definitions/find_file_steps.rb

@@ -1,7 +1,11 @@
 When /^I prefer not to see files like "([^"]*)" in the find file dialog$/ do |pattern|
-  Redcar::Project::FileList.add_hide_file_pattern(/#{pattern}/)
+  Swt.sync_exec do
+    Redcar::Project::FileList.add_hide_file_pattern(/#{pattern}/)
+  end
 end
 
 When /^I open the find file dialog$/ do
-  Redcar::Project::FindFileCommand.new.run
+  Swt.sync_exec do
+    Redcar::Project::FindFileCommand.new.run
+  end
 end

data/plugins/project/features/step_definitions/project_tree_steps.rb

@@ -1,7 +1,11 @@
 Then /^"([^\"]*)" should be selected in the project tree$/ do |filename|
-  Redcar::Project::Manager.focussed_project.tree.selection.first.text == filename
+  Swt.sync_exec do
+    Redcar::Project::Manager.focussed_project.tree.selection.first.text == filename
+  end
 end
 
 When /^I prefer to not highlight the focussed tab$/ do
-  Redcar::Project::Manager.reveal_files = false
+  Swt.sync_exec do
+    Redcar::Project::Manager.reveal_files = false
+  end
 end

data/plugins/project/features/watch_for_modified_files.feature

@@ -104,6 +104,6 @@ Feature: Watch for modified files
     And I focus the window "Redcar" through the gui
     Then my active tab should have an "exclamation" icon
     When I save the tab
-    Then my active tab should have an "file" icon
+    Then my active tab should have an "document_attribute_t" icon