summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/win32ole/test_word.rb9
-rw-r--r--version.h2
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 13b0b4d1f5..780f6ad3cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar 18 23:29:14 2018 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * test/win32ole/test_word.rb: word quit without confirmation dialog to
+ save files. [Bug #13894] Thanks to h.shirosaki.
+
Sun Mar 18 23:26:20 2018 NARUSE, Yui <naruse@ruby-lang.org>
fix the case High Sierra's mincore(2) may return -128 [Bug #13895]
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
diff --git a/version.h b/version.h
index f8b3c18943..57d98fd431 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.7"
#define RUBY_RELEASE_DATE "2018-03-18"
-#define RUBY_PATCHLEVEL 413
+#define RUBY_PATCHLEVEL 414
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 3