watir 1.9.0 → 1.9.1.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (72) hide show
  1. data/CHANGES +5 -1
  2. data/VERSION +1 -1
  3. data/lib/watir/element.rb +16 -13
  4. data/lib/watir/form.rb +2 -1
  5. data/lib/watir/ie-class.rb +6 -1
  6. data/lib/watir/locator.rb +1 -1
  7. data/unittests/css_selector_test.rb +1 -1
  8. data/unittests/defer_test.rb +3 -2
  9. data/unittests/filefield_test.rb +2 -1
  10. data/unittests/form_test.rb +14 -9
  11. data/unittests/form_xpath_test.rb +8 -5
  12. data/unittests/frame_test.rb +115 -115
  13. data/unittests/html/JavascriptClick.html +1 -1
  14. data/unittests/html/blankpage.html +1 -1
  15. data/unittests/html/buttons1.html +1 -1
  16. data/unittests/html/checkboxes1.html +1 -1
  17. data/unittests/html/click_no_wait.html +1 -1
  18. data/unittests/html/complex_table.html +1 -1
  19. data/unittests/html/cssTest.html +1 -1
  20. data/unittests/html/depot_store.html +1 -1
  21. data/unittests/html/div.html +1 -1
  22. data/unittests/html/div_xml.html +1 -1
  23. data/unittests/html/fileupload.html +1 -1
  24. data/unittests/html/formTest1.html +1 -1
  25. data/unittests/html/forms2.html +1 -1
  26. data/unittests/html/forms3.html +1 -1
  27. data/unittests/html/forms4.html +1 -1
  28. data/unittests/html/google_india.html +1 -1
  29. data/unittests/html/iframeTest.html +11 -7
  30. data/unittests/html/iframeTest1.html +1 -1
  31. data/unittests/html/iframeTest2.html +1 -2
  32. data/unittests/html/images1.html +1 -1
  33. data/unittests/html/javascriptevents.html +20 -22
  34. data/unittests/html/link_pass.html +1 -1
  35. data/unittests/html/links1.html +1 -1
  36. data/unittests/html/links2.html +1 -1
  37. data/unittests/html/links_multi.html +1 -1
  38. data/unittests/html/list_matters.html +1 -1
  39. data/unittests/html/lists.html +1 -1
  40. data/unittests/html/map_test.html +1 -1
  41. data/unittests/html/modal_dialog.html +1 -1
  42. data/unittests/html/modal_dialog_launcher.html +1 -1
  43. data/unittests/html/nestedFrames.html +1 -1
  44. data/unittests/html/new_browser.html +1 -1
  45. data/unittests/html/pass.html +1 -1
  46. data/unittests/html/popups1.html +1 -1
  47. data/unittests/html/pre.html +2 -1
  48. data/unittests/html/radioButtons1.html +1 -1
  49. data/unittests/html/select_tealeaf.html +1 -1
  50. data/unittests/html/selectboxes1.html +2 -2
  51. data/unittests/html/simple_table.html +1 -1
  52. data/unittests/html/simple_table_buttons.html +1 -1
  53. data/unittests/html/simple_table_columns.html +1 -1
  54. data/unittests/html/table1.html +1 -1
  55. data/unittests/html/tableCell_using_xpath.html +1 -1
  56. data/unittests/html/table_and_tablerow_to_a.html +1 -1
  57. data/unittests/html/textarea.html +1 -1
  58. data/unittests/html/textfields1.html +1 -1
  59. data/unittests/html/textsearch.html +1 -1
  60. data/unittests/html/wallofcheckboxes.html +1 -1
  61. data/unittests/html/xpath_nbsp.html +1 -1
  62. data/unittests/js_events_test.rb +26 -0
  63. data/unittests/no_wait_test.rb +2 -2
  64. data/unittests/pre_test.rb +1 -1
  65. data/unittests/selectbox_xpath_test.rb +8 -3
  66. data/unittests/table_test.rb +1 -1
  67. data/unittests/textfields_test.rb +2 -2
  68. data/unittests/textfields_xpath_test.rb +2 -2
  69. metadata +24 -18
  70. data/unittests/html/ie_9.html +0 -6
  71. data/unittests/ie9_test.rb +0 -16
  72. data/unittests/windows/js_events_test.rb +0 -41
@@ -1,5 +1,5 @@
1
1
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
2
- <html>
2
+ <!doctype html>
3
3
  <head>
4
4
  <title>Test page for xpath with nbsp</title>
5
5
  </head>
@@ -0,0 +1,26 @@
1
+ # feature tests for JavaScript events
2
+
3
+ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
4
+ require 'unittests/setup'
5
+
6
+ class TC_JSEvents < Test::Unit::TestCase
7
+ def setup
8
+ goto_page "javascriptevents.html"
9
+ end
10
+
11
+ def test_keyboard_event
12
+ browser.text_field(:index, 1).fire_event("onkeyup")
13
+ assert(browser.div(:id, 'event_name').text == 'onkeyup')
14
+ end
15
+
16
+ def test_mouse_event
17
+ browser.text_field(:index, 1).fire_event("onmouseup")
18
+ assert(browser.div(:id, 'event_name').text == 'onmouseup')
19
+ end
20
+
21
+ def test_html_event
22
+ browser.select_list(:index, 1).fire_event("onchange")
23
+ assert(browser.div(:id, 'event_name').text == 'onchange')
24
+ end
25
+
26
+ end
@@ -4,9 +4,9 @@ require 'unittests/setup'
4
4
  class TC_No_Wait_Commands < Test::Unit::TestCase
5
5
  def test_fire_event_no_wait
6
6
  goto_page "javascriptevents.html"
7
- browser.link(:text, "Check the Status").fire_event_no_wait("onMouseOver")
7
+ browser.text_field(:index, 1).fire_event_no_wait("onkeyup")
8
8
  assert_nothing_raised{
9
- Watir::Wait.until {browser.status == "It worked"}
9
+ Watir::Wait.until {browser.div(:id, 'event_name').text == 'onkeyup'}
10
10
  }
11
11
  end
12
12
 
@@ -46,7 +46,7 @@ class TC_Pre < Test::Unit::TestCase
46
46
  tag_method :test_html, :fails_on_firefox # http://jira.openqa.org/browse/WTR-260
47
47
  def test_html
48
48
  pre = browser.pre(:index, 1)
49
- assert( pre.html.include?( "id=1 name=\"1\"" ) )
49
+ assert( pre.html.gsub('"','').include?( "id=1 name=1" ) )
50
50
  end
51
51
 
52
52
  end
@@ -39,9 +39,14 @@ class TC_Selectbox_XPath < Test::Unit::TestCase
39
39
  assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").clearSelection }
40
40
  browser.select_list(:xpath, "//select[@name='sel1']/").clearSelection
41
41
 
42
- # the box sel1 has no ability to have a de-selected item
43
- assert_equal( ["Option 3" ] , browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)
44
-
42
+ if Watir::IE.version_parts[0].to_i >= 9
43
+ # ie9 allows you to clear a selected item even if it requires a selection
44
+ assert_equal( [] , browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)
45
+ else
46
+ # the box sel1 has no ability to have a de-selected item
47
+ assert_equal( ["Option 3" ] , browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)
48
+ end
49
+
45
50
  browser.select_list(:xpath, "//select[@name='sel2']/").clearSelection
46
51
  assert_equal( [ ] , browser.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)
47
52
  end
@@ -118,7 +118,7 @@ class TC_Tables < Test::Unit::TestCase
118
118
  tag_method :test_row_in_table, :fails_on_firefox
119
119
  def test_row_in_table
120
120
  assert_equal 'Row 2 Col1 Row 2 Col2',
121
- browser.table(:id, 't1').row(:id, 'row1').text
121
+ browser.table(:id, 't1').row(:id, 'row1').text.gsub(/(\r|\n)/,'')
122
122
  end
123
123
 
124
124
  def test_row_iterator
@@ -159,12 +159,12 @@ class TC_Fields < Test::Unit::TestCase
159
159
  browser.text_field(:name, 'events_tester').requires_typing.set('p')
160
160
 
161
161
  # the following line has an extra keypress at the begining, as we mimic the delete key being pressed
162
- assert_equal( "keypresskeydownkeypresskeyup" , browser.text_field(:name, 'events_text').value.gsub("\r\n" , "") )
162
+ assert_equal( "keypresskeydownkeypresskeyup" , browser.text_field(:name, 'events_text').value.gsub(/(\r|\n)/ , "") )
163
163
  browser.button(:value, "Clear Events Box").click
164
164
  browser.text_field(:name, 'events_tester').requires_typing.set('ab')
165
165
 
166
166
  # the following line has an extra keypress at the begining, as we mimic the delete key being pressed
167
- assert_equal( "keypresskeydownkeypresskeyupkeydownkeypresskeyup", browser.text_field(:name , 'events_text').value.gsub("\r\n" , "") )
167
+ assert_equal( "keypresskeydownkeypresskeyupkeydownkeypresskeyup", browser.text_field(:name , 'events_text').value.gsub(/(\r|\n)/ , "") )
168
168
  end
169
169
 
170
170
  def test_password
@@ -91,12 +91,12 @@ class TC_Fields_XPath < Test::Unit::TestCase
91
91
  browser.text_field(:xpath , "//input[@name='events_tester']/").set('p')
92
92
 
93
93
  # the following line has an extra keypress at the begining, as we mimic the delete key being pressed
94
- assert_equal( "keypresskeydownkeypresskeyup" , browser.text_field(:xpath , "//textarea[@name='events_text']/").value.gsub("\r\n" , "") )
94
+ assert_equal( "keypresskeydownkeypresskeyup" , browser.text_field(:xpath , "//textarea[@name='events_text']/").value.gsub(/(\n|\r)/ , "") )
95
95
  browser.button(:value , "Clear Events Box").click
96
96
  browser.text_field(:xpath , "//input[@name='events_tester']/").set('ab')
97
97
 
98
98
  # the following line has an extra keypress at the begining, as we mimic the delete key being pressed
99
- assert_equal( "keypresskeydownkeypresskeyupkeydownkeypresskeyup" , browser.text_field(:xpath , "//textarea[@name='events_text']/").value.gsub("\r\n" , "") )
99
+ assert_equal( "keypresskeydownkeypresskeyupkeydownkeypresskeyup" , browser.text_field(:xpath , "//textarea[@name='events_text']/").value.gsub(/(\n|\r)/, "") )
100
100
  end
101
101
 
102
102
  def test_password
metadata CHANGED
@@ -1,13 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: watir
3
3
  version: !ruby/object:Gem::Version
4
- hash: 51
5
- prerelease:
4
+ hash: 15424175
5
+ prerelease: 6
6
6
  segments:
7
7
  - 1
8
8
  - 9
9
- - 0
10
- version: 1.9.0
9
+ - 1
10
+ - rc
11
+ - 1
12
+ version: 1.9.1.rc1
11
13
  platform: ruby
12
14
  authors:
13
15
  - Bret Pettichord
@@ -15,7 +17,7 @@ autorequire:
15
17
  bindir: bin
16
18
  cert_chain: []
17
19
 
18
- date: 2011-06-15 00:00:00 Z
20
+ date: 2011-06-26 00:00:00 Z
19
21
  dependencies:
20
22
  - !ruby/object:Gem::Dependency
21
23
  name: win32-process
@@ -57,12 +59,14 @@ dependencies:
57
59
  requirements:
58
60
  - - "="
59
61
  - !ruby/object:Gem::Version
60
- hash: 51
62
+ hash: 15424175
61
63
  segments:
62
64
  - 1
63
65
  - 9
64
- - 0
65
- version: 1.9.0
66
+ - 1
67
+ - rc
68
+ - 1
69
+ version: 1.9.1.rc1
66
70
  type: :runtime
67
71
  version_requirements: *id003
68
72
  - !ruby/object:Gem::Dependency
@@ -73,12 +77,14 @@ dependencies:
73
77
  requirements:
74
78
  - - "="
75
79
  - !ruby/object:Gem::Version
76
- hash: 51
80
+ hash: 15424175
77
81
  segments:
78
82
  - 1
79
83
  - 9
80
- - 0
81
- version: 1.9.0
84
+ - 1
85
+ - rc
86
+ - 1
87
+ version: 1.9.1.rc1
82
88
  type: :runtime
83
89
  version_requirements: *id004
84
90
  - !ruby/object:Gem::Dependency
@@ -194,12 +200,12 @@ files:
194
200
  - unittests/form_xpath_test.rb
195
201
  - unittests/frame_test.rb
196
202
  - unittests/google_form_test.rb
197
- - unittests/ie9_test.rb
198
203
  - unittests/ie_exists_test.rb
199
204
  - unittests/ie_mock.rb
200
205
  - unittests/ie_test.rb
201
206
  - unittests/images_test.rb
202
207
  - unittests/images_xpath_test.rb
208
+ - unittests/js_events_test.rb
203
209
  - unittests/links_multi_test.rb
204
210
  - unittests/links_test.rb
205
211
  - unittests/links_xpath_test.rb
@@ -253,7 +259,6 @@ files:
253
259
  - unittests/html/frame_links.html
254
260
  - unittests/html/frame_multi.html
255
261
  - unittests/html/google_india.html
256
- - unittests/html/ie_9.html
257
262
  - unittests/html/iframe.html
258
263
  - unittests/html/iframeTest.html
259
264
  - unittests/html/iframeTest1.html
@@ -314,7 +319,6 @@ files:
314
319
  - unittests/windows/frame_links_test.rb
315
320
  - unittests/windows/ie-each_test.rb
316
321
  - unittests/windows/iedialog_test.rb
317
- - unittests/windows/js_events_test.rb
318
322
  - unittests/windows/modal_dialog_test.rb
319
323
  - unittests/windows/new_test.rb
320
324
  - unittests/windows/open_close_test.rb
@@ -354,12 +358,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
354
358
  required_rubygems_version: !ruby/object:Gem::Requirement
355
359
  none: false
356
360
  requirements:
357
- - - ">="
361
+ - - ">"
358
362
  - !ruby/object:Gem::Version
359
- hash: 3
363
+ hash: 25
360
364
  segments:
361
- - 0
362
- version: "0"
365
+ - 1
366
+ - 3
367
+ - 1
368
+ version: 1.3.1
363
369
  requirements:
364
370
  - Microsoft Windows running Internet Explorer 5.5 or later.
365
371
  rubyforge_project: Watir
@@ -1,6 +0,0 @@
1
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
2
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3
- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" >
4
- This page loads with the correct document standards for IE. In IE9, without the doctype everything is run in Quirks mode
5
- <input type = button class="italic_button" name = b1 id = b2 value = "Click Me" onClick="javascript:document.location='pass.html';" title = "this is button1">
6
- </html>
@@ -1,16 +0,0 @@
1
- $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
2
- require 'unittests/setup'
3
-
4
- class TC_IE9 < Test::Unit::TestCase
5
- include Watir::Exception
6
-
7
- def setup
8
- goto_page "ie_9.html"
9
- end
10
-
11
- def test_clicking_button
12
- browser.button(:value, "Click Me").click
13
- assert(browser.text.include?("PASS") )
14
- end
15
-
16
- end
@@ -1,41 +0,0 @@
1
- # feature tests for JavaScript events
2
-
3
- $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
4
- require 'unittests/setup'
5
-
6
- class TC_JSEvents < Test::Unit::TestCase
7
- def setup
8
- goto_page "javascriptevents.html"
9
- end
10
-
11
- def test_Button_disabled
12
- assert_false( browser.button(:caption, "Button 1").enabled?)
13
- end
14
-
15
- def test_Button_Enabled
16
- browser.text_field(:name, "entertext").fire_event("onkeyup")
17
- assert(browser.button(:caption, "Button 1").enabled?)
18
- end
19
-
20
- def test_Button_click
21
- # Firing event to make button enabled
22
- browser.text_field(:name, "entertext").fire_event("onKeyUp")
23
- # Clicking the button
24
- browser.button(:caption, "Button 1").click
25
- assert(browser.text.include?("PASS") )
26
- end
27
-
28
- def test_page_nostatus
29
- assert_equal("Done", browser.status)
30
- end
31
-
32
- def test_set_page_status
33
- browser.link(:text, "Check the Status").fire_event("onMouseOver")
34
- assert_equal("It worked", browser.status)
35
- end
36
-
37
- def test_clear_page_status
38
- browser.link(:text, "Clear the Status").fire_event("onMouseOver")
39
- assert_equal("Done", browser.status)
40
- end
41
- end