use Scripting.Dictionary instead of InternetExplorer.Application
* spec/ruby/library/win32ole/win32ole/ole_method_spec.rb: recuire in platform_is block. * spec/ruby/library/win32ole/win32ole/ole_func_methods_spec.rb: ditto. * spec/ruby/library/win32ole/win32ole/shared/ole_method.rb: use Scripting.Dictionary. InternetExplorer.Application is not available on some environments. Thanks to MSP-Greg (Greg L). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
15533bb40a
commit
d7d83fa0cf
@ -1,8 +1,6 @@
|
|||||||
require_relative '../fixtures/classes'
|
|
||||||
require_relative 'shared/ole_method'
|
|
||||||
|
|
||||||
platform_is :windows do
|
platform_is :windows do
|
||||||
require 'win32ole'
|
require_relative '../fixtures/classes'
|
||||||
|
require_relative 'shared/ole_method'
|
||||||
|
|
||||||
describe "WIN32OLE#ole_method_help" do
|
describe "WIN32OLE#ole_method_help" do
|
||||||
it_behaves_like :win32ole_ole_method, :ole_method_help
|
it_behaves_like :win32ole_ole_method, :ole_method_help
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
require_relative '../fixtures/classes'
|
|
||||||
require_relative 'shared/ole_method'
|
|
||||||
|
|
||||||
platform_is :windows do
|
platform_is :windows do
|
||||||
require 'win32ole'
|
require_relative '../fixtures/classes'
|
||||||
|
require_relative 'shared/ole_method'
|
||||||
|
|
||||||
describe "WIN32OLE#ole_method" do
|
describe "WIN32OLE#ole_method" do
|
||||||
it_behaves_like :win32ole_ole_method, :ole_method
|
it_behaves_like :win32ole_ole_method, :ole_method
|
||||||
|
@ -1,25 +1,19 @@
|
|||||||
require_relative '../../fixtures/classes'
|
|
||||||
|
|
||||||
platform_is :windows do
|
platform_is :windows do
|
||||||
require 'win32ole'
|
require_relative '../../fixtures/classes'
|
||||||
|
|
||||||
describe :win32ole_ole_method, shared: true do
|
describe :win32ole_ole_method, shared: true do
|
||||||
before :each do
|
before :each do
|
||||||
@ie = WIN32OLESpecs.new_ole('InternetExplorer.Application')
|
@dict = WIN32OLESpecs.new_ole('Scripting.Dictionary')
|
||||||
end
|
|
||||||
|
|
||||||
after :each do
|
|
||||||
@ie.Quit
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it "raises ArgumentError if no argument is given" do
|
it "raises ArgumentError if no argument is given" do
|
||||||
lambda { @ie.send(@method) }.should raise_error ArgumentError
|
lambda { @dict.send(@method) }.should raise_error ArgumentError
|
||||||
end
|
end
|
||||||
|
|
||||||
it "returns the WIN32OLE_METHOD 'Quit' if given 'Quit'" do
|
it "returns the WIN32OLE_METHOD 'Add' if given 'Add'" do
|
||||||
result = @ie.send(@method, "Quit")
|
result = @dict.send(@method, "Add")
|
||||||
result.kind_of?(WIN32OLE_METHOD).should be_true
|
result.kind_of?(WIN32OLE_METHOD).should be_true
|
||||||
result.name.should == 'Quit'
|
result.name.should == 'Add'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user