watir 6.7.3 → 6.8.0

data/lib/watir/user_editable.rb

@@ -4,7 +4,7 @@ module Watir
     #
     # Clear the element, the type in the given value.
     #
-    # @param [String, Symbol] *args
+    # @param [String, Symbol] args
     #
 
     def set(*args)
@@ -15,10 +15,24 @@ module Watir
     end
     alias_method :value=, :set
 
+    #
+    # Uses JavaScript to enter most of the given value.
+    # Selenium is used to enter the first and last characters
+    #
+    # @param [String] input_value
+    #
+
+    def set!(input_value)
+      set input_value[0]
+      element_call { execute_js(:setValue, @element, input_value[0..-2]) }
+      append(input_value[-1])
+      raise Watir::Exception::Error, "#set! value does not match expected input" unless value == input_value
+    end
+
     #
     # Appends the given value to the text in the text field.
     #
-    # @param [String, Symbol] *args
+    # @param [String, Symbol] args
     #
 
     def append(*args)

data/lib/watirspec/remote_server.rb

@@ -2,7 +2,7 @@ module WatirSpec
   class RemoteServer
     attr_reader :server
 
-    def start(port = 4444)
+    def start(port = 4444, args: [])
       require 'selenium/server'
 
       @server ||= Selenium::Server.new(jar,
@@ -10,6 +10,7 @@ module WatirSpec
                                        log: !!$DEBUG,
                                        background: true,
                                        timeout: 60)
+      args.each { |arg| @server << arg }
       @server.start
       at_exit { @server.stop }
     end

data/spec/browser_spec.rb

@@ -11,7 +11,9 @@ describe Watir::Browser do
           @original = WatirSpec.implementation.clone
 
           require 'watirspec/remote_server'
-          WatirSpec::RemoteServer.new.start(4544)
+          args = ["-Dwebdriver.chrome.driver=#{Webdrivers::Chromedriver.send :binary}",
+                  "-Dwebdriver.gecko.driver=#{Webdrivers::Geckodriver.send :binary}"]
+          WatirSpec::RemoteServer.new.start(4544, args: args)
           browser.close
         end
 
@@ -138,10 +140,14 @@ describe Watir::Browser do
           browser.close
           @opts = WatirSpec.implementation.browser_args.last
 
-          @opts.merge!(port: '2314', driver_opts: {args: ['foo']})
+          @opts.merge!(port: '2314',
+                       driver_opts: {args: ['foo']},
+                       listener: LocalConfig::SelectorListener.new)
 
           @new_browser = WatirSpec.new_browser
 
+          bridge = @new_browser.wd.instance_variable_get('@bridge')
+          expect(bridge).to be_a Selenium::WebDriver::Support::EventFiringBridge
           service = @new_browser.wd.instance_variable_get("@service")
           expect(service.instance_variable_get("@extra_args")).to eq ["foo"]
           expect(service.instance_variable_get("@port")).to eq 2314

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'coveralls'
 Coveralls.wear!
 
 require 'watir'
+require 'webdrivers'
 require 'locator_spec_helper'
 require 'rspec'
 

data/spec/watirspec/elements/div_spec.rb

@@ -153,6 +153,21 @@ describe "Div" do
         expect { browser.div(xpath: "//div[@id='no_such_id']").click }.to raise_unknown_object_exception
       end
     end
+
+    describe "#click!" do
+      it "fires events when clicked" do
+        expect(browser.div(id: 'best_language').text).to_not eq 'Ruby!'
+        browser.div(id: 'best_language').click!
+        expect(browser.div(id: 'best_language').text).to eq 'Ruby!'
+      end
+
+      it "raises UnknownObjectException if the element does not exist" do
+        expect { browser.div(id: "no_such_id").click! }.to raise_unknown_object_exception
+        expect { browser.div(title: "no_such_title").click! }.to raise_unknown_object_exception
+        expect { browser.div(index: 1337).click! }.to raise_unknown_object_exception
+        expect { browser.div(xpath: "//div[@id='no_such_id']").click! }.to raise_unknown_object_exception
+      end
+    end
   end
 
   not_compliant_on :safari do
@@ -163,6 +178,13 @@ describe "Div" do
           expect(messages).to include('double clicked')
         end
       end
+
+      describe "#double_click!" do
+        it "fires the ondblclick event" do
+          browser.div(id: 'html_test').double_click!
+          expect(messages).to include('double clicked')
+        end
+      end
     end
 
     not_compliant_on :firefox do

data/spec/watirspec/elements/divs_spec.rb

@@ -14,7 +14,7 @@ describe "Divs" do
 
   describe "#length" do
     it "returns the number of divs" do
-      expect(browser.divs.length).to eq 12
+      expect(browser.divs.length).to eq 14
     end
   end
 

data/spec/watirspec/elements/element_spec.rb

@@ -99,7 +99,7 @@ describe "Element" do
     end
 
     it "finds finds several elements by arbitrary attribute" do
-      expect(browser.elements(id: /^new_user/).length).to eq 32
+      expect(browser.elements(id: /^new_user/).length).to eq 33
     end
 
     it "finds an element from an element's subtree" do
@@ -366,19 +366,36 @@ describe "Element" do
     end
   end
 
+  describe '#text_content' do
+    it 'returns inner Text code of element' do
+      browser.goto WatirSpec.url_for('non_control_elements.html')
+      expect(browser.div(id: 'shown').text_content).to eq('Not shownNot hidden')
+    end
+  end
+
+  describe '#inner_text' do
+    it 'returns inner HTML code of element' do
+      browser.goto WatirSpec.url_for('non_control_elements.html')
+      div = browser.div(id: 'shown')
+      expect(div.inner_text).to eq('Not hidden')
+    end
+  end
+
   describe '#inner_html' do
     it 'returns inner HTML code of element' do
-      browser.goto WatirSpec.url_for('inner_outer.html')
-      div = browser.div(id: 'foo')
-      expect(div.inner_html).to eq('<a href="#">hello</a>')
+      browser.goto WatirSpec.url_for('non_control_elements.html')
+      div = browser.div(id: 'shown')
+      expected_text = "<div id=\"hidden\" style=\"display: none;\">Not shown</div><div>Not hidden</div>"
+      expect(div.inner_html).to eq expected_text
     end
   end
 
   describe '#outer_html' do
     it 'returns outer (inner + element itself) HTML code of element' do
-      browser.goto WatirSpec.url_for('inner_outer.html')
-      div = browser.div(id: 'foo')
-      expect(div.outer_html).to eq('<div id="foo"><a href="#">hello</a></div>')
+      browser.goto WatirSpec.url_for('non_control_elements.html')
+      div = browser.div(id: 'shown')
+      expected_text = "<div id=\"shown\"><div id=\"hidden\" style=\"display: none;\">Not shown</div><div>Not hidden</div></div>"
+      expect(div.outer_html).to eq expected_text
     end
   end
 

data/spec/watirspec/elements/labels_spec.rb

@@ -14,7 +14,7 @@ describe "Labels" do
 
   describe "#length" do
     it "returns the number of labels" do
-      expect(browser.labels.length).to eq 39
+      expect(browser.labels.length).to eq 40
     end
   end
 

data/spec/watirspec/elements/radio_spec.rb

@@ -15,9 +15,8 @@ describe "Radio" do
       expect(browser.radio(name: /new_user_newsletter/)).to exist
       expect(browser.radio(value: "yes")).to exist
       expect(browser.radio(value: /yes/)).to exist
-      # TODO: figure out what :text means for a radio button
-      # browser.radio(text: "yes").to exist
-      # browser.radio(text: /yes/).to exist
+      expect(browser.radio(text: "Yes")).to exist
+      expect(browser.radio(text: /Yes/)).to exist
       expect(browser.radio(class: "huge")).to exist
       expect(browser.radio(class: /huge/)).to exist
       expect(browser.radio(index: 0)).to exist
@@ -116,6 +115,21 @@ describe "Radio" do
     end
   end
 
+  describe "#text" do
+    it "returns the text if the radio exists" do
+      expect(browser.radio(id: 'new_user_newsletter_yes').text).to eq "Yes"
+    end
+
+    it "raises UnknownObjectException if the radio doesn't exist" do
+      expect { browser.radio(index: 1337).text }.to raise_unknown_object_exception
+    end
+
+    it "returns empty string when there is no label" do
+      form = browser.form(id: "new_user")
+      expect(form.radio(index: 2).text).to eq ''
+    end
+  end
+
   describe "#title" do
     it "returns the title attribute if the radio exists" do
       expect(browser.radio(id: "new_user_newsletter_no").title).to eq "Traitor!"

data/spec/watirspec/elements/radios_spec.rb

@@ -14,7 +14,7 @@ describe "Radios" do
 
   describe "#length" do
     it "returns the number of radios" do
-      expect(browser.radios.length).to eq 6
+      expect(browser.radios.length).to eq 7
     end
   end
 

data/spec/watirspec/elements/select_list_spec.rb

@@ -102,7 +102,7 @@ describe "SelectList" do
       expect { browser.select_list(index: 1337).value }.to raise_unknown_object_exception
     end
   end
-  
+
   describe "#text" do
     not_compliant_on :safari do
       it "returns the text of the selected option" do
@@ -112,7 +112,7 @@ describe "SelectList" do
       end
 
       it "raises UnknownObjectException if the select list doesn't exist" do
-        expect {browser.select_list(index: 1337).text}.to raise_unknown_object_exception
+        expect { browser.select_list(index: 1337).text }.to raise_unknown_object_exception
       end
     end
   end
@@ -178,7 +178,7 @@ describe "SelectList" do
 
     it "gets the currently selected item(s)" do
       expect(browser.select_list(name: "new_user_country").selected_options.map(&:text)).to eq ["Norway"]
-      expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq ["English", "Norwegian"]
+      expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq ["EN", "NO"]
     end
   end
 
@@ -255,52 +255,58 @@ describe "SelectList" do
     end
   end
 
-  not_compliant_on :safari do
-    describe "#select" do
-      context "when interacting with options" do
-        it "selects the given item when given a String" do
-          browser.select_list(name: "new_user_country").select("Denmark")
-          expect(browser.select_list(name: "new_user_country").selected_options.map(&:text)).to eq ["Denmark"]
-        end
+  describe "#select" do
+    context "when finding by value" do
+      it "selects an option with a String" do
+        browser.select_list(name: "new_user_languages").clear
+        browser.select_list(name: "new_user_languages").select("2")
+        expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq %w[EN]
+      end
 
-        it "selects options by label" do
-          browser.select_list(name: "new_user_country").select("Germany")
-          expect(browser.select_list(name: "new_user_country").selected_options.map(&:text)).to eq ["Germany"]
-        end
+      it "selects an option with a Regexp" do
+        browser.select_list(name: "new_user_languages").clear
+        browser.select_list(name: "new_user_languages").select(/1|3/)
+        expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq %w[Danish NO]
+      end
+    end
 
-        it "selects the given item when given a Regexp" do
-          browser.select_list(name: "new_user_country").select(/Denmark/)
-          expect(browser.select_list(name: "new_user_country").selected_options.map(&:text)).to eq ["Denmark"]
-        end
+    context "when finding by text" do
+      it "selects an option with a String" do
+        browser.select_list(name: "new_user_country").select("Denmark")
+        expect(browser.select_list(name: "new_user_country").selected_options.map(&:text)).to eq ["Denmark"]
+      end
 
-        it "selects the given item when given an Xpath" do
-          browser.select_list(xpath: "//select[@name='new_user_country']").select("Denmark")
-          expect(browser.select_list(xpath: "//select[@name='new_user_country']").selected_options.map(&:text)).to eq ["Denmark"]
-        end
+      it "selects an option with a Regexp" do
+        browser.select_list(name: "new_user_country").select(/Denmark/)
+        expect(browser.select_list(name: "new_user_country").selected_options.map(&:text)).to eq ["Denmark"]
+      end
+    end
 
-        it "selects multiple items using :name and a String" do
-          browser.select_list(name: "new_user_languages").clear
-          browser.select_list(name: "new_user_languages").select("Danish")
-          browser.select_list(name: "new_user_languages").select("Swedish")
-          expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq ["Danish", "Swedish"]
-        end
+    context "when finding by label" do
+      it "selects an option with a String" do
+        browser.select_list(name: "new_user_languages").clear
+        browser.select_list(name: "new_user_languages").select("NO")
+        expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq ["NO"]
+      end
 
-        it "selects multiple items using :name and a Regexp" do
-          browser.select_list(name: "new_user_languages").clear
-          browser.select_list(name: "new_user_languages").select_all(/ish/)
-          expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq ["Danish", "English", "Swedish"]
-        end
+      it "selects an option with a Regexp" do
+        browser.select_list(name: "new_user_languages").clear
+        browser.select_list(name: "new_user_languages").select(/^N/)
+        expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq ["NO"]
+      end
+    end
 
-        it "selects multiple items using :xpath" do
-          browser.select_list(xpath: "//select[@name='new_user_languages']").clear
-          browser.select_list(xpath: "//select[@name='new_user_languages']").select_all(/ish/)
-          expect(browser.select_list(xpath: "//select[@name='new_user_languages']").selected_options.map(&:text)).to eq ["Danish", "English", "Swedish"]
-        end
+    it "selects multiple options successiveley" do
+      browser.select_list(name: "new_user_languages").clear
+      browser.select_list(name: "new_user_languages").select("Danish")
+      browser.select_list(name: "new_user_languages").select("Swedish")
+      expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq ["Danish", "Swedish"]
+    end
 
-        it "selects empty options" do
-          browser.select_list(id: "delete_user_username").select("")
-          expect(browser.select_list(id: "delete_user_username").selected_options.map(&:text)).to eq [""]
-        end
+    bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1255957", :firefox do
+      it "selects empty options" do
+        browser.select_list(id: "delete_user_username").select("")
+        expect(browser.select_list(id: "delete_user_username").selected_options.map(&:text)).to eq [""]
       end
     end
 
@@ -308,10 +314,6 @@ describe "SelectList" do
       expect(browser.select_list(name: "new_user_languages").select("Danish")).to eq "Danish"
     end
 
-    it "returns the first matching value if there are multiple matches" do
-      expect(browser.select_list(name: "new_user_languages").select_all(/ish/)).to eq "Danish"
-    end
-
     not_compliant_on :safari do
       it "fires onchange event when selecting an item" do
         browser.select_list(id: "new_user_languages").select("Danish")
@@ -326,13 +328,7 @@ describe "SelectList" do
         browser.select_list(id: "new_user_languages").select("English")
         expect(messages.size).to eq 3
       end
-    end
 
-    it "returns the text of the selected option" do
-      expect(browser.select_list(id: "new_user_languages").select("English")).to eq "English"
-    end
-
-    not_compliant_on :safari do
       it "returns an empty string when selecting an option that disappears when selected" do
         expect(browser.select_list(id: 'obsolete').select('sweden')).to eq ''
       end
@@ -350,7 +346,7 @@ describe "SelectList" do
         Watir.default_timeout = 2
         begin
           start_time = ::Time.now
-          expect {select_list.select('No')}.to raise_error Watir::Exception::NoValueFoundException
+          expect { select_list.select('No') }.to raise_error Watir::Exception::NoValueFoundException
           expect(::Time.now - start_time).to be > 2
         ensure
           Watir.default_timeout = 30
@@ -372,26 +368,132 @@ describe "SelectList" do
     end
   end
 
-  # deprecate?
-  not_compliant_on :safari do
-    describe "#select_value" do
-      it "selects the item by value string" do
+  describe "#select!" do
+    context "when finding by value" do
+      it "selects an option with a String" do
+        browser.select_list(name: "new_user_languages").clear
+        browser.select_list(name: "new_user_languages").select!("2")
+        expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq %w[EN]
+      end
+
+      it "selects an option with a Regex" do
+        browser.select_list(name: "new_user_languages").clear
+        browser.select_list(name: "new_user_languages").select!(/2/)
+        expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq %w[EN]
+      end
+    end
+
+    context "when finding by text" do
+      it "selects an option with a String" do
+        browser.select_list(name: "new_user_country").select!("Denmark")
+        expect(browser.select_list(name: "new_user_country").selected_options.map(&:text)).to eq ["Denmark"]
+      end
+
+      it "selects an option with a Regexp" do
+        browser.select_list(name: "new_user_country").select!(/Denmark/)
+        expect(browser.select_list(name: "new_user_country").selected_options.map(&:text)).to eq ["Denmark"]
+      end
+    end
+
+    context "when finding by label" do
+      it "selects an option with a String" do
         browser.select_list(name: "new_user_languages").clear
-        browser.select_list(name: "new_user_languages").select_value("2")
-        expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq %w[English]
+        browser.select_list(name: "new_user_languages").select!("NO")
+        expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq ["NO"]
       end
 
-      it "selects the items by value regexp" do
+      it "selects an option with a Regexp" do
         browser.select_list(name: "new_user_languages").clear
-        browser.select_list(name: "new_user_languages").select_value(/1|3/)
-        expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq %w[Danish Norwegian]
+        browser.select_list(name: "new_user_languages").select!(/NO/)
+        expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq ["NO"]
       end
+    end
 
-      it "raises NoValueFoundException if the option doesn't exist" do
-        expect { browser.select_list(name: "new_user_languages").select_value("no_such_option") }.to raise_no_value_found_exception
-        expect { browser.select_list(name: "new_user_languages").select_value(/no_such_option/) }.to raise_no_value_found_exception
+    it "selects multiple items successively" do
+      browser.select_list(name: "new_user_languages").clear
+      browser.select_list(name: "new_user_languages").select!("Danish")
+      browser.select_list(name: "new_user_languages").select!("Swedish")
+      expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq ["Danish", "Swedish"]
+    end
+
+    bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1255957", :firefox do
+      it "selects empty options" do
+        browser.select_list(id: "delete_user_username").select!("")
+        expect(browser.select_list(id: "delete_user_username").selected_options.map(&:text)).to eq [""]
       end
     end
+
+    it "returns the value selected" do
+      browser.select_list(name: "new_user_languages").clear
+      expect(browser.select_list(name: "new_user_languages").select!("Danish")).to eq "Danish"
+    end
+
+    it "selects options with a single-quoted value" do
+      browser.select_list(id: 'single-quote').select!("'foo'")
+    end
+
+    it "raises NoValueFoundException if the option doesn't exist" do
+      expect { browser.select_list(id: "new_user_country").select!("missing_option") }.to raise_no_value_found_exception
+      expect { browser.select_list(id: "new_user_country").select!(/missing_option/) }.to raise_no_value_found_exception
+    end
+
+    it "raises ObjectDisabledException if the option is disabled" do
+      browser.select_list(id: "new_user_languages").clear
+      expect { browser.select_list(id: "new_user_languages").select!("Russian") }.to raise_object_disabled_exception
+    end
+
+    it "raises a TypeError if argument is not a String, Regexp or Numeric" do
+      browser.select_list(id: "new_user_languages").clear
+      expect { browser.select_list(id: "new_user_languages").select!([]) }.to raise_error(TypeError)
+    end
+  end
+
+  describe "#select_all" do
+    it "selects multiple options based on text" do
+      browser.select_list(name: "new_user_languages").clear
+      browser.select_list(name: "new_user_languages").select_all(/ish/)
+      expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq ["Danish", "EN", "Swedish"]
+    end
+
+    it "selects multiple options based on labels" do
+      browser.select_list(name: "new_user_languages").clear
+      browser.select_list(name: "new_user_languages").select_all(/NO|EN/)
+      expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq ["EN", "NO"]
+    end
+
+    it "returns the first matching value if there are multiple matches" do
+      expect(browser.select_list(name: "new_user_languages").select_all(/ish/)).to eq "Danish"
+    end
+  end
+
+  describe "#select_all!" do
+    it "selects multiple options based on value" do
+      browser.select_list(name: "new_user_languages").clear
+      browser.select_list(name: "new_user_languages").select_all!(/\d+/)
+      expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq ["Danish", "EN", "NO", "Russian"]
+    end
+
+    it "selects multiple options based on text" do
+      browser.select_list(name: "new_user_languages").clear
+      browser.select_list(name: "new_user_languages").select_all!(/ish/)
+      expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq ["Danish", "EN", "Swedish"]
+    end
+
+    it "selects multiple options based on labels" do
+      browser.select_list(name: "new_user_languages").clear
+      browser.select_list(name: "new_user_languages").select_all!(/NO|EN/)
+      expect(browser.select_list(name: "new_user_languages").selected_options.map(&:text)).to eq ["EN", "NO"]
+    end
+
+    it "returns the first matching value if there are multiple matches" do
+      expect(browser.select_list(name: "new_user_languages").select_all!(/ish/)).to eq "Danish"
+    end
+  end
+
+  # deprecate?
+  not_compliant_on :safari do
+    describe "#select_value" do
+    end
   end
 
 end