unittests/frame_test.rb in watir-1.8.0 vs unittests/frame_test.rb in watir-1.8.1.rc1

@@ -9,47 +9,48 @@
   def setup
     goto_page "frame_buttons.html"
   end
 
   def test_frame_no_what
-    assert_raises(UnknownFrameException) { browser.frame("missingFrame").button(:id, "b2").enabled?  }
+    assert_raises(UnknownObjectException) { browser.frame("missingFrame").button(:id, "b2").enabled?  }
     assert_raises(UnknownObjectException) { browser.frame("buttonFrame2").button(:id, "b2").enabled?  }
     assert(browser.frame("buttonFrame").button(:id, "b2").enabled?)
     assert_false(browser.frame("buttonFrame").button(:caption, "Disabled Button").enabled?)
   end
 
   def test_frame_using_name
-    assert_raises(UnknownFrameException) { browser.frame(:name, "missingFrame").button(:id, "b2").enabled?  }
+    assert_raises(UnknownObjectException) { browser.frame(:name, "missingFrame").button(:id, "b2").enabled?  }
     assert_raises(UnknownObjectException) { browser.frame(:name, "buttonFrame2").button(:id, "b2").enabled?  }
     assert(browser.frame(:name, "buttonFrame").button(:id, "b2").enabled?)
     assert_false(browser.frame(:name, "buttonFrame").button(:caption, "Disabled Button").enabled?)
   end
 
   def test_frame_using_name_and_regexp
-    assert_raises(UnknownFrameException) { browser.frame(:name, /missingFrame/).button(:id, "b2").enabled?  }
+    assert_raises(UnknownObjectException) { browser.frame(:name, /missingFrame/).button(:id, "b2").enabled?  }
     assert(browser.frame(:name, /button/).button(:id, "b2").enabled?)
   end
 
   def test_frame_using_index
-    assert_raises(UnknownFrameException) { browser.frame(:index, 8).button(:id, "b2").enabled?  }
+    assert_raises(UnknownObjectException) { browser.frame(:index, 8).button(:id, "b2").enabled?  }
     assert_raises(UnknownObjectException) { browser.frame(:index, 2).button(:id, "b2").enabled?  }
     assert(browser.frame(:index, 1 ).button(:id, "b2").enabled?)
     assert_false(browser.frame(:index, 1).button(:caption, "Disabled Button").enabled?)
+    assert_equal('blankpage.html', browser.frame(:index, 2).src)
   end
 
   tag_method :test_frame_with_invalid_attribute, :fails_on_firefox
 
   def test_frame_with_invalid_attribute
-    assert_raises(ArgumentError) { browser.frame(:blah, 'no_such_thing').button(:id, "b2").enabled?  }
+    assert_raises(MissingWayOfFindingObjectException) { browser.frame(:blah, 'no_such_thing').button(:id, "b2").enabled?  }
   end
 
   def test_preset_frame
     # with ruby's instance_eval, we are able to use the same frame for several actions
     results = browser.frame("buttonFrame").instance_eval do
       [
-              button(:id, "b2").enabled?,
-              button(:caption, "Disabled Button").enabled?
+        button(:id, "b2").enabled?,
+        button(:caption, "Disabled Button").enabled?
       ]
     end
     assert_equal([true, false], results)
   end
 end
@@ -61,15 +62,15 @@
   def setup
     goto_page "frame_multi.html"
   end
 
   def test_frame_with_no_name
-    assert_raises(UnknownFrameException) { browser.frame(:name, "missingFrame").button(:id, "b2").enabled?  }
+    assert_raises(UnknownObjectException) { browser.frame(:name, "missingFrame").button(:id, "b2").enabled?  }
   end
 
   def test_frame_by_id
-    assert_raises(UnknownFrameException) { browser.frame(:id, "missingFrame").button(:id, "b2").enabled?  }
+    assert_raises(UnknownObjectException) { browser.frame(:id, "missingFrame").button(:id, "b2").enabled?  }
     assert(browser.frame(:id, 'first_frame').button(:id, "b2").enabled?)
   end
 
   def test_frame_by_src
     assert(browser.frame(:src, /pass/).button(:value, 'Close Window').exists?)
@@ -83,12 +84,12 @@
   def setup
     goto_page "nestedFrames.html"
   end
 
   def test_frame
-    assert_raises(UnknownFrameException) { browser.frame("missingFrame").button(:id, "b2").enabled?  }
-    assert_raises(UnknownFrameException) { browser.frame("nestedFrame").frame("subFrame").button(:id, "b2").enabled?  }
+    assert_raises(UnknownObjectException) { browser.frame("missingFrame").button(:id, "b2").enabled?  }
+    assert_raises(UnknownObjectException) { browser.frame("nestedFrame").frame("subFrame").button(:id, "b2").enabled?  }
     assert(browser.frame("nestedFrame").frame("senderFrame").button(:name, "sendIt").enabled?)
     browser.frame("nestedFrame").frame("senderFrame").text_field(:index, "1").set("Hello")
     browser.frame("nestedFrame").frame("senderFrame").button(:name, "sendIt").click
     assert(browser.frame("nestedFrame").frame("receiverFrame").text_field(:name, "receiverText").verify_contains("Hello"))
   end
@@ -169,5 +170,27 @@
     frame.button(:id => "b2").click_no_wait
     assert frame.text.include?("PASS")
   end
 end
 
+class TC_Frame_multiple_attributes < Test::Unit::TestCase
+  def setup
+    goto_page "frame_multi.html"
+  end
+
+  def test_get_frame_by_name_and_id
+    assert_equal('blankpage.html', browser.frame(:id => 'second_frame', :name => 'buttonFrame2').src)
+  end
+end
+
+class TC_frames_method_for_container < Test::Unit::TestCase
+  def setup
+    goto_page "frame_multi.html"
+  end
+
+  def test_frames_collection
+    frames = browser.frames
+    assert_equal(3, frames.length)
+    assert_equal('first_frame', frames[1].id)
+    assert_equal('pass.html', frames[3].src)
+  end
+end
\ No newline at end of file