summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-18 14:30:49 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-18 14:30:49 +0000
commit1521768c2cb352b59aaee061c0ae8e3057c5dc4f (patch)
tree0bc39a65ce6936384b0f06653a49fa4c6dc5ea82 /test
parentd9a7903c66173bead84bc01fd63a12fce4a32dd4 (diff)
merge revision(s) 59867: [Backport #13894]
test/win32ole/test_word.rb: word quit without confirmation dialog to save files. [Bug #13894] Thanks to h.shirosaki. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/win32ole/test_word.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/test/win32ole/test_word.rb b/test/win32ole/test_word.rb
index 03b0bcbdde..b1cdb273cc 100644
--- a/test/win32ole/test_word.rb
+++ b/test/win32ole/test_word.rb
@@ -8,17 +8,22 @@ rescue LoadError
end
require "test/unit"
+if defined?(WIN32OLE)
+ module Word; end
+end
+
def word_installed?
installed = false
w = nil
if defined?(WIN32OLE)
begin
w = WIN32OLE.new('Word.Application')
+ WIN32OLE.const_load(w, Word)
installed = true
rescue
ensure
if w
- w.quit
+ w.quit(Word::WdDoNotSaveChanges)
w = nil
end
end
@@ -59,7 +64,7 @@ if defined?(WIN32OLE)
def teardown
if @obj
- @obj.quit
+ @obj.quit(Word::WdDoNotSaveChanges)
@obj = nil
end
end