Fix leaking globals ($VERBOSE and $DEBUG) in Windows' specs

This reverts commit 3caf9ce "Suppress WIN32OLE deprecation warnings for the time being" that leads to the following error: ``` An exception occurred during: WIN32OLE#_getproperty gets value D:/a/spec/spec/library/win32ole/win32ole/_getproperty_spec.rb:12 WIN32OLE#_getproperty gets value ERROR LeakError: Globals changed: {:verbose=>false, :debug=>false} to {:verbose=>nil, :debug=>false} D:/a/spec/spec/library/win32ole/win32ole/_getproperty_spec.rb:7:in `block in <top (required)>' D:/a/spec/spec/library/win32ole/win32ole/_getproperty_spec.rb:2:in `<top (required)>' ```
ruby · Jan 6, 2025 · 732f1b7 · 732f1b7
1 parent b27491f
commit 732f1b7
Show file tree

Hide file tree

Showing 75 changed files with 0 additions and 299 deletions.
diff --git a/library/win32ole/fixtures/classes.rb b/library/win32ole/fixtures/classes.rb
@@ -1,9 +1,6 @@
 require 'win32ole'
 
 module WIN32OLESpecs
-  WIN32OLERuntimeError ||= WIN32OLE::RuntimeError
-  WIN32OLE_TYPELIB ||= WIN32OLE::TypeLib
-
   MSXML_AVAILABLE = WIN32OLE_TYPELIB.typelibs.any? { |t| t.name.start_with?('Microsoft XML') }
   SYSTEM_MONITOR_CONTROL_AVAILABLE = WIN32OLE_TYPELIB.typelibs.any? { |t| t.name.start_with?('System Monitor Control') }
 

diff --git a/library/win32ole/win32ole/_getproperty_spec.rb b/library/win32ole/win32ole/_getproperty_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
 
   describe "WIN32OLE#_getproperty" do
@@ -14,6 +12,4 @@
       @dict._getproperty(0, ['key'], [WIN32OLE::VARIANT::VT_BSTR]).should == 'value'
     end
   end
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole/_invoke_spec.rb b/library/win32ole/win32ole/_invoke_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
 
   describe "WIN32OLE#_invoke" do
@@ -21,6 +19,4 @@
 
   end
 
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole/codepage_spec.rb b/library/win32ole/win32ole/codepage_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
 
   describe "WIN32OLE.codepage=" do
@@ -13,6 +11,4 @@
     end
   end
 
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole/connect_spec.rb b/library/win32ole/win32ole/connect_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
 
   describe "WIN32OLE.connect" do
@@ -15,6 +13,4 @@
     end
 
   end
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole/const_load_spec.rb b/library/win32ole/win32ole/const_load_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
 
   describe "WIN32OLE.const_load when passed Shell.Application OLE object" do
@@ -32,6 +30,4 @@ module WIN32OLE_RUBYSPEC; end
     end
   end
 
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole/constants_spec.rb b/library/win32ole/win32ole/constants_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
 
   describe "WIN32OLE class" do
@@ -42,6 +40,4 @@
     end
   end
 
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole/create_guid_spec.rb b/library/win32ole/win32ole/create_guid_spec.rb
@@ -1,14 +1,10 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
 
   describe "WIN32OLE.create_guid" do
     it "generates guid with valid format" do
       WIN32OLE.create_guid.should =~ /^\{[A-Z0-9]{8}\-[A-Z0-9]{4}\-[A-Z0-9]{4}\-[A-Z0-9]{4}\-[A-Z0-9]{12}/
     end
   end
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole/invoke_spec.rb b/library/win32ole/win32ole/invoke_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
 
   describe "WIN32OLE#invoke" do
@@ -14,6 +12,4 @@
       @dict.invoke('Item', 'key').should == 'value'
     end
   end
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole/locale_spec.rb b/library/win32ole/win32ole/locale_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
 
   describe "WIN32OLE.locale" do
@@ -29,6 +27,4 @@
       end
     end
   end
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole/new_spec.rb b/library/win32ole/win32ole/new_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
 
   describe "WIN32OLESpecs.new_ole" do
@@ -25,6 +23,4 @@
 
   end
 
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole/ole_func_methods_spec.rb b/library/win32ole/win32ole/ole_func_methods_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
 
   describe "WIN32OLE#ole_func_methods" do
@@ -21,6 +19,4 @@
       @dict.ole_func_methods.map { |m| m.name }.include?('AddRef').should be_true
     end
   end
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole/ole_get_methods_spec.rb b/library/win32ole/win32ole/ole_get_methods_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
 
   describe "WIN32OLE#ole_get_methods" do
@@ -16,6 +14,4 @@
 
   end
 
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole/ole_method_help_spec.rb b/library/win32ole/win32ole/ole_method_help_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
   require_relative 'shared/ole_method'
 
@@ -10,6 +8,4 @@
 
   end
 
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole/ole_method_spec.rb b/library/win32ole/win32ole/ole_method_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
   require_relative 'shared/ole_method'
 
@@ -10,6 +8,4 @@
 
   end
 
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole/ole_methods_spec.rb b/library/win32ole/win32ole/ole_methods_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
 
   describe "WIN32OLE#ole_methods" do
@@ -21,6 +19,4 @@
       @dict.ole_methods.map { |m| m.name }.include?('AddRef').should be_true
     end
   end
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole/ole_obj_help_spec.rb b/library/win32ole/win32ole/ole_obj_help_spec.rb
@@ -1,8 +1,6 @@
 require_relative "../../../spec_helper"
 
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
 
   describe "WIN32OLE#ole_obj_help" do
@@ -18,6 +16,4 @@
       @dict.ole_obj_help.kind_of?(WIN32OLE_TYPE).should be_true
     end
   end
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole/ole_put_methods_spec.rb b/library/win32ole/win32ole/ole_put_methods_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
 
   describe "WIN32OLE#ole_put_methods" do
@@ -21,6 +19,4 @@
       @dict.ole_put_methods.map { |m| m.name }.include?('Key').should be_true
     end
   end
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole/setproperty_spec.rb b/library/win32ole/win32ole/setproperty_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
   require_relative 'shared/setproperty'
 
@@ -10,6 +8,4 @@
 
   end
 
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole_event/new_spec.rb b/library/win32ole/win32ole_event/new_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
 
   guard -> { WIN32OLESpecs::MSXML_AVAILABLE } do
@@ -33,6 +31,4 @@
       end
     end
   end
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole_event/on_event_spec.rb b/library/win32ole/win32ole_event/on_event_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
   guard -> { WIN32OLESpecs::MSXML_AVAILABLE } do
 
@@ -70,6 +68,4 @@ def handler_spec_alt(*args)
       end
     end
   end
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole_method/dispid_spec.rb b/library/win32ole/win32ole_method/dispid_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require 'win32ole'
 
   describe "WIN32OLE_METHOD#dispid" do
@@ -20,6 +18,4 @@
 
   end
 
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole_method/event_interface_spec.rb b/library/win32ole/win32ole_method/event_interface_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
   guard -> { WIN32OLESpecs::SYSTEM_MONITOR_CONTROL_AVAILABLE } do
 
@@ -28,6 +26,4 @@
     end
   end
 
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole_method/event_spec.rb b/library/win32ole/win32ole_method/event_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require_relative '../fixtures/classes'
   guard -> { WIN32OLESpecs::SYSTEM_MONITOR_CONTROL_AVAILABLE } do
 
@@ -22,6 +20,4 @@
     end
   end
 
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole_method/helpcontext_spec.rb b/library/win32ole/win32ole_method/helpcontext_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require 'win32ole'
 
   describe "WIN32OLE_METHOD#helpcontext" do
@@ -26,6 +24,4 @@
 
   end
 
-ensure
-  $VERBOSE = verbose
 end
diff --git a/library/win32ole/win32ole_method/helpfile_spec.rb b/library/win32ole/win32ole_method/helpfile_spec.rb
@@ -1,7 +1,5 @@
 require_relative "../../../spec_helper"
 platform_is :windows do
-  verbose, $VERBOSE = $VERBOSE, nil
-
   require 'win32ole'
 
   describe "WIN32OLE_METHOD#helpfile" do
@@ -20,6 +18,4 @@
 
   end
 
-ensure
-  $VERBOSE = verbose
 end