watir 1.5.6 → 1.6.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (133) hide show
  1. data/{changes.rb → CHANGES} +12 -3
  2. data/bin/watir-console +7 -1
  3. data/lib/changes.rb +3 -0
  4. data/{license.rb → lib/license.rb} +2 -1
  5. data/{readme.rb → lib/readme.rb} +4 -6
  6. data/{watir → lib/watir}/AutoItX3.dll +0 -0
  7. data/{watir → lib/watir}/IEDialog/Release/IEDialog.dll +0 -0
  8. data/{watir → lib/watir}/WindowHelper.rb +1 -1
  9. data/{watir → lib/watir}/camel_case.rb +0 -0
  10. data/{watir → lib/watir}/clickJSDialog.rb +0 -0
  11. data/{watir → lib/watir}/close_all.rb +1 -1
  12. data/{watir → lib/watir}/collections.rb +1 -1
  13. data/{watir → lib/watir}/container.rb +17 -8
  14. data/{watir → lib/watir}/contrib/enabled_popup.rb +0 -0
  15. data/{watir → lib/watir}/contrib/ie-new-process.rb +0 -0
  16. data/{watir → lib/watir}/contrib/page_checker.rb +0 -0
  17. data/{watir → lib/watir}/contrib/visible.rb +2 -2
  18. data/{watir → lib/watir}/cookiemanager.rb +0 -0
  19. data/{watir → lib/watir}/datahandler.rb +0 -0
  20. data/{watir → lib/watir}/dialog.rb +1 -1
  21. data/{watir → lib/watir}/element.rb +3 -7
  22. data/{watir → lib/watir}/element_collections.rb +0 -0
  23. data/{watir → lib/watir}/form.rb +31 -11
  24. data/{watir → lib/watir}/frame.rb +0 -0
  25. data/{watir/ie.rb → lib/watir/ie-class.rb} +22 -22
  26. data/{watir → lib/watir}/ie-process.rb +0 -0
  27. data/{watir.rb → lib/watir/ie.rb} +11 -27
  28. data/{watir → lib/watir}/image.rb +0 -0
  29. data/{watir → lib/watir}/input_elements.rb +33 -44
  30. data/{watir → lib/watir}/irb-history.rb +0 -0
  31. data/{watir → lib/watir}/link.rb +0 -0
  32. data/{watir → lib/watir}/locator.rb +56 -43
  33. data/{watir → lib/watir}/logger.rb +0 -0
  34. data/{watir → lib/watir}/modal_dialog.rb +0 -0
  35. data/{watir → lib/watir}/non_control_elements.rb +0 -0
  36. data/{watir → lib/watir}/page-container.rb +2 -2
  37. data/{watir → lib/watir}/popup.rb +0 -0
  38. data/{watir → lib/watir}/process.rb +0 -0
  39. data/{watir → lib/watir}/screen_capture.rb +0 -0
  40. data/{watir → lib/watir}/setFileDialog.rb +0 -0
  41. data/{watir → lib/watir}/table.rb +7 -2
  42. data/{watir → lib/watir}/utils.rb +0 -0
  43. data/lib/watir/version.rb +5 -0
  44. data/{watir → lib/watir}/watir_simple.rb +3 -3
  45. data/{watir → lib/watir}/win32.rb +0 -0
  46. data/lib/watir/win32ole.rb +6 -0
  47. data/lib/watir/win32ole/win32ole.so +0 -0
  48. data/{watir → lib/watir}/winClicker.rb +0 -0
  49. data/unittests/buttons_xpath_test.rb +32 -32
  50. data/unittests/checkbox_test.rb +113 -99
  51. data/unittests/checkbox_xpath_test.rb +57 -57
  52. data/unittests/core_tests.rb +10 -7
  53. data/unittests/css_test.rb +12 -32
  54. data/unittests/defer_test.rb +22 -22
  55. data/unittests/dialog_test.rb +13 -13
  56. data/unittests/div2_xpath_test.rb +3 -3
  57. data/unittests/div_test.rb +23 -19
  58. data/unittests/div_xpath_test.rb +50 -50
  59. data/unittests/errorchecker_test.rb +7 -9
  60. data/unittests/filefield_test.rb +12 -11
  61. data/unittests/filefield_xpath_test.rb +10 -10
  62. data/unittests/form_test.rb +144 -151
  63. data/unittests/form_xpath_test.rb +99 -99
  64. data/unittests/frame_test.rb +46 -44
  65. data/unittests/google_form_test.rb +2 -2
  66. data/unittests/html/checkboxes1.html +19 -16
  67. data/unittests/html/forms3.html +2 -2
  68. data/unittests/html/wallofcheckboxes.html +1003 -0
  69. data/unittests/ie_exists_test.rb +5 -3
  70. data/unittests/ie_test.rb +2 -2
  71. data/unittests/images_test.rb +83 -82
  72. data/unittests/images_xpath_test.rb +40 -40
  73. data/unittests/iostring_test.rb +1 -1
  74. data/unittests/links_multi_test.rb +7 -8
  75. data/unittests/links_test.rb +73 -71
  76. data/unittests/links_xpath_test.rb +15 -15
  77. data/unittests/lists_test.rb +10 -10
  78. data/unittests/map_test.rb +65 -65
  79. data/unittests/minmax_test.rb +10 -9
  80. data/unittests/navigate_test.rb +19 -23
  81. data/unittests/nbsp_xpath_test.rb +2 -2
  82. data/unittests/non_core_tests.rb +5 -2
  83. data/unittests/other/WindowLogonExample.rb +2 -2
  84. data/unittests/other/WindowLogonExtra.rb +1 -1
  85. data/unittests/other/navigate_exception_test.rb +14 -3
  86. data/unittests/other/screen_capture_test.rb +3 -2
  87. data/unittests/other/testcase_method_order_test.rb +1 -1
  88. data/unittests/pagecontainstext_test.rb +17 -14
  89. data/unittests/parent_child_test.rb +11 -7
  90. data/unittests/perf_test.rb +20 -0
  91. data/unittests/popups_test.rb +13 -14
  92. data/unittests/pre_test.rb +30 -28
  93. data/unittests/radios_test.rb +128 -107
  94. data/unittests/radios_xpath_test.rb +47 -47
  95. data/unittests/security_setting_test.rb +24 -0
  96. data/unittests/selectbox_test.rb +65 -157
  97. data/unittests/selectbox_xpath_test.rb +51 -51
  98. data/unittests/setup.rb +52 -48
  99. data/unittests/speed_settings_test.rb +31 -20
  100. data/unittests/table_cell_using_xpath_test.rb +12 -12
  101. data/unittests/table_test.rb +30 -16
  102. data/unittests/table_xpath_test.rb +25 -25
  103. data/unittests/test_tests.rb +9 -0
  104. data/unittests/textarea_test.rb +33 -33
  105. data/unittests/textarea_xpath_test.rb +37 -37
  106. data/unittests/textfield_for_ch_char_test.rb +9 -9
  107. data/unittests/textfields_test.rb +103 -98
  108. data/unittests/textfields_xpath_test.rb +50 -50
  109. data/unittests/windows/attach_to_existing_window_test.rb +2 -2
  110. data/unittests/windows/attach_to_new_window_test.rb +10 -10
  111. data/unittests/windows/close_window_test.rb +2 -2
  112. data/unittests/windows/frame_links_test.rb +6 -6
  113. data/unittests/windows/ie-each_test.rb +1 -1
  114. data/unittests/windows/iedialog_test.rb +4 -5
  115. data/unittests/windows/js_events_test.rb +14 -14
  116. data/unittests/windows/jscriptExtraAlert.rb +2 -1
  117. data/unittests/windows/jscriptExtraConfirmCancel.rb +1 -1
  118. data/unittests/windows/jscriptExtraConfirmOk.rb +1 -1
  119. data/unittests/windows/jscriptPushButton.rb +2 -1
  120. data/unittests/windows/jscript_test.rb +7 -7
  121. data/unittests/windows/modal_dialog_test.rb +28 -29
  122. data/unittests/windows/{new.rb → new_test.rb} +1 -1
  123. data/unittests/windows/open_close_test.rb +4 -7
  124. data/unittests/windows/send_keys_test.rb +11 -11
  125. data/unittests/xpath_tests.rb +4 -3
  126. metadata +82 -58
  127. data/unittests/buttons_test.rb +0 -107
  128. data/watir/assertions.rb +0 -44
  129. data/watir/exceptions.rb +0 -42
  130. data/watir/testcase.rb +0 -58
  131. data/watir/waiter.rb +0 -88
  132. data/watir/win32ole.rb +0 -8
  133. data/watir/win32ole/win32ole.so +0 -0
@@ -1,24 +1,22 @@
1
1
  # feature tests for Goto
2
- # revision: $Revision: 1348 $
2
+ # revision: $Revision: 1422 $
3
3
 
4
- $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
4
+ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
5
5
  require 'unittests/setup'
6
6
 
7
7
  class TC_error_checker < Test::Unit::TestCase
8
8
 
9
9
  def test_simple_checker
10
- button_checker = Proc.new{
11
- |ie| raise RuntimeError, "text 'buttons' was missing" if !ie.pageContainsText(/buttons/)
12
- }
10
+ button_checker = Proc.new do |ie|
11
+ raise RuntimeError, "text 'buttons' is missing" if ! ie.contains_text(/buttons/)
12
+ end
13
13
 
14
- $ie.add_checker(button_checker )
14
+ browser.add_checker button_checker
15
15
  assert_raises( RuntimeError ) { goto_page('forms3.html') }
16
16
  assert_nothing_raised { goto_page('buttons1.html') }
17
17
 
18
- $ie.disable_checker( button_checker )
18
+ browser.disable_checker button_checker
19
19
  assert_nothing_raised { goto_page('forms3.html') }
20
-
21
20
  end
22
21
 
23
-
24
22
  end
@@ -1,10 +1,11 @@
1
1
  # feature tests for file Fields
2
- # revision: $Revision: 1349 $
2
+ # revision: $Revision: 1505 $
3
3
 
4
- $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
4
+ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
5
5
  require 'unittests/setup'
6
6
 
7
7
  class TC_FileField < Test::Unit::TestCase
8
+ tags :must_be_visible, :creates_windows
8
9
  include Watir
9
10
 
10
11
  def setup
@@ -13,27 +14,27 @@ class TC_FileField < Test::Unit::TestCase
13
14
 
14
15
  def test_file_field_Exists
15
16
  # test for existance of 4 file area
16
- assert($ie.file_field(:name,"file1").exists?)
17
- assert($ie.file_field(:id,"file2").exists?)
17
+ assert(browser.file_field(:name,"file1").exists?)
18
+ assert(browser.file_field(:id,"file2").exists?)
18
19
 
19
20
  # test for missing
20
- assert(!$ie.file_field(:name, "missing").exists?)
21
- assert(!$ie.file_field(:name,"totallybogus").exists?)
21
+ assert_false(browser.file_field(:name, "missing").exists?)
22
+ assert_false(browser.file_field(:name,"totallybogus").exists?)
22
23
 
23
24
  # pop one open and put something in it.
24
25
  file = $htmlRoot + "fileupload.html"
25
26
  file.gsub! 'file:///', ''
26
27
  file.gsub! '/', '\\'
27
- $ie.file_field(:name,"file1").set(file)
28
- assert_equal file, $ie.file_field(:name,"file1").value
28
+ browser.file_field(:name,"file1").set(file)
29
+ assert_equal file, browser.file_field(:name,"file1").value
29
30
 
30
31
  # click the upload button
31
- $ie.button(:name,"upload").click
32
- assert($ie.text.include?("PASS"))
32
+ browser.button(:name,"upload").click
33
+ assert(browser.text.include?("PASS"))
33
34
  end
34
35
 
35
36
  def test_iterator
36
- assert_equal(6, $ie.file_fields.length)
37
+ assert_equal(6, browser.file_fields.length)
37
38
  end
38
39
 
39
40
  end
@@ -1,7 +1,7 @@
1
1
  # feature tests for TextArea Fields
2
- # revision: $Revision: 1348 $
2
+ # revision: $Revision: 1544 $
3
3
 
4
- $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
4
+ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
5
5
  require 'unittests/setup'
6
6
 
7
7
  class TC_FileField_XPath < Test::Unit::TestCase
@@ -13,21 +13,21 @@ class TC_FileField_XPath < Test::Unit::TestCase
13
13
 
14
14
  def test_file_field_Exists
15
15
  #test for existance of 4 file area
16
- assert($ie.file_field(:xpath, "//input[@name='file1']/").exists?)
17
- assert($ie.file_field(:xpath, "//input[@id='file2']/").exists?)
16
+ assert(browser.file_field(:xpath, "//input[@name='file1']/").exists?)
17
+ assert(browser.file_field(:xpath, "//input[@id='file2']/").exists?)
18
18
  #test for missing
19
- assert(!$ie.file_field(:xpath, "//input[@name='missing']/").exists?)
20
- assert(!$ie.file_field(:xpath, "//input[@name='totallybogus']/").exists?)
19
+ assert_false(browser.file_field(:xpath, "//input[@name='missing']/").exists?)
20
+ assert_false(browser.file_field(:xpath, "//input[@name='totallybogus']/").exists?)
21
21
  #pop one open and put something in it.
22
- $ie.file_field(:xpath, "//input[@name='file1']/").set($htmlRoot + "fileupload.html")
22
+ browser.file_field(:xpath, "//input[@name='file1']/").set($htmlRoot + "fileupload.html")
23
23
  #click the upload button
24
- $ie.button(:xpath, "//input[@name='upload']/").click
24
+ browser.button(:xpath, "//input[@name='upload']/").click
25
25
 
26
- assert($ie.text.include?("PASS"))
26
+ assert(browser.text.include?("PASS"))
27
27
  end
28
28
 
29
29
  def test_iterator
30
- assert_equal(6, $ie.file_fields.length)
30
+ assert_equal(6, browser.file_fields.length)
31
31
  end
32
32
 
33
33
  end
@@ -1,48 +1,54 @@
1
1
  # feature tests for Forms
2
- # revision: $Revision: 1348 $
2
+ # revision: $Revision: 1513 $
3
3
 
4
- $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
4
+ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
5
5
  require 'unittests/setup'
6
6
 
7
7
  class TC_Forms2 < Test::Unit::TestCase # Note: there is no TC_Forms1
8
8
  def setup
9
- goto_page "forms2.html"
9
+ uses_page "forms2.html"
10
10
  end
11
11
 
12
- def test_Form_Exists
13
- assert($ie.form(:name, "test2").exists?)
14
- assert(!$ie.form(:name, "missing").exists?)
12
+ def test_form_exists
13
+ assert(browser.form(:name, "test2").exists?)
14
+ assert_false(browser.form(:name, "missing").exists?)
15
15
 
16
- assert($ie.form("test2").exists?)
17
- assert(!$ie.form( "missing").exists?)
16
+ assert(browser.form("test2").exists?)
17
+ assert_false(browser.form("missing").exists?)
18
18
 
19
- assert($ie.form(:index, 1).exists?)
20
- assert(!$ie.form(:index, 88).exists?)
19
+ assert(browser.form(:index, 1).exists?)
20
+ assert_false(browser.form(:index, 88).exists?)
21
21
 
22
- assert($ie.form(:method, "get").exists?)
23
- assert(!$ie.form(:method, "missing").exists?)
22
+ assert(browser.form(:method, "get").exists?)
23
+ assert_false(browser.form(:method, "missing").exists?)
24
24
 
25
- assert($ie.form(:id, 'f2').exists?)
26
- assert(!$ie.form(:id, 'missing').exists?)
25
+ assert(browser.form(:id, 'f2').exists?)
26
+ assert_false(browser.form(:id, 'missing').exists?)
27
27
 
28
- assert($ie.form(:action, "pass.html").exists?)
29
- assert(!$ie.form(:action, "missing").exists?)
28
+ assert(browser.form(:action, "pass.html").exists?)
29
+ assert_false(browser.form(:action, "missing").exists?)
30
30
  end
31
31
 
32
- def test_ButtonInForm
33
- assert($ie.form(:name, "test2").button(:caption , "Submit").exists?)
32
+ def test_button_in_form
33
+ assert(browser.form(:name, "test2").button(:caption, "Submit").exists?)
34
34
  end
35
-
36
- # The following tests from bug 2261
37
- def test_form_html
38
- assert_equal("\r\n<FORM id=f2 name=test2 action=pass2.html method=get><BR><INPUT type=submit value=Submit> </FORM>",
39
- $ie.form(:name, 'test2').html)
35
+ def test_form_sub_element
36
+ assert_equal('Click Me', browser.form(:index, 1).button(:name, 'b1').value)
40
37
  end
41
- def test_form_flash
42
- assert_nothing_raised{ $ie.form(:name, 'test2').flash }
38
+
39
+ # The following tests form bug 2261
40
+ tag_method :test_form_outer_html, :fails_on_firefox
41
+ def test_form_outer_html
42
+ expected = "\r\n<FORM id=f2 name=test2 action=pass2.html method=get><BR><INPUT type=submit value=Submit> </FORM>"
43
+ assert_equal(expected, browser.form(:name, 'test2').html)
43
44
  end
44
- def test_form_sub_element
45
- assert_equal('Click Me', $ie.form(:index, 1).button(:name, 'b1').value)
45
+ tag_method :test_form_inner_html, :fails_on_ie
46
+ def test_form_inner_html
47
+ expected = "\n<br><input value=\"Submit\" type=\"submit\">\n"
48
+ assert_equal(expected, browser.form(:name, 'test2').html)
49
+ end
50
+ def test_form_flash
51
+ assert_nothing_raised{ browser.form(:name, 'test2').flash }
46
52
  end
47
53
  end
48
54
 
@@ -52,7 +58,7 @@ class TC_Form_Display < Test::Unit::TestCase
52
58
  def test_showforms
53
59
  goto_page "forms2.html"
54
60
  $stdout = @mockout
55
- $ie.showForms
61
+ browser.showForms
56
62
  assert_equal(<<END_OF_MESSAGE, @mockout)
57
63
  There are 4 forms
58
64
  Form name:
@@ -80,101 +86,88 @@ class TC_Forms3 < Test::Unit::TestCase
80
86
  goto_page "forms3.html"
81
87
  end
82
88
 
83
- # The following tests from bug 2261
89
+ # The following tests form bug 2261
84
90
  def test_p_in_form
85
- $ie.form(:name, 'buttonsubmit').p(:index, 1).text
86
- end
87
-
88
- def test_Form_Exists
89
- assert($ie.form(:name, "test2").exists?)
90
- assert(!$ie.form(:name, "missing").exists?)
91
-
92
- assert($ie.form("test2").exists?)
93
- assert(!$ie.form( "missing").exists?)
94
-
95
- assert($ie.form(:index, 1).exists?)
96
- assert(!$ie.form(:index, 88).exists?)
97
-
98
- assert($ie.form(:method, "get").exists?)
99
- assert(!$ie.form(:method, "missing").exists?)
100
-
101
- assert($ie.form(:action, "pass.html").exists?)
102
- assert(!$ie.form(:action, "missing").exists?)
91
+ assert_equal "This form has a submit button that is an image",
92
+ browser.form(:name, 'buttonsubmit').p(:index, 1).text
103
93
  end
104
94
 
95
+ # test for bug reported by Scott Pack, http://rubyforge.org/pipermail/wtr-general/2005-June/002223.html
105
96
  def test_index_other_element_before_it
106
- # test for bug reported by Scott Pack, http://rubyforge.org/pipermail/wtr-general/2005-June/002223.html
107
- assert_equal("check1" , $ie.checkbox(:index,1).name )
97
+ assert_equal("check1" , browser.checkbox(:index,1).name)
108
98
  end
109
99
 
100
+ tag_method :test_reset, :fails_on_firefox
110
101
  def test_reset
111
- $ie.text_field(:id, "t1").set("Hello, reset test!")
112
- assert_equal($ie.text_field(:id, 't1').getContents, 'Hello, reset test!')
102
+ browser.text_field(:id, "t1").set("Hello, reset test!")
103
+ assert_equal(browser.text_field(:id, 't1').value, 'Hello, reset test!')
113
104
 
114
- $ie.button(:caption, "Reset").click
115
- assert_equal("" , $ie.text_field(:id, 't1').getContents )
105
+ browser.button(:caption, "Reset").click
106
+ assert_equal("" , browser.text_field(:id, 't1').value)
116
107
 
117
108
  # also verify it works under a form
118
- $ie.text_field(:id, "t1").set("reset test - using a form")
119
- assert_equal($ie.text_field(:id, 't1').getContents, 'reset test - using a form')
109
+ browser.text_field(:id, "t1").set("reset test - using a form")
110
+ assert_equal(browser.text_field(:id, 't1').value, 'reset test - using a form')
120
111
 
121
- $ie.form(:index,2).button(:index,2).click
122
- assert_equal("" , $ie.text_field(:id, 't1').getContents )
112
+ browser.form(:index,2).button(:index,2).click
113
+ assert_equal("" , browser.text_field(:id, 't1').value)
123
114
 
124
115
  # also verify it works under a form, this time using the :id attribute
125
- $ie.text_field(:id, "t1").set("reset test - using a form")
126
- assert_equal($ie.text_field(:id, 't1').getContents, 'reset test - using a form')
116
+ browser.text_field(:id, "t1").set("reset test - using a form")
117
+ assert_equal(browser.text_field(:id, 't1').value, 'reset test - using a form')
127
118
 
128
- $ie.form(:index,2).button(:id,'reset_button').click
129
- assert_equal("" , $ie.text_field(:id, 't1').getContents )
119
+ browser.form(:index,2).button(:id,'reset_button').click
120
+ assert_equal("" , browser.text_field(:id, 't1').value)
130
121
  end
131
122
 
132
123
  def test_flash1
133
- $ie.form(:name ,"test2").button(:caption , "Submit").flash
124
+ assert_nothing_raised do
125
+ browser.form(:name, "test2").button(:caption , "Submit").flash
126
+ end
134
127
  end
135
128
 
136
129
  def test_objects_with_same_name
137
- assert_equal('textfield' ,$ie.text_field( :name , 'g1').value )
138
- assert_equal('button' ,$ie.button( :name , 'g1').value )
139
- assert_equal('1' ,$ie.checkbox( :name , 'g1').value )
140
- assert_equal('2' ,$ie.radio( :name , 'g1').value )
141
-
142
- assert_equal('textfield' ,$ie.text_field( :name , /g1/).value )
143
- assert_equal('button' ,$ie.button( :name , /g1/).value )
144
- assert_equal('1' ,$ie.checkbox( :name , /g1/).value )
145
- assert_equal('2' ,$ie.radio( :name , /g1/).value )
146
-
147
- assert_equal('textfield_id' ,$ie.text_field( :id , 'g1').value )
148
- assert_equal('button_id' ,$ie.button( :id , 'g1').value )
149
- assert_equal('1_id' ,$ie.checkbox( :id , 'g1').value )
150
- assert_equal('2_id' ,$ie.radio( :id , 'g1').value )
130
+ assert_equal('textfield' ,browser.text_field( :name, 'g1').value )
131
+ assert_equal('button' ,browser.button( :name, 'g1').value )
132
+ assert_equal('1' ,browser.checkbox( :name, 'g1').value )
133
+ assert_equal('2' ,browser.radio( :name, 'g1').value )
134
+
135
+ assert_equal('textfield' ,browser.text_field( :name, /g1/).value )
136
+ assert_equal('button' ,browser.button( :name, /g1/).value )
137
+ assert_equal('1' ,browser.checkbox( :name, /g1/).value )
138
+ assert_equal('2' ,browser.radio( :name, /g1/).value )
139
+
140
+ assert_equal('textfield_id' ,browser.text_field( :id, 'g1').value )
141
+ assert_equal('button_id' ,browser.button( :id, 'g1').value )
142
+ assert_equal('1_id' ,browser.checkbox( :id, 'g1').value )
143
+ assert_equal('2_id' ,browser.radio( :id, 'g1').value )
151
144
 
152
- assert_equal('textfield_id' ,$ie.text_field( :id , /g1/).value )
153
- assert_equal('button_id' ,$ie.button( :id , /g1/).value )
154
- assert_equal('1_id' ,$ie.checkbox( :id , /g1/).value )
155
- assert_equal('2_id' ,$ie.radio( :id , /g1/).value )
145
+ assert_equal('textfield_id' ,browser.text_field( :id, /g1/).value )
146
+ assert_equal('button_id' ,browser.button( :id, /g1/).value )
147
+ assert_equal('1_id' ,browser.checkbox( :id, /g1/).value )
148
+ assert_equal('2_id' ,browser.radio( :id, /g1/).value )
156
149
  end
157
150
 
158
151
  def test_flash2
159
- $ie.button(:value, 'Click Me').flash
160
- assert_raises( Watir::UnknownObjectException ) { $ie.text_field( :name , 'g177').flash }
152
+ browser.button(:value, 'Click Me').flash
153
+ assert_raises(UnknownObjectException) { browser.text_field( :name , 'g177').flash }
161
154
  end
162
155
 
163
156
  def test_submitWithImage
164
- assert( $ie.button(:alt , "submit").exists? )
165
- assert( $ie.button(:alt , /sub/).exists? )
157
+ assert( browser.button(:alt, "submit").exists? )
158
+ assert( browser.button(:alt, /sub/).exists? )
166
159
 
167
- assert(! $ie.button(:alt , "missing").exists? )
168
- assert(! $ie.button(:alt , /missing/).exists? )
160
+ assert_false( browser.button(:alt, "missing").exists? )
161
+ assert_false( browser.button(:alt, /missing/).exists? )
169
162
 
170
- #assert( $ie.button(:src , "file:///#{$myDir}/html/images/button.jpg").exists? ) # this doesnt work for everybody
171
- assert( $ie.button(:src , /button/).exists? )
163
+ #assert( browser.button(:src , "file:///#{$myDir}/html/images/button.jpg").exists? ) # this doesnt work for everybody
164
+ assert( browser.button(:src, /button/).exists? )
172
165
 
173
- assert(! $ie.button(:src , "missing").exists? )
174
- assert(! $ie.button(:src , /missing/).exists? )
175
- assert_nothing_raised("raised an exception when it shouldnt have") { $ie.button(:src , /button/).click }
166
+ assert_false( browser.button(:src, "missing").exists? )
167
+ assert_false( browser.button(:src, /missing/).exists? )
168
+ assert_nothing_raised("raised an exception when it shouldnt have") { browser.button(:src , /button/).click }
176
169
 
177
- assert( $ie.text.include?("PASS") )
170
+ assert( browser.text.include?("PASS") )
178
171
  end
179
172
  end
180
173
 
@@ -183,39 +176,39 @@ class TC_Forms3_Display < Test::Unit::TestCase
183
176
  def test_show_stuff
184
177
  goto_page "forms3.html"
185
178
  $stdout = @mockout
186
- $ie.showAllObjects
187
- puts $ie.getText
188
- puts $ie.getHTML
179
+ browser.show_all_objects
180
+ puts browser.text
181
+ puts browser.html
189
182
  end
190
183
  end
191
184
 
192
185
  class TC_Forms4 < Test::Unit::TestCase
193
186
  def setup
194
- goto_page "forms4.html"
187
+ uses_page "forms4.html"
195
188
  end
196
189
 
197
190
  def test_find_text_field_ignoring_form
198
- assert_equal($ie.text_field(:name, 'name').getContents, 'apple') # should it raise a not-unique error instead?
191
+ assert_equal(browser.text_field(:name, 'name').value, 'apple')
199
192
  end
200
193
 
201
194
  def test_correct_form_field_is_found_using_form_name
202
- assert_equal($ie.form(:name, 'apple_form').text_field(:name, 'name').getContents, 'apple')
203
- assert_equal($ie.form(:name, 'banana_form').text_field(:name, 'name').getContents, 'banana')
195
+ assert_equal(browser.form(:name, 'apple_form').text_field(:name, 'name').value, 'apple')
196
+ assert_equal(browser.form(:name, 'banana_form').text_field(:name, 'name').value, 'banana')
204
197
  end
205
198
 
206
199
  def test_correct_form_field_is_found_using_form_index
207
- assert_equal($ie.form(:index, 1).text_field(:name, 'name').getContents, 'apple')
208
- assert_equal($ie.form(:index, 2).text_field(:name, 'name').getContents, 'banana')
200
+ assert_equal(browser.form(:index, 1).text_field(:name, 'name').value, 'apple')
201
+ assert_equal(browser.form(:index, 2).text_field(:name, 'name').value, 'banana')
209
202
  end
210
203
 
211
204
  def test_using_text_on_form
212
- $ie.form(:name, 'apple_form').text_field(:name, 'name').set('strudel')
213
- assert_equal($ie.form(:index, 1).text_field(:name, 'name').getContents, 'strudel')
205
+ browser.form(:name, 'apple_form').text_field(:name, 'name').set('strudel')
206
+ assert_equal(browser.form(:index, 1).text_field(:name, 'name').value, 'strudel')
214
207
  end
215
208
 
216
209
  def test_submit
217
- $ie.form(:name, 'apple_form').submit
218
- assert( $ie.text.include?("PASS") )
210
+ browser.form(:name, 'apple_form').submit
211
+ assert(browser.text.include?("PASS"))
219
212
  end
220
213
  end
221
214
 
@@ -227,74 +220,74 @@ class TC_Hidden_Fields < Test::Unit::TestCase
227
220
  def test_hidden
228
221
 
229
222
  # test using index
230
- assert( $ie.hidden(:index,1).exists? )
231
- assert( $ie.hidden(:index,2).exists? )
232
- assert(! $ie.hidden(:index,3).exists? )
223
+ assert( browser.hidden(:index, 1).exists? )
224
+ assert( browser.hidden(:index, 2).exists? )
225
+ assert_false( browser.hidden(:index, 3).exists? )
233
226
 
234
- $ie.hidden(:index,1).value = 44
235
- $ie.hidden(:index,2).value = 55
227
+ browser.hidden(:index, 1).value = 44
228
+ browser.hidden(:index, 2).value = 55
236
229
 
237
- $ie.button(:value , "Show Hidden").click
230
+ browser.button(:value, "Show Hidden").click
238
231
 
239
- assert_equal("44" , $ie.text_field(:name , "vis1").value )
240
- assert_equal("55" , $ie.text_field(:name , "vis2").value )
232
+ assert_equal("44", browser.text_field(:name, "vis1").value )
233
+ assert_equal("55", browser.text_field(:name, "vis2").value )
241
234
 
242
235
  # test using name and ID
243
- assert( $ie.hidden(:name ,"hid1").exists? )
244
- assert( $ie.hidden(:id,"hidden_1").exists? )
245
- assert(! $ie.hidden(:name,"hidden_44").exists? )
246
- assert(! $ie.hidden(:id,"hidden_55").exists? )
236
+ assert( browser.hidden(:name, "hid1").exists? )
237
+ assert( browser.hidden(:id, "hidden_1").exists? )
238
+ assert_false( browser.hidden(:name, "hidden_44").exists? )
239
+ assert_false( browser.hidden(:id, "hidden_55").exists? )
247
240
 
248
- $ie.hidden(:name ,"hid1").value = 444
249
- $ie.hidden(:id,"hidden_1").value = 555
241
+ browser.hidden(:name, "hid1").value = 444
242
+ browser.hidden(:id, "hidden_1").value = 555
250
243
 
251
- $ie.button(:value , "Show Hidden").click
244
+ browser.button(:value, "Show Hidden").click
252
245
 
253
- assert_equal("444" , $ie.text_field(:name , "vis1").value )
254
- assert_equal("555" , $ie.text_field(:name ,"vis2").value )
246
+ assert_equal("444", browser.text_field(:name, "vis1").value)
247
+ assert_equal("555", browser.text_field(:name, "vis2").value)
255
248
 
256
- # test the over-ridden append method
257
- $ie.hidden(:name ,"hid1").append("a")
258
- $ie.button(:value , "Show Hidden").click
259
- assert_equal("444a" , $ie.text_field(:name , "vis1").value )
260
- assert_equal("555" , $ie.text_field(:name ,"vis2").value )
249
+ # test the over-ridden append method
250
+ browser.hidden(:name, "hid1").append("a")
251
+ browser.button(:value, "Show Hidden").click
252
+ assert_equal("444a", browser.text_field(:name, "vis1").value )
253
+ assert_equal("555", browser.text_field(:name, "vis2").value )
261
254
 
262
- # test the over-ridden clear method
263
- $ie.hidden(:name ,"hid1").clear
264
- $ie.button(:value , "Show Hidden").click
265
- assert_equal("" , $ie.text_field(:name , "vis1").value )
266
- assert_equal("555" , $ie.text_field(:name ,"vis2").value )
255
+ # test the over-ridden clear method
256
+ browser.hidden(:name, "hid1").clear
257
+ browser.button(:value, "Show Hidden").click
258
+ assert_equal("", browser.text_field(:name, "vis1").value)
259
+ assert_equal("555", browser.text_field(:name, "vis2").value)
267
260
 
268
261
  # test using a form
269
- assert( $ie.form(:name , "has_a_hidden").hidden(:name ,"hid1").exists? )
270
- assert( $ie.form(:name , "has_a_hidden").hidden(:id,"hidden_1").exists? )
271
- assert(! $ie.form(:name , "has_a_hidden").hidden(:name,"hidden_44").exists? )
272
- assert(! $ie.form(:name , "has_a_hidden").hidden(:id,"hidden_55").exists? )
262
+ assert( browser.form(:name, "has_a_hidden").hidden(:name, "hid1").exists? )
263
+ assert( browser.form(:name, "has_a_hidden").hidden(:id, "hidden_1").exists? )
264
+ assert_false( browser.form(:name, "has_a_hidden").hidden(:name, "hidden_44").exists? )
265
+ assert_false( browser.form(:name, "has_a_hidden").hidden(:id, "hidden_55").exists? )
273
266
 
274
- $ie.form(:name , "has_a_hidden").hidden(:name ,"hid1").value = 222
275
- $ie.form(:name , "has_a_hidden").hidden(:id,"hidden_1").value = 333
267
+ browser.form(:name, "has_a_hidden").hidden(:name, "hid1").value = 222
268
+ browser.form(:name, "has_a_hidden").hidden(:id, "hidden_1").value = 333
276
269
 
277
- $ie.button(:value , "Show Hidden").click
270
+ browser.button(:value, "Show Hidden").click
278
271
 
279
- assert_equal("222" , $ie.text_field(:name , "vis1").value )
280
- assert_equal("333" , $ie.text_field(:name ,"vis2").value )
272
+ assert_equal("222", browser.text_field(:name, "vis1").value)
273
+ assert_equal("333", browser.text_field(:name, "vis2").value)
281
274
 
282
275
  # iterators
283
- assert_equal(2, $ie.hiddens.length)
284
- count =1
285
- $ie.hiddens.each do |h|
276
+ assert_equal(2, browser.hiddens.length)
277
+ count = 1
278
+ browser.hiddens.each do |h|
286
279
  case count
287
280
  when 1
288
- assert_equal( "", h.id)
289
- assert_equal( "hid1", h.name)
281
+ assert_equal("", h.id)
282
+ assert_equal("hid1", h.name)
290
283
  when 2
291
- assert_equal( "", h.name)
292
- assert_equal( "hidden_1", h.id)
284
+ assert_equal("", h.name)
285
+ assert_equal("hidden_1", h.id)
293
286
  end
294
- count+=1
287
+ count += 1
295
288
  end
296
289
 
297
- assert_equal("hid1" , $ie.hiddens[1].name )
298
- assert_equal("hidden_1" , $ie.hiddens[2].id )
290
+ assert_equal("hid1", browser.hiddens[1].name)
291
+ assert_equal("hidden_1", browser.hiddens[2].id)
299
292
  end
300
293
  end