diff --git a/library/win32ole/fixtures/classes.rb b/library/win32ole/fixtures/classes.rb index 46e672e66c..f61cf6ba69 100644 --- 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 index f884807131..52cb978bea 100644 --- 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 index 5819aef49c..994c2e6d36 100644 --- 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 index 3a88514798..07e93646ac 100644 --- 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 index 1baccd84e5..ac0976ddc1 100644 --- 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 index f565ad2c30..2099c4aa66 100644 --- 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 index 57f753e4db..8533741440 100644 --- 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 index 66d4feef38..8aa853df9e 100644 --- a/library/win32ole/win32ole/create_guid_spec.rb +++ b/library/win32ole/win32ole/create_guid_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require_relative '../fixtures/classes' describe "WIN32OLE.create_guid" do @@ -9,6 +7,4 @@ 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 index e6b02847b5..d6ff7fade3 100644 --- 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 index 9cc04ed54b..78ede4375a 100644 --- 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 index b6840cf6f1..7e91c2d3ea 100644 --- 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 index 1ee6a26462..2bbe8c27d4 100644 --- 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 index e436bdd195..c1d1970214 100644 --- 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 index 603bf978a9..9cb3f9e6cf 100644 --- 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 index 60f1ebc400..e48ff8d905 100644 --- 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 index 53cc8d5bb9..fe161ce9f0 100644 --- 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 index ecb809bc55..afcf16a051 100644 --- 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 index e4675f383d..c091c83c95 100644 --- 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 index a3e27dbd74..bacdee63da 100644 --- 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 index 939ebd7d8c..94fabb1e3b 100644 --- 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 index 2ced0ef17c..0957bdd2d4 100644 --- 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 index 5d822723ec..ece71df0d4 100644 --- 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 index 3c236f419a..78634d2fde 100644 --- 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 index 8153ca6861..9b642a010c 100644 --- 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 index 1579f3a8d4..d1c5ee3be2 100644 --- 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 index 396d4022af..59dad9244c 100644 --- 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 diff --git a/library/win32ole/win32ole_method/helpstring_spec.rb b/library/win32ole/win32ole_method/helpstring_spec.rb index e4f7826867..b2f24ba151 100644 --- a/library/win32ole/win32ole_method/helpstring_spec.rb +++ b/library/win32ole/win32ole_method/helpstring_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_METHOD#helpstring" do @@ -20,6 +18,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_method/invkind_spec.rb b/library/win32ole/win32ole_method/invkind_spec.rb index 260b18b575..d7fedf0d36 100644 --- a/library/win32ole/win32ole_method/invkind_spec.rb +++ b/library/win32ole/win32ole_method/invkind_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_METHOD#invkind" do @@ -20,6 +18,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_method/invoke_kind_spec.rb b/library/win32ole/win32ole_method/invoke_kind_spec.rb index 407d57eee9..d5536fd17b 100644 --- a/library/win32ole/win32ole_method/invoke_kind_spec.rb +++ b/library/win32ole/win32ole_method/invoke_kind_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_METHOD#invoke_kind" do @@ -20,6 +18,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_method/name_spec.rb b/library/win32ole/win32ole_method/name_spec.rb index fae103feaa..477b820f4d 100644 --- a/library/win32ole/win32ole_method/name_spec.rb +++ b/library/win32ole/win32ole_method/name_spec.rb @@ -2,8 +2,6 @@ require_relative 'shared/name' platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_METHOD#name" do @@ -11,6 +9,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_method/new_spec.rb b/library/win32ole/win32ole_method/new_spec.rb index 95f794cc4a..4e427421b9 100644 --- a/library/win32ole/win32ole_method/new_spec.rb +++ b/library/win32ole/win32ole_method/new_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_METHOD.new" do @@ -33,6 +31,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_method/offset_vtbl_spec.rb b/library/win32ole/win32ole_method/offset_vtbl_spec.rb index 47d616aa55..b3da9a8303 100644 --- a/library/win32ole/win32ole_method/offset_vtbl_spec.rb +++ b/library/win32ole/win32ole_method/offset_vtbl_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_METHOD#offset_vtbl" do @@ -21,6 +19,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_method/params_spec.rb b/library/win32ole/win32ole_method/params_spec.rb index 0833c5a8e7..09fb0eb5ac 100644 --- a/library/win32ole/win32ole_method/params_spec.rb +++ b/library/win32ole/win32ole_method/params_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_METHOD#params" do @@ -28,6 +26,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_method/return_type_detail_spec.rb b/library/win32ole/win32ole_method/return_type_detail_spec.rb index bf7d69f1fc..582a5951d5 100644 --- a/library/win32ole/win32ole_method/return_type_detail_spec.rb +++ b/library/win32ole/win32ole_method/return_type_detail_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_METHOD#return_type_detail" do @@ -21,6 +19,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_method/return_type_spec.rb b/library/win32ole/win32ole_method/return_type_spec.rb index 6d2bc4ffda..dd8add402d 100644 --- a/library/win32ole/win32ole_method/return_type_spec.rb +++ b/library/win32ole/win32ole_method/return_type_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_METHOD#return_type" do @@ -20,6 +18,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_method/return_vtype_spec.rb b/library/win32ole/win32ole_method/return_vtype_spec.rb index 0c84457601..3fca3d54ed 100644 --- a/library/win32ole/win32ole_method/return_vtype_spec.rb +++ b/library/win32ole/win32ole_method/return_vtype_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_METHOD#return_vtype" do @@ -20,6 +18,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_method/size_opt_params_spec.rb b/library/win32ole/win32ole_method/size_opt_params_spec.rb index a4e57e08a8..fe9facb53a 100644 --- a/library/win32ole/win32ole_method/size_opt_params_spec.rb +++ b/library/win32ole/win32ole_method/size_opt_params_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_METHOD#size_opt_params" do @@ -20,6 +18,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_method/size_params_spec.rb b/library/win32ole/win32ole_method/size_params_spec.rb index 979c097c6d..8ea6e61e7d 100644 --- a/library/win32ole/win32ole_method/size_params_spec.rb +++ b/library/win32ole/win32ole_method/size_params_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_METHOD#size_params" do @@ -20,6 +18,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_method/to_s_spec.rb b/library/win32ole/win32ole_method/to_s_spec.rb index e4469958cf..11107a77fc 100644 --- a/library/win32ole/win32ole_method/to_s_spec.rb +++ b/library/win32ole/win32ole_method/to_s_spec.rb @@ -2,8 +2,6 @@ require_relative 'shared/name' platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_METHOD#name" do @@ -11,6 +9,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_method/visible_spec.rb b/library/win32ole/win32ole_method/visible_spec.rb index 5454c0ec4b..d1a50523fc 100644 --- a/library/win32ole/win32ole_method/visible_spec.rb +++ b/library/win32ole/win32ole_method/visible_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_METHOD#visible?" do @@ -20,6 +18,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_param/default_spec.rb b/library/win32ole/win32ole_param/default_spec.rb index 3d5ea47fcd..44bd3d7fd3 100644 --- a/library/win32ole/win32ole_param/default_spec.rb +++ b/library/win32ole/win32ole_param/default_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_PARAM#default" do @@ -31,6 +29,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_param/input_spec.rb b/library/win32ole/win32ole_param/input_spec.rb index f5c81c832f..e9134b1df8 100644 --- a/library/win32ole/win32ole_param/input_spec.rb +++ b/library/win32ole/win32ole_param/input_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_PARAM#input?" do @@ -21,6 +19,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_param/name_spec.rb b/library/win32ole/win32ole_param/name_spec.rb index 91e6fce6dd..67a8955ba4 100644 --- a/library/win32ole/win32ole_param/name_spec.rb +++ b/library/win32ole/win32ole_param/name_spec.rb @@ -2,8 +2,6 @@ require_relative 'shared/name' platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_PARAM#name" do @@ -11,6 +9,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_param/ole_type_detail_spec.rb b/library/win32ole/win32ole_param/ole_type_detail_spec.rb index f78685bc5d..f05455e3f1 100644 --- a/library/win32ole/win32ole_param/ole_type_detail_spec.rb +++ b/library/win32ole/win32ole_param/ole_type_detail_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_PARAM#ole_type_detail" do @@ -21,6 +19,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_param/ole_type_spec.rb b/library/win32ole/win32ole_param/ole_type_spec.rb index 669b8ac0da..1467130e03 100644 --- a/library/win32ole/win32ole_param/ole_type_spec.rb +++ b/library/win32ole/win32ole_param/ole_type_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_PARAM#ole_type" do @@ -21,6 +19,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_param/optional_spec.rb b/library/win32ole/win32ole_param/optional_spec.rb index 452323b78c..b39ee41179 100644 --- a/library/win32ole/win32ole_param/optional_spec.rb +++ b/library/win32ole/win32ole_param/optional_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_PARAM#optional?" do @@ -21,6 +19,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_param/retval_spec.rb b/library/win32ole/win32ole_param/retval_spec.rb index dcf9752038..dd613dd29a 100644 --- a/library/win32ole/win32ole_param/retval_spec.rb +++ b/library/win32ole/win32ole_param/retval_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_PARAM#retval?" do @@ -21,6 +19,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_param/to_s_spec.rb b/library/win32ole/win32ole_param/to_s_spec.rb index 49545a5e7c..e9153a2eb2 100644 --- a/library/win32ole/win32ole_param/to_s_spec.rb +++ b/library/win32ole/win32ole_param/to_s_spec.rb @@ -2,8 +2,6 @@ require_relative 'shared/name' platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_PARAM#to_s" do @@ -11,6 +9,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/guid_spec.rb b/library/win32ole/win32ole_type/guid_spec.rb index 91b91d6e6c..abdf8d34b9 100644 --- a/library/win32ole/win32ole_type/guid_spec.rb +++ b/library/win32ole/win32ole_type/guid_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE#guid for Shell Controls" do @@ -18,6 +16,4 @@ end end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/helpcontext_spec.rb b/library/win32ole/win32ole_type/helpcontext_spec.rb index 4fbbaa0c56..eee23abc56 100644 --- a/library/win32ole/win32ole_type/helpcontext_spec.rb +++ b/library/win32ole/win32ole_type/helpcontext_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE#helpcontext for Shell Controls" do @@ -18,6 +16,4 @@ end end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/helpfile_spec.rb b/library/win32ole/win32ole_type/helpfile_spec.rb index 40ae494fd7..3a0a9ead94 100644 --- a/library/win32ole/win32ole_type/helpfile_spec.rb +++ b/library/win32ole/win32ole_type/helpfile_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE#helpfile for Shell Controls" do @@ -18,6 +16,4 @@ end end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/helpstring_spec.rb b/library/win32ole/win32ole_type/helpstring_spec.rb index d867b2d4b6..9ab0004668 100644 --- a/library/win32ole/win32ole_type/helpstring_spec.rb +++ b/library/win32ole/win32ole_type/helpstring_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE#helpstring for Shell Controls" do @@ -18,6 +16,4 @@ end end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/major_version_spec.rb b/library/win32ole/win32ole_type/major_version_spec.rb index 6c2221d259..7d2731f778 100644 --- a/library/win32ole/win32ole_type/major_version_spec.rb +++ b/library/win32ole/win32ole_type/major_version_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE#major_version for Shell Controls" do @@ -18,6 +16,4 @@ end end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/minor_version_spec.rb b/library/win32ole/win32ole_type/minor_version_spec.rb index 0042b9ac4c..3904e78d42 100644 --- a/library/win32ole/win32ole_type/minor_version_spec.rb +++ b/library/win32ole/win32ole_type/minor_version_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE#minor_version for Shell Controls" do @@ -18,6 +16,4 @@ end end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/name_spec.rb b/library/win32ole/win32ole_type/name_spec.rb index 8ad3d8f466..d76998d7dc 100644 --- a/library/win32ole/win32ole_type/name_spec.rb +++ b/library/win32ole/win32ole_type/name_spec.rb @@ -2,8 +2,6 @@ require_relative 'shared/name' platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE#name" do @@ -11,6 +9,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/new_spec.rb b/library/win32ole/win32ole_type/new_spec.rb index 816feeeddc..cc691ffa67 100644 --- a/library/win32ole/win32ole_type/new_spec.rb +++ b/library/win32ole/win32ole_type/new_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE.new" do @@ -40,6 +38,4 @@ end end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/ole_classes_spec.rb b/library/win32ole/win32ole_type/ole_classes_spec.rb index 2f97e43451..a3a1d4ac58 100644 --- a/library/win32ole/win32ole_type/ole_classes_spec.rb +++ b/library/win32ole/win32ole_type/ole_classes_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE.ole_classes for Shell Controls" do @@ -18,6 +16,4 @@ end end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/ole_methods_spec.rb b/library/win32ole/win32ole_type/ole_methods_spec.rb index 9a6a0bce0a..3b99b97a61 100644 --- a/library/win32ole/win32ole_type/ole_methods_spec.rb +++ b/library/win32ole/win32ole_type/ole_methods_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE#ole_methods for Shell Controls" do @@ -18,6 +16,4 @@ end end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/ole_type_spec.rb b/library/win32ole/win32ole_type/ole_type_spec.rb index 5fe0ed3839..24292b1c4f 100644 --- a/library/win32ole/win32ole_type/ole_type_spec.rb +++ b/library/win32ole/win32ole_type/ole_type_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE#ole_type for Shell Controls" do @@ -18,6 +16,4 @@ end end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/progid_spec.rb b/library/win32ole/win32ole_type/progid_spec.rb index 29337d38b3..340fdb34e8 100644 --- a/library/win32ole/win32ole_type/progid_spec.rb +++ b/library/win32ole/win32ole_type/progid_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE#progid for Shell Controls" do @@ -18,6 +16,4 @@ end end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/progids_spec.rb b/library/win32ole/win32ole_type/progids_spec.rb index f493526cfb..793535b48d 100644 --- a/library/win32ole/win32ole_type/progids_spec.rb +++ b/library/win32ole/win32ole_type/progids_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE.progids" do @@ -14,6 +12,4 @@ end end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/src_type_spec.rb b/library/win32ole/win32ole_type/src_type_spec.rb index 8c56b2d127..3f89fe702a 100644 --- a/library/win32ole/win32ole_type/src_type_spec.rb +++ b/library/win32ole/win32ole_type/src_type_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE#src_type for Shell Controls" do @@ -18,6 +16,4 @@ end end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/to_s_spec.rb b/library/win32ole/win32ole_type/to_s_spec.rb index f2dc918200..9f086a5a35 100644 --- a/library/win32ole/win32ole_type/to_s_spec.rb +++ b/library/win32ole/win32ole_type/to_s_spec.rb @@ -2,8 +2,6 @@ require_relative 'shared/name' platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE#to_s" do @@ -11,6 +9,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/typekind_spec.rb b/library/win32ole/win32ole_type/typekind_spec.rb index e76a2a5d7c..391d505e01 100644 --- a/library/win32ole/win32ole_type/typekind_spec.rb +++ b/library/win32ole/win32ole_type/typekind_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE#typekind for Shell Controls" do @@ -18,6 +16,4 @@ end end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/typelibs_spec.rb b/library/win32ole/win32ole_type/typelibs_spec.rb index ed106a873f..a487208caa 100644 --- a/library/win32ole/win32ole_type/typelibs_spec.rb +++ b/library/win32ole/win32ole_type/typelibs_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE.typelibs for Shell Controls" do @@ -22,6 +20,4 @@ end end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/variables_spec.rb b/library/win32ole/win32ole_type/variables_spec.rb index c77f26600d..7f61b8af95 100644 --- a/library/win32ole/win32ole_type/variables_spec.rb +++ b/library/win32ole/win32ole_type/variables_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE#variables for Shell Controls" do @@ -18,6 +16,4 @@ end end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_type/visible_spec.rb b/library/win32ole/win32ole_type/visible_spec.rb index 21c8040923..99e34edcdd 100644 --- a/library/win32ole/win32ole_type/visible_spec.rb +++ b/library/win32ole/win32ole_type/visible_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_TYPE#visible? for Shell Controls" do @@ -18,6 +16,4 @@ end end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_variable/name_spec.rb b/library/win32ole/win32ole_variable/name_spec.rb index e21e9c6ffc..dd9bfa594f 100644 --- a/library/win32ole/win32ole_variable/name_spec.rb +++ b/library/win32ole/win32ole_variable/name_spec.rb @@ -2,8 +2,6 @@ require_relative 'shared/name' platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_VARIABLE#name" do @@ -11,6 +9,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_variable/ole_type_detail_spec.rb b/library/win32ole/win32ole_variable/ole_type_detail_spec.rb index 365e4182ad..7a9c791494 100644 --- a/library/win32ole/win32ole_variable/ole_type_detail_spec.rb +++ b/library/win32ole/win32ole_variable/ole_type_detail_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_VARIABLE#ole_type_detail" do @@ -19,6 +17,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_variable/ole_type_spec.rb b/library/win32ole/win32ole_variable/ole_type_spec.rb index 5f7ccaf02d..03a9aa4c74 100644 --- a/library/win32ole/win32ole_variable/ole_type_spec.rb +++ b/library/win32ole/win32ole_variable/ole_type_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_VARIABLE#ole_type" do @@ -18,6 +16,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_variable/to_s_spec.rb b/library/win32ole/win32ole_variable/to_s_spec.rb index 33a58f2b32..d4cab8e924 100644 --- a/library/win32ole/win32ole_variable/to_s_spec.rb +++ b/library/win32ole/win32ole_variable/to_s_spec.rb @@ -2,8 +2,6 @@ require_relative 'shared/name' platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_VARIABLE#to_s" do @@ -11,6 +9,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_variable/value_spec.rb b/library/win32ole/win32ole_variable/value_spec.rb index c60ae2a88a..b7849793c5 100644 --- a/library/win32ole/win32ole_variable/value_spec.rb +++ b/library/win32ole/win32ole_variable/value_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_VARIABLE#value" do @@ -19,6 +17,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_variable/variable_kind_spec.rb b/library/win32ole/win32ole_variable/variable_kind_spec.rb index 2443a8a694..7a79d32ddc 100644 --- a/library/win32ole/win32ole_variable/variable_kind_spec.rb +++ b/library/win32ole/win32ole_variable/variable_kind_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_VARIABLE#variable_kind" do @@ -19,6 +17,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_variable/varkind_spec.rb b/library/win32ole/win32ole_variable/varkind_spec.rb index f42108532c..9d7b8238c8 100644 --- a/library/win32ole/win32ole_variable/varkind_spec.rb +++ b/library/win32ole/win32ole_variable/varkind_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_VARIABLE#varkind" do @@ -19,6 +17,4 @@ end -ensure - $VERBOSE = verbose end diff --git a/library/win32ole/win32ole_variable/visible_spec.rb b/library/win32ole/win32ole_variable/visible_spec.rb index f297596b14..60252e8139 100644 --- a/library/win32ole/win32ole_variable/visible_spec.rb +++ b/library/win32ole/win32ole_variable/visible_spec.rb @@ -1,7 +1,5 @@ require_relative "../../../spec_helper" platform_is :windows do - verbose, $VERBOSE = $VERBOSE, nil - require 'win32ole' describe "WIN32OLE_VARIABLE#visible?" do @@ -18,6 +16,4 @@ end -ensure - $VERBOSE = verbose end