aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/win32ole/test_folderitem2_invokeverb.rb24
2 files changed, 19 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index c20626e385..772104adf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 16 23:42:56 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * test/win32ole/test_folderitem2_invokeverb.rb (test_invokeverb):
+ run test only when "Create Shortcut (&S)" menu is found.
+ [ruby-core:29550] [Bug #1602]
+
Fri Apr 16 21:52:16 2010 Yusuke Endoh <mame@tsg.ne.jp>
* parse.y (string_content, etc): counts of CMDARG_PUSH and POP were
diff --git a/test/win32ole/test_folderitem2_invokeverb.rb b/test/win32ole/test_folderitem2_invokeverb.rb
index 5a5d475059..e5380cacf7 100644
--- a/test/win32ole/test_folderitem2_invokeverb.rb
+++ b/test/win32ole/test_folderitem2_invokeverb.rb
@@ -60,19 +60,21 @@ if defined?(WIN32OLE)
end
def test_invokeverb
- links = find_link(@dummy_path)
- assert(0, links.size)
+ # this test should run only when "Create Shortcut (&S)"
+ # is found in context menu,
+ if @shortcut
+ links = find_link(@dummy_path)
+ assert(0, links.size)
- assert(@shortcut)
+ # Now create shortcut to @dummy_path
+ arg = WIN32OLE_VARIANT.new(@shortcut)
+ @fi2.InvokeVerb(arg)
- # Now create shortcut to @dummy_path
- arg = WIN32OLE_VARIANT.new(@shortcut)
- @fi2.InvokeVerb(arg)
-
- # Now search shortcut to @dummy_path
- links = find_link(@dummy_path)
- assert(1, links.size)
- @lpath = links[0].path
+ # Now search shortcut to @dummy_path
+ links = find_link(@dummy_path)
+ assert(1, links.size)
+ @lpath = links[0].path
+ end
end
def teardown