summaryrefslogtreecommitdiff
path: root/test/win32ole/test_err_in_callback.rb
diff options
context:
space:
mode:
Diffstat (limited to 'test/win32ole/test_err_in_callback.rb')
-rw-r--r--test/win32ole/test_err_in_callback.rb44
1 files changed, 2 insertions, 42 deletions
diff --git a/test/win32ole/test_err_in_callback.rb b/test/win32ole/test_err_in_callback.rb
index c223804ce6..bbbab719d6 100644
--- a/test/win32ole/test_err_in_callback.rb
+++ b/test/win32ole/test_err_in_callback.rb
@@ -21,27 +21,12 @@ if defined?(WIN32OLE)
" -I " + e
}.join("")
@script = File.dirname(__FILE__) + "/err_in_callback.rb"
- @param = create_temp_html
- @param = "file:///" + @param.gsub(/\\/, '/')
end
end
- def create_temp_html
- fso = WIN32OLE.new('Scripting.FileSystemObject')
- @dummy_file = fso.GetTempName + ".html"
- cfolder = fso.getFolder(".")
- @str = "This is test HTML file for Win32OLE (#{Time.now})"
- f = cfolder.CreateTextFile(@dummy_file)
- f.writeLine("<html><body><div id='str'>#{@str}</div></body></html>")
- f.close
- @f = @dummy_file
- dummy_path = cfolder.path + "\\" + @dummy_file
- dummy_path
- end
-
def test_err_in_callback
if @ruby
- cmd = "#{@ruby} -v #{@iopt} #{@script} #{@param} > test_err_in_callback.log 2>&1"
+ cmd = "#{@ruby} -v #{@iopt} #{@script} > test_err_in_callback.log 2>&1"
system(cmd)
str = ""
open("test_err_in_callback.log") {|ifs|
@@ -51,34 +36,9 @@ if defined?(WIN32OLE)
end
end
- def ie_quit
- WIN32OLE_EVENT.message_loop
- sh = WIN32OLE.new('Shell.Application')
- sh.windows.each do |w|
- i = 0
- begin
- i = i + 1
- next if i > 100
- WIN32OLE_EVENT.message_loop
- sleep 0.1
- next if /#{@dummy_file}/ !~ w.locationURL
- e = w.document.all.item("str")
- if e && e.innerHTML == @str
- w.quit
- WIN32OLE_EVENT.message_loop
- sleep 0.2
- break
- end
- rescue
- retry
- end
- end
- end
-
def teardown
- ie_quit
- File.unlink(@f)
File.unlink("test_err_in_callback.log")
end
+
end
end