Skip to content

Commit 0d9efa2

Browse files
committed
WIN32OLE::Event
1 parent 7b1b02d commit 0d9efa2

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

library/win32ole/fixtures/classes.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ module WIN32OLESpecs
99
WIN32OLE::RuntimeError ||= WIN32OLERuntimeError
1010
WIN32OLE::Method ||= WIN32OLE_METHOD
1111
WIN32OLE::Type ||= WIN32OLE_TYPE
12+
WIN32OLE::Event ||= WIN32OLE_EVENT
1213

1314
MSXML_AVAILABLE = WIN32OLE::TypeLib.typelibs.any? { |t| t.name.start_with?('Microsoft XML') }
1415
SYSTEM_MONITOR_CONTROL_AVAILABLE = WIN32OLE::TypeLib.typelibs.any? { |t| t.name.start_with?('System Monitor Control') }

library/win32ole/win32ole_event/new_spec.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require_relative '../fixtures/classes'
44

55
guard -> { WIN32OLESpecs::MSXML_AVAILABLE } do
6-
describe "WIN32OLE_EVENT.new" do
6+
describe "WIN32OLE::Event.new" do
77
before :all do
88
@xml_dom = WIN32OLESpecs.new_ole('MSXML.DOMDocument')
99
end
@@ -13,21 +13,21 @@
1313
end
1414

1515
it "raises TypeError given invalid argument" do
16-
-> { WIN32OLE_EVENT.new "A" }.should raise_error TypeError
16+
-> { WIN32OLE::Event.new "A" }.should raise_error TypeError
1717
end
1818

1919
it "raises RuntimeError if event does not exist" do
20-
-> { WIN32OLE_EVENT.new(@xml_dom, 'A') }.should raise_error RuntimeError
20+
-> { WIN32OLE::Event.new(@xml_dom, 'A') }.should raise_error RuntimeError
2121
end
2222

2323
it "raises RuntimeError if OLE object has no events" do
2424
dict = WIN32OLESpecs.new_ole('Scripting.Dictionary')
25-
-> { WIN32OLE_EVENT.new(dict) }.should raise_error RuntimeError
25+
-> { WIN32OLE::Event.new(dict) }.should raise_error RuntimeError
2626
end
2727

28-
it "creates WIN32OLE_EVENT object" do
29-
ev = WIN32OLE_EVENT.new(@xml_dom)
30-
ev.should be_kind_of WIN32OLE_EVENT
28+
it "creates WIN32OLE::Event object" do
29+
ev = WIN32OLE::Event.new(@xml_dom)
30+
ev.should be_kind_of WIN32OLE::Event
3131
end
3232
end
3333
end

library/win32ole/win32ole_event/on_event_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ def handler_spec_alt(*args)
1515
@event_spec_alt = "spec_alt"
1616
end
1717

18-
describe "WIN32OLE_EVENT#on_event" do
18+
describe "WIN32OLE::Event#on_event" do
1919
before :all do
2020
@fn_xml = File.absolute_path "../fixtures/event.xml", __dir__
2121
end
2222

2323
before :each do
2424
@xml_dom = WIN32OLESpecs.new_ole 'MSXML.DOMDocument'
2525
@xml_dom.async = true
26-
@ev = WIN32OLE_EVENT.new @xml_dom
26+
@ev = WIN32OLE::Event.new @xml_dom
2727
@event_global = ''
2828
@event_specific = ''
2929
@event_spec_alt = ''
@@ -37,21 +37,21 @@ def handler_spec_alt(*args)
3737
it "sets global event handler properly, and the handler is invoked by event loop" do
3838
@ev.on_event { |*args| handler_global(*args) }
3939
@xml_dom.loadXML "<program><name>Ruby</name><version>trunk</version></program>"
40-
WIN32OLE_EVENT.message_loop
40+
WIN32OLE::Event.message_loop
4141
@event_global.should =~ /onreadystatechange/
4242
end
4343

4444
it "accepts a String argument and the handler is invoked by event loop" do
4545
@ev.on_event("onreadystatechange") { |*args| @event = 'foo' }
4646
@xml_dom.loadXML "<program><name>Ruby</name><version>trunk</version></program>"
47-
WIN32OLE_EVENT.message_loop
47+
WIN32OLE::Event.message_loop
4848
@event.should =~ /foo/
4949
end
5050

5151
it "accepts a Symbol argument and the handler is invoked by event loop" do
5252
@ev.on_event(:onreadystatechange) { |*args| @event = 'bar' }
5353
@xml_dom.loadXML "<program><name>Ruby</name><version>trunk</version></program>"
54-
WIN32OLE_EVENT.message_loop
54+
WIN32OLE::Event.message_loop
5555
@event.should =~ /bar/
5656
end
5757

@@ -60,7 +60,7 @@ def handler_spec_alt(*args)
6060
@ev.on_event("onreadystatechange") { |*args| handler_specific(*args) }
6161
@ev.on_event("onreadystatechange") { |*args| handler_spec_alt(*args) }
6262
@xml_dom.load @fn_xml
63-
WIN32OLE_EVENT.message_loop
63+
WIN32OLE::Event.message_loop
6464
@event_global.should == 'ondataavailable'
6565
@event_global.should_not =~ /onreadystatechange/
6666
@event_specific.should == ''

0 commit comments

Comments
 (0)