kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 59867: [Backport #13894]

Browse source 
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
This commit is contained in:
usa 2018-03-18 14:30:49 +00:00
parent d9a7903c66
commit 1521768c2c
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 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] fix the case High Sierra's mincore(2) may return -128 [Bug #13895]

9
test/win32ole/test_word.rb
View file

@ -8,17 +8,22 @@ rescue LoadError
end end
require "test/unit" require "test/unit"
if defined?(WIN32OLE)
module Word; end
end
def word_installed? def word_installed?
installed = false installed = false
w = nil w = nil
if defined?(WIN32OLE) if defined?(WIN32OLE)
begin begin
w = WIN32OLE.new('Word.Application') w = WIN32OLE.new('Word.Application')
WIN32OLE.const_load(w, Word)
installed = true installed = true
rescue rescue
ensure ensure
if w if w
w.quit w.quit(Word::WdDoNotSaveChanges)
w = nil w = nil
end end
end end
@ -59,7 +64,7 @@ if defined?(WIN32OLE)
def teardown def teardown
if @obj if @obj
@obj.quit @obj.quit(Word::WdDoNotSaveChanges)
@obj = nil @obj = nil
end end
end end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.7" #define RUBY_VERSION "2.3.7"
#define RUBY_RELEASE_DATE "2018-03-18" #define RUBY_RELEASE_DATE "2018-03-18"
#define RUBY_PATCHLEVEL 413 #define RUBY_PATCHLEVEL 414
#define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3