watir 7.2.0 → 7.2.1

data/spec/watirspec/elements/image_spec.rb

@@ -2,157 +2,159 @@
 
 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
+module Watir
+  describe Image do
+    before 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')).not_to exist
+        expect(browser.image(id: /no_such_id/)).not_to exist
+        expect(browser.image(src: 'no_such_src')).not_to exist
+        expect(browser.image(src: /no_such_src/)).not_to exist
+        expect(browser.image(alt: 'no_such_alt')).not_to exist
+        expect(browser.image(alt: /no_such_alt/)).not_to exist
+        expect(browser.image(title: 'no_such_title')).not_to exist
+        expect(browser.image(title: /no_such_title/)).not_to 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).title }.to raise_unknown_object_exception
+      it "raises UnknownObjectException if the image doesn't exist" do
+        expect { browser.image(index: 1337).width }.to raise_unknown_object_exception
+      end
     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
+    # 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
 
-  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 'returns false if the image has not been loaded' do
+        expect(browser.image(id: 'no_such_file')).not_to 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
+      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
 end

data/spec/watirspec/elements/images_spec.rb

@@ -2,39 +2,41 @@
 
 require 'watirspec_helper'
 
-describe 'Images' do
-  before :each do
-    browser.goto(WatirSpec.url_for('images.html'))
-  end
+module Watir
+  describe ImageCollection do
+    before do
+      browser.goto(WatirSpec.url_for('images.html'))
+    end
 
-  describe 'with selectors' do
-    it 'returns the matching elements' do
-      expect(browser.images(alt: 'circle').to_a).to eq [browser.image(alt: 'circle')]
+    describe 'with selectors' do
+      it 'returns the matching elements' do
+        expect(browser.images(alt: 'circle').to_a).to eq [browser.image(alt: 'circle')]
+      end
     end
-  end
 
-  describe '#length' do
-    it 'returns the number of images' do
-      expect(browser.images.length).to eq 10
+    describe '#length' do
+      it 'returns the number of images' do
+        expect(browser.images.length).to eq 10
+      end
     end
-  end
 
-  describe '#[]' do
-    it 'returns the image at the given index' do
-      expect(browser.images[5].id).to eq 'square'
+    describe '#[]' do
+      it 'returns the image at the given index' do
+        expect(browser.images[5].id).to eq 'square'
+      end
     end
-  end
 
-  describe '#each' do
-    it 'iterates through images correctly' do
-      count = 0
+    describe '#each' do
+      it 'iterates through images correctly' do
+        count = 0
 
-      browser.images.each_with_index do |c, index|
-        expect(c.id).to eq browser.image(index: index).id
-        count += 1
-      end
+        browser.images.each_with_index do |c, index|
+          expect(c.id).to eq browser.image(index: index).id
+          count += 1
+        end
 
-      expect(count).to be > 0
+        expect(count).to be > 0
+      end
     end
   end
 end

data/spec/watirspec/elements/input_spec.rb

@@ -2,14 +2,16 @@
 
 require 'watirspec_helper'
 
-describe Watir::Input do
-  before do
-    browser.goto WatirSpec.url_for('forms_with_input_elements.html')
-  end
+module Watir
+  describe Input do
+    before do
+      browser.goto WatirSpec.url_for('forms_with_input_elements.html')
+    end
 
-  describe '#type' do
-    it 'returns an email type' do
-      expect(browser.input(name: 'html5_email').type).to eq 'email'
+    describe '#type' do
+      it 'returns an email type' do
+        expect(browser.input(name: 'html5_email').type).to eq 'email'
+      end
     end
   end
 end

data/spec/watirspec/elements/ins_spec.rb

@@ -2,110 +2,112 @@
 
 require 'watirspec_helper'
 
-describe 'Ins' do
-  before :each do
-    browser.goto(WatirSpec.url_for('non_control_elements.html'))
-  end
-
-  # Exists method
-  describe '#exist?' do
-    it "returns true if the 'ins' exists" do
-      expect(browser.ins(id: 'lead')).to exist
-      expect(browser.ins(id: /lead/)).to exist
-      expect(browser.ins(text: 'This is an inserted text tag 1')).to exist
-      expect(browser.ins(text: /This is an inserted text tag 1/)).to exist
-      expect(browser.ins(class: 'lead')).to exist
-      expect(browser.ins(class: /lead/)).to exist
-      expect(browser.ins(index: 0)).to exist
-      expect(browser.ins(xpath: "//ins[@id='lead']")).to exist
-    end
-
-    it 'returns the first ins if given no args' do
-      expect(browser.ins).to exist
-    end
-
-    it "returns false if the element doesn't exist" do
-      expect(browser.ins(id: 'no_such_id')).to_not exist
-      expect(browser.ins(id: /no_such_id/)).to_not exist
-      expect(browser.ins(text: 'no_such_text')).to_not exist
-      expect(browser.ins(text: /no_such_text/)).to_not exist
-      expect(browser.ins(class: 'no_such_class')).to_not exist
-      expect(browser.ins(class: /no_such_class/)).to_not exist
-      expect(browser.ins(index: 1337)).to_not exist
-      expect(browser.ins(xpath: "//ins[@id='no_such_id']")).to_not exist
-    end
-
-    it "raises TypeError when 'what' argument is invalid" do
-      expect { browser.ins(id: 3.14).exists? }.to raise_error(TypeError)
-    end
-  end
-
-  # Attribute methods
-  describe '#id' do
-    it 'returns the id attribute' do
-      expect(browser.ins(index: 0).id).to eq 'lead'
-    end
-
-    it "returns an empty string if the element exists and the attribute doesn't" do
-      expect(browser.ins(index: 2).id).to eq ''
-    end
-
-    it "raises UnknownObjectException if the ins doesn't exist" do
-      expect { browser.ins(id: 'no_such_id').id }.to raise_unknown_object_exception
-      expect { browser.ins(index: 1337).id }.to raise_unknown_object_exception
-    end
-  end
-
-  describe '#title' do
-    it 'returns the title attribute' do
-      expect(browser.ins(index: 0).title).to eq 'Lorem ipsum'
-    end
-
-    it "returns an empty string if the element exists and the attribute doesn't" do
-      expect(browser.ins(index: 2).title).to eq ''
-    end
-
-    it "raises UnknownObjectException if the ins doesn't exist" do
-      expect { browser.ins(id: 'no_such_id').title }.to raise_unknown_object_exception
-      expect { browser.ins(xpath: "//ins[@id='no_such_id']").title }.to raise_unknown_object_exception
-    end
-  end
-
-  describe '#text' do
-    it 'returns the text of the ins' do
-      expect(browser.ins(index: 1).text).to eq 'This is an inserted text tag 2'
-    end
-
-    it "returns an empty string if the element doesn't contain any text" do
-      expect(browser.ins(index: 3).text).to eq ''
-    end
-
-    it "raises UnknownObjectException if the ins doesn't exist" do
-      expect { browser.ins(id: 'no_such_id').text }.to raise_unknown_object_exception
-      expect { browser.ins(xpath: "//ins[@id='no_such_id']").text }.to raise_unknown_object_exception
-    end
-  end
-
-  describe '#respond_to?' do
-    it 'returns true for all attribute methods' do
-      expect(browser.ins(index: 0)).to respond_to(:class_name)
-      expect(browser.ins(index: 0)).to respond_to(:id)
-      expect(browser.ins(index: 0)).to respond_to(:title)
-      expect(browser.ins(index: 0)).to respond_to(:text)
-    end
-  end
-
-  # Other
-  describe '#click', except: {headless: true} do
-    it 'fires events' do
-      expect(browser.ins(class: 'footer').text).to_not include('Javascript')
-      browser.ins(class: 'footer').click
-      expect(browser.ins(class: 'footer').text).to include('Javascript')
-    end
-
-    it "raises UnknownObjectException if the ins doesn't exist" do
-      expect { browser.ins(id: 'no_such_id').click }.to raise_unknown_object_exception
-      expect { browser.ins(title: 'no_such_title').click }.to raise_unknown_object_exception
+module Watir
+  describe 'Ins' do
+    before do
+      browser.goto(WatirSpec.url_for('non_control_elements.html'))
+    end
+
+    # Exists method
+    describe '#exist?' do
+      it "returns true if the 'ins' exists" do
+        expect(browser.ins(id: 'lead')).to exist
+        expect(browser.ins(id: /lead/)).to exist
+        expect(browser.ins(text: 'This is an inserted text tag 1')).to exist
+        expect(browser.ins(text: /This is an inserted text tag 1/)).to exist
+        expect(browser.ins(class: 'lead')).to exist
+        expect(browser.ins(class: /lead/)).to exist
+        expect(browser.ins(index: 0)).to exist
+        expect(browser.ins(xpath: "//ins[@id='lead']")).to exist
+      end
+
+      it 'returns the first ins if given no args' do
+        expect(browser.ins).to exist
+      end
+
+      it "returns false if the element doesn't exist" do
+        expect(browser.ins(id: 'no_such_id')).not_to exist
+        expect(browser.ins(id: /no_such_id/)).not_to exist
+        expect(browser.ins(text: 'no_such_text')).not_to exist
+        expect(browser.ins(text: /no_such_text/)).not_to exist
+        expect(browser.ins(class: 'no_such_class')).not_to exist
+        expect(browser.ins(class: /no_such_class/)).not_to exist
+        expect(browser.ins(index: 1337)).not_to exist
+        expect(browser.ins(xpath: "//ins[@id='no_such_id']")).not_to exist
+      end
+
+      it "raises TypeError when 'what' argument is invalid" do
+        expect { browser.ins(id: 3.14).exists? }.to raise_error(TypeError)
+      end
+    end
+
+    # Attribute methods
+    describe '#id' do
+      it 'returns the id attribute' do
+        expect(browser.ins(index: 0).id).to eq 'lead'
+      end
+
+      it "returns an empty string if the element exists and the attribute doesn't" do
+        expect(browser.ins(index: 2).id).to eq ''
+      end
+
+      it "raises UnknownObjectException if the ins doesn't exist" do
+        expect { browser.ins(id: 'no_such_id').id }.to raise_unknown_object_exception
+        expect { browser.ins(index: 1337).id }.to raise_unknown_object_exception
+      end
+    end
+
+    describe '#title' do
+      it 'returns the title attribute' do
+        expect(browser.ins(index: 0).title).to eq 'Lorem ipsum'
+      end
+
+      it "returns an empty string if the element exists and the attribute doesn't" do
+        expect(browser.ins(index: 2).title).to eq ''
+      end
+
+      it "raises UnknownObjectException if the ins doesn't exist" do
+        expect { browser.ins(id: 'no_such_id').title }.to raise_unknown_object_exception
+        expect { browser.ins(xpath: "//ins[@id='no_such_id']").title }.to raise_unknown_object_exception
+      end
+    end
+
+    describe '#text' do
+      it 'returns the text of the ins' do
+        expect(browser.ins(index: 1).text).to eq 'This is an inserted text tag 2'
+      end
+
+      it "returns an empty string if the element doesn't contain any text" do
+        expect(browser.ins(index: 3).text).to eq ''
+      end
+
+      it "raises UnknownObjectException if the ins doesn't exist" do
+        expect { browser.ins(id: 'no_such_id').text }.to raise_unknown_object_exception
+        expect { browser.ins(xpath: "//ins[@id='no_such_id']").text }.to raise_unknown_object_exception
+      end
+    end
+
+    describe '#respond_to?' do
+      it 'returns true for all attribute methods' do
+        expect(browser.ins(index: 0)).to respond_to(:class_name)
+        expect(browser.ins(index: 0)).to respond_to(:id)
+        expect(browser.ins(index: 0)).to respond_to(:title)
+        expect(browser.ins(index: 0)).to respond_to(:text)
+      end
+    end
+
+    # Other
+    describe '#click', except: {headless: true} do
+      it 'fires events' do
+        expect(browser.ins(class: 'footer').text).not_to include('Javascript')
+        browser.ins(class: 'footer').click
+        expect(browser.ins(class: 'footer').text).to include('Javascript')
+      end
+
+      it "raises UnknownObjectException if the ins doesn't exist" do
+        expect { browser.ins(id: 'no_such_id').click }.to raise_unknown_object_exception
+        expect { browser.ins(title: 'no_such_title').click }.to raise_unknown_object_exception
+      end
     end
   end
 end