watir 6.10.1 → 6.10.2

data/spec/watirspec/elements/hns_spec.rb

@@ -1,38 +1,38 @@
-require "watirspec_helper"
-
-describe ["H1s", "H2s", "H3s", "H4s", "H5s", "H6s"] do
-  before :each do
-    browser.goto(WatirSpec.url_for("non_control_elements.html"))
-  end
-
-  describe "with selectors" do
-    it "returns the matching elements" do
-      expect(browser.h1s(class: "primary").to_a).to eq [browser.h1(class: "primary")]
-    end
-  end
-
-  describe "#length" do
-    it "returns the number of h1s" do
-      expect(browser.h2s.length).to eq 9
-    end
-  end
-
-  describe "#[]" do
-    it "returns the h1 at the given index" do
-      expect(browser.h1s[0].id).to eq "first_header"
-    end
-  end
-
-  describe "#each" do
-    it "iterates through header collections correctly" do
-      lengths = (1..6).collect do |i|
-        collection = browser.send(:"h#{i}s")
-        collection.each_with_index do |h, index|
-          expect(h.id).to eq browser.send(:"h#{i}", :index, index).id
-        end
-        collection.length
-      end
-      expect(lengths).to eq [2, 9, 2, 1, 1, 2]
-    end
-  end
-end
+require "watirspec_helper"
+
+describe ["H1s", "H2s", "H3s", "H4s", "H5s", "H6s"] do
+  before :each do
+    browser.goto(WatirSpec.url_for("non_control_elements.html"))
+  end
+
+  describe "with selectors" do
+    it "returns the matching elements" do
+      expect(browser.h1s(class: "primary").to_a).to eq [browser.h1(class: "primary")]
+    end
+  end
+
+  describe "#length" do
+    it "returns the number of h1s" do
+      expect(browser.h2s.length).to eq 9
+    end
+  end
+
+  describe "#[]" do
+    it "returns the h1 at the given index" do
+      expect(browser.h1s[0].id).to eq "first_header"
+    end
+  end
+
+  describe "#each" do
+    it "iterates through header collections correctly" do
+      lengths = (1..6).collect do |i|
+        collection = browser.send(:"h#{i}s")
+        collection.each_with_index do |h, index|
+          expect(h.id).to eq browser.send(:"h#{i}", :index, index).id
+        end
+        collection.length
+      end
+      expect(lengths).to eq [2, 9, 2, 1, 1, 2]
+    end
+  end
+end

data/spec/watirspec/elements/iframe_spec.rb

@@ -81,6 +81,9 @@ describe "IFrame" do
       expect(nested_element).to exist
     end
 
+    it "returns false for sub-element of a non-existing iframe" do
+      expect(browser.iframe(id: 'no_such_id').element).to_not exist
+    end
 
     bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1255946", :firefox do
       not_compliant_on :safari do

data/spec/watirspec/elements/iframes_spec.rb

@@ -1,47 +1,47 @@
-require "watirspec_helper"
-
-describe "IFrames" do
-
-  before :each do
-    browser.goto(WatirSpec.url_for("iframes.html"))
-  end
-
-  describe "with selectors" do
-    it "returns the matching elements" do
-      expect(browser.iframes(id: "iframe_2").to_a).to eq [browser.iframe(id: "iframe_2")]
-    end
-  end
-
-  describe "eql?" do
-    it "matches equality of iframe with that from a collection" do
-      expect(browser.iframes.last).to eq browser.iframe(id: "iframe_2")
-    end
-
-  end
-
-  describe "#length" do
-    it "returns the correct number of iframes" do
-      expect(browser.iframes.length).to eq 2
-    end
-  end
-
-  describe "#[]" do
-    it "returns the iframe at the given index" do
-      expect(browser.iframes[0].id).to eq "iframe_1"
-    end
-  end
-
-  describe "#each" do
-    it "iterates through frames correctly" do
-      count = 0
-
-      browser.iframes.each_with_index do |f, index|
-        expect(f.name).to eq browser.iframe(index: index).name
-        expect(f.id).to eq browser.iframe(index: index).id
-        count += 1
-      end
-
-      expect(count).to be > 0
-    end
-  end
-end
+require "watirspec_helper"
+
+describe "IFrames" do
+
+  before :each do
+    browser.goto(WatirSpec.url_for("iframes.html"))
+  end
+
+  describe "with selectors" do
+    it "returns the matching elements" do
+      expect(browser.iframes(id: "iframe_2").to_a).to eq [browser.iframe(id: "iframe_2")]
+    end
+  end
+
+  describe "eql?" do
+    it "matches equality of iframe with that from a collection" do
+      expect(browser.iframes.last).to eq browser.iframe(id: "iframe_2")
+    end
+
+  end
+
+  describe "#length" do
+    it "returns the correct number of iframes" do
+      expect(browser.iframes.length).to eq 2
+    end
+  end
+
+  describe "#[]" do
+    it "returns the iframe at the given index" do
+      expect(browser.iframes[0].id).to eq "iframe_1"
+    end
+  end
+
+  describe "#each" do
+    it "iterates through frames correctly" do
+      count = 0
+
+      browser.iframes.each_with_index do |f, index|
+        expect(f.name).to eq browser.iframe(index: index).name
+        expect(f.id).to eq browser.iframe(index: index).id
+        count += 1
+      end
+
+      expect(count).to be > 0
+    end
+  end
+end

data/spec/watirspec/elements/image_spec.rb

@@ -1,158 +1,158 @@
-require "watirspec_helper"
-
-describe "Image" do
-
-  before :each do
-    browser.goto(WatirSpec.url_for("images.html"))
-  end
-
-  # Exists method
-  describe "#exists?" do
-    it "returns true when the image exists" do
-      expect(browser.image(id: 'square')).to exist
-      expect(browser.image(id: /square/)).to exist
-      expect(browser.image(src: 'images/circle.png')).to exist
-      expect(browser.image(src: /circle/)).to exist
-      expect(browser.image(alt: 'circle')).to exist
-      expect(browser.image(alt: /cir/)).to exist
-      expect(browser.image(title: 'Circle')).to exist
-    end
-
-    it "returns the first image if given no args" do
-      expect(browser.image).to exist
-    end
-
-    it "returns false when the image doesn't exist" do
-      expect(browser.image(id: 'no_such_id')).to_not exist
-      expect(browser.image(id: /no_such_id/)).to_not exist
-      expect(browser.image(src: 'no_such_src')).to_not exist
-      expect(browser.image(src: /no_such_src/)).to_not exist
-      expect(browser.image(alt: 'no_such_alt')).to_not exist
-      expect(browser.image(alt: /no_such_alt/)).to_not exist
-      expect(browser.image(title: 'no_such_title')).to_not exist
-      expect(browser.image(title: /no_such_title/)).to_not exist
-    end
-
-    it "raises TypeError when 'what' argument is invalid" do
-      expect { browser.image(id: 3.14).exists? }.to raise_error(TypeError)
-    end
-  end
-
-  # Attribute methods
-  describe "#alt" do
-    it "returns the alt attribute of the image if the image exists" do
-      expect(browser.image(id: 'square').alt).to eq "square"
-      expect(browser.image(title: 'Circle').alt).to eq 'circle'
-    end
-
-    it "returns an empty string if the image exists and the attribute doesn't" do
-      expect(browser.image(index: 0).alt).to eq ""
-    end
-
-    it "raises UnknownObjectException if the image doesn't exist" do
-      expect { browser.image(index: 1337).alt }.to raise_unknown_object_exception
-    end
-  end
-
-  describe "#id" do
-    it "returns the id attribute of the image if the image exists" do
-      expect(browser.image(title: 'Square').id).to eq 'square'
-    end
-
-    it "returns an empty string if the image exists and the attribute doesn't" do
-      expect(browser.image(index: 0).id).to eq ""
-    end
-
-    it "raises UnknownObjectException if the image doesn't exist" do
-      expect { browser.image(index: 1337).id }.to raise_unknown_object_exception
-    end
-  end
-
-  describe "#src" do
-    it "returns the src attribute of the image if the image exists" do
-      expect(browser.image(id: 'square').src).to include("square.png")
-    end
-
-    it "returns an empty string if the image exists and the attribute doesn't" do
-      expect(browser.image(index: 0).src).to eq ""
-    end
-
-    it "raises UnknownObjectException if the image doesn't exist" do
-      expect { browser.image(index: 1337).src }.to raise_unknown_object_exception
-    end
-  end
-
-  describe "#title" do
-    it "returns the title attribute of the image if the image exists" do
-      expect(browser.image(id: 'square').title).to eq 'Square'
-    end
-
-    it "returns an empty string if the image exists and the attribute doesn't" do
-      expect(browser.image(index: 0).title).to eq ""
-    end
-
-    it "raises UnknownObjectException if the image doesn't exist" do
-      expect { browser.image(index: 1337).title }.to raise_unknown_object_exception
-    end
-  end
-
-  describe "#respond_to?" do
-    it "returns true for all attribute methods" do
-      expect(browser.image(index: 0)).to respond_to(:class_name)
-      expect(browser.image(index: 0)).to respond_to(:id)
-      expect(browser.image(index: 0)).to respond_to(:style)
-      expect(browser.image(index: 0)).to respond_to(:text)
-    end
-  end
-
-  # Manipulation methods
-  describe "#click" do
-    it "raises UnknownObjectException when the image doesn't exist" do
-      expect { browser.image(id: 'missing_attribute').click }.to raise_unknown_object_exception
-      expect { browser.image(class: 'missing_attribute').click }.to raise_unknown_object_exception
-      expect { browser.image(src: 'missing_attribute').click }.to raise_unknown_object_exception
-      expect { browser.image(alt: 'missing_attribute').click }.to raise_unknown_object_exception
-    end
-  end
-
-  describe "#height" do
-    it "returns the height of the image if the image exists" do
-      expect(browser.image(id: 'square').height).to eq 88
-    end
-
-    it "raises UnknownObjectException if the image doesn't exist" do
-      expect { browser.image(index: 1337).height }.to raise_unknown_object_exception
-    end
-  end
-
-  describe "#width" do
-    it "returns the width of the image if the image exists" do
-      expect(browser.image(id: 'square').width).to eq 88
-    end
-
-    it "raises UnknownObjectException if the image doesn't exist" do
-      expect { browser.image(index: 1337).width }.to raise_unknown_object_exception
-    end
-  end
-
-  # Other
-  describe "#loaded?" do
-    it "returns true if the image has been loaded" do
-      expect(browser.image(title: 'Circle')).to be_loaded
-      expect(browser.image(alt: 'circle')).to be_loaded
-      expect(browser.image(alt: /circle/)).to be_loaded
-    end
-
-    it "returns false if the image has not been loaded" do
-      expect(browser.image(id: 'no_such_file')).to_not be_loaded
-    end
-
-    it "raises UnknownObjectException if the image doesn't exist" do
-      expect { browser.image(id: 'no_such_image').loaded? }.to raise_unknown_object_exception
-      expect { browser.image(src: 'no_such_image').loaded? }.to raise_unknown_object_exception
-      expect { browser.image(alt: 'no_such_image').loaded? }.to raise_unknown_object_exception
-      expect { browser.image(index: 1337).loaded? }.to raise_unknown_object_exception
-    end
-  end
-
-end
+require "watirspec_helper"
+
+describe "Image" do
+
+  before :each do
+    browser.goto(WatirSpec.url_for("images.html"))
+  end
+
+  # Exists method
+  describe "#exists?" do
+    it "returns true when the image exists" do
+      expect(browser.image(id: 'square')).to exist
+      expect(browser.image(id: /square/)).to exist
+      expect(browser.image(src: 'images/circle.png')).to exist
+      expect(browser.image(src: /circle/)).to exist
+      expect(browser.image(alt: 'circle')).to exist
+      expect(browser.image(alt: /cir/)).to exist
+      expect(browser.image(title: 'Circle')).to exist
+    end
+
+    it "returns the first image if given no args" do
+      expect(browser.image).to exist
+    end
+
+    it "returns false when the image doesn't exist" do
+      expect(browser.image(id: 'no_such_id')).to_not exist
+      expect(browser.image(id: /no_such_id/)).to_not exist
+      expect(browser.image(src: 'no_such_src')).to_not exist
+      expect(browser.image(src: /no_such_src/)).to_not exist
+      expect(browser.image(alt: 'no_such_alt')).to_not exist
+      expect(browser.image(alt: /no_such_alt/)).to_not exist
+      expect(browser.image(title: 'no_such_title')).to_not exist
+      expect(browser.image(title: /no_such_title/)).to_not exist
+    end
+
+    it "raises TypeError when 'what' argument is invalid" do
+      expect { browser.image(id: 3.14).exists? }.to raise_error(TypeError)
+    end
+  end
+
+  # Attribute methods
+  describe "#alt" do
+    it "returns the alt attribute of the image if the image exists" do
+      expect(browser.image(id: 'square').alt).to eq "square"
+      expect(browser.image(title: 'Circle').alt).to eq 'circle'
+    end
+
+    it "returns an empty string if the image exists and the attribute doesn't" do
+      expect(browser.image(index: 0).alt).to eq ""
+    end
+
+    it "raises UnknownObjectException if the image doesn't exist" do
+      expect { browser.image(index: 1337).alt }.to raise_unknown_object_exception
+    end
+  end
+
+  describe "#id" do
+    it "returns the id attribute of the image if the image exists" do
+      expect(browser.image(title: 'Square').id).to eq 'square'
+    end
+
+    it "returns an empty string if the image exists and the attribute doesn't" do
+      expect(browser.image(index: 0).id).to eq ""
+    end
+
+    it "raises UnknownObjectException if the image doesn't exist" do
+      expect { browser.image(index: 1337).id }.to raise_unknown_object_exception
+    end
+  end
+
+  describe "#src" do
+    it "returns the src attribute of the image if the image exists" do
+      expect(browser.image(id: 'square').src).to include("square.png")
+    end
+
+    it "returns an empty string if the image exists and the attribute doesn't" do
+      expect(browser.image(index: 0).src).to eq ""
+    end
+
+    it "raises UnknownObjectException if the image doesn't exist" do
+      expect { browser.image(index: 1337).src }.to raise_unknown_object_exception
+    end
+  end
+
+  describe "#title" do
+    it "returns the title attribute of the image if the image exists" do
+      expect(browser.image(id: 'square').title).to eq 'Square'
+    end
+
+    it "returns an empty string if the image exists and the attribute doesn't" do
+      expect(browser.image(index: 0).title).to eq ""
+    end
+
+    it "raises UnknownObjectException if the image doesn't exist" do
+      expect { browser.image(index: 1337).title }.to raise_unknown_object_exception
+    end
+  end
+
+  describe "#respond_to?" do
+    it "returns true for all attribute methods" do
+      expect(browser.image(index: 0)).to respond_to(:class_name)
+      expect(browser.image(index: 0)).to respond_to(:id)
+      expect(browser.image(index: 0)).to respond_to(:style)
+      expect(browser.image(index: 0)).to respond_to(:text)
+    end
+  end
+
+  # Manipulation methods
+  describe "#click" do
+    it "raises UnknownObjectException when the image doesn't exist" do
+      expect { browser.image(id: 'missing_attribute').click }.to raise_unknown_object_exception
+      expect { browser.image(class: 'missing_attribute').click }.to raise_unknown_object_exception
+      expect { browser.image(src: 'missing_attribute').click }.to raise_unknown_object_exception
+      expect { browser.image(alt: 'missing_attribute').click }.to raise_unknown_object_exception
+    end
+  end
+
+  describe "#height" do
+    it "returns the height of the image if the image exists" do
+      expect(browser.image(id: 'square').height).to eq 88
+    end
+
+    it "raises UnknownObjectException if the image doesn't exist" do
+      expect { browser.image(index: 1337).height }.to raise_unknown_object_exception
+    end
+  end
+
+  describe "#width" do
+    it "returns the width of the image if the image exists" do
+      expect(browser.image(id: 'square').width).to eq 88
+    end
+
+    it "raises UnknownObjectException if the image doesn't exist" do
+      expect { browser.image(index: 1337).width }.to raise_unknown_object_exception
+    end
+  end
+
+  # Other
+  describe "#loaded?" do
+    it "returns true if the image has been loaded" do
+      expect(browser.image(title: 'Circle')).to be_loaded
+      expect(browser.image(alt: 'circle')).to be_loaded
+      expect(browser.image(alt: /circle/)).to be_loaded
+    end
+
+    it "returns false if the image has not been loaded" do
+      expect(browser.image(id: 'no_such_file')).to_not be_loaded
+    end
+
+    it "raises UnknownObjectException if the image doesn't exist" do
+      expect { browser.image(id: 'no_such_image').loaded? }.to raise_unknown_object_exception
+      expect { browser.image(src: 'no_such_image').loaded? }.to raise_unknown_object_exception
+      expect { browser.image(alt: 'no_such_image').loaded? }.to raise_unknown_object_exception
+      expect { browser.image(index: 1337).loaded? }.to raise_unknown_object_exception
+    end
+  end
+
+end