diff options
Diffstat (limited to 'test/win32ole/available_ole.rb')
-rw-r--r-- | test/win32ole/available_ole.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/win32ole/available_ole.rb b/test/win32ole/available_ole.rb index ebc9baae66..af397e00b5 100644 --- a/test/win32ole/available_ole.rb +++ b/test/win32ole/available_ole.rb @@ -8,7 +8,7 @@ if defined?(WIN32OLE) module_function def sysmon_available? - WIN32OLE_TYPE.new('System Monitor Control', 'SystemMonitor') + WIN32OLE::Type.new('System Monitor Control', 'SystemMonitor') true rescue false @@ -22,18 +22,18 @@ if defined?(WIN32OLE) end def msxml_available? - !WIN32OLE_TYPELIB.typelibs.find { |t| t.name.start_with?('Microsoft XML') }.nil? + !WIN32OLE::TypeLib.typelibs.find { |t| t.name.start_with?('Microsoft XML') }.nil? end def event_param method = if msxml_available? - typelib = WIN32OLE_TYPELIB.typelibs.find { |t| t.name.start_with?('Microsoft XML') } - ole_type = WIN32OLE_TYPE.new(typelib.name, 'IVBSAXContentHandler') - WIN32OLE_METHOD.new(ole_type, 'startElement') + typelib = WIN32OLE::TypeLib.typelibs.find { |t| t.name.start_with?('Microsoft XML') } + ole_type = WIN32OLE::Type.new(typelib.name, 'IVBSAXContentHandler') + WIN32OLE::Method.new(ole_type, 'startElement') elsif ado_available? typelib = WIN32OLE.new('ADODB.Connection').ole_typelib - ole_type = WIN32OLE_TYPE.new(typelib.name, 'Connection') - WIN32OLE_METHOD.new(ole_type, 'WillConnect') + ole_type = WIN32OLE::Type.new(typelib.name, 'Connection') + WIN32OLE::Method.new(ole_type, 'WillConnect') end method && method.params[0] end |