watir 6.2.1 → 6.3.0

data/spec/watirspec/cookies_spec.rb

@@ -1,147 +1,145 @@
 require "watirspec_helper"
 
-bug "https://github.com/ariya/phantomjs/issues/13115", :phantomjs do
-  describe "Browser#cookies" do
-    after { browser.cookies.clear }
+describe "Browser#cookies" do
+  after { browser.cookies.clear }
 
-    it 'gets an empty list of cookies' do
-      browser.goto WatirSpec.url_for 'collections.html' # no cookie set.
-      expect(browser.cookies.to_a).to eq []
-    end
+  it 'gets an empty list of cookies' do
+    browser.goto WatirSpec.url_for 'collections.html' # no cookie set.
+    expect(browser.cookies.to_a).to eq []
+  end
 
-    it "gets any cookies set" do
-      browser.goto set_cookie_url
+  it "gets any cookies set" do
+    browser.goto set_cookie_url
 
-      verify_cookies_count 1
+    verify_cookies_count 1
 
-      cookie = browser.cookies.to_a.first
-      expect(cookie[:name]).to eq 'monster'
-      expect(cookie[:value]).to eq '1'
-    end
+    cookie = browser.cookies.to_a.first
+    expect(cookie[:name]).to eq 'monster'
+    expect(cookie[:value]).to eq '1'
+  end
 
-    describe '#[]' do
-      before do
-        browser.goto set_cookie_url
-        verify_cookies_count 1
-      end
+  describe '#[]' do
+    before do
+      browser.goto set_cookie_url
+      verify_cookies_count 1
+    end
 
-      it 'returns cookie by symbol name' do
-        cookie = browser.cookies[:monster]
-        expect(cookie[:name]).to eq('monster')
-        expect(cookie[:value]).to eq('1')
-      end
+    it 'returns cookie by symbol name' do
+      cookie = browser.cookies[:monster]
+      expect(cookie[:name]).to eq('monster')
+      expect(cookie[:value]).to eq('1')
+    end
 
-      it 'returns cookie by string name' do
-        cookie = browser.cookies['monster']
-        expect(cookie[:name]).to eq('monster')
-        expect(cookie[:value]).to eq('1')
-      end
+    it 'returns cookie by string name' do
+      cookie = browser.cookies['monster']
+      expect(cookie[:name]).to eq('monster')
+      expect(cookie[:value]).to eq('1')
+    end
 
-      it 'returns nil if there is no cookie with such name' do
-        expect(browser.cookies[:non_monster]).to eq(nil)
-      end
+    it 'returns nil if there is no cookie with such name' do
+      expect(browser.cookies[:non_monster]).to eq(nil)
     end
+  end
 
-    not_compliant_on :internet_explorer do
-      it 'adds a cookie' do
-        browser.goto set_cookie_url
-        verify_cookies_count 1
+  not_compliant_on :internet_explorer do
+    it 'adds a cookie' do
+      browser.goto set_cookie_url
+      verify_cookies_count 1
 
-        browser.cookies.add 'foo', 'bar'
-        verify_cookies_count 2
+      browser.cookies.add 'foo', 'bar'
+      verify_cookies_count 2
 
-        compliant_on :safari do
-          $browser.close
-          $browser = WatirSpec.new_browser
-        end
+      compliant_on :safari do
+        $browser.close
+        $browser = WatirSpec.new_browser
       end
     end
+  end
 
-    # TODO - Split this up into multiple tests or figure out which parts are not compliant
-    not_compliant_on :chrome, :internet_explorer, :safari, :firefox do
-      it 'adds a cookie with options' do
-        browser.goto set_cookie_url
+  # TODO - Split this up into multiple tests or figure out which parts are not compliant
+  not_compliant_on :chrome, :internet_explorer, :safari, :firefox do
+    it 'adds a cookie with options' do
+      browser.goto set_cookie_url
 
-        expires = Time.now + 10000
-        options = {path: "/set_cookie",
-                   secure: true,
-                   expires: expires}
+      expires = Time.now + 10000
+      options = {path: "/set_cookie",
+                 secure: true,
+                 expires: expires}
 
-        browser.cookies.add 'a', 'b', options
-        cookie = browser.cookies.to_a.find { |e| e[:name] == 'a' }
-        expect(cookie).to_not be_nil
+      browser.cookies.add 'a', 'b', options
+      cookie = browser.cookies.to_a.find { |e| e[:name] == 'a' }
+      expect(cookie).to_not be_nil
 
-        expect(cookie[:name]).to eq 'a'
-        expect(cookie[:value]).to eq 'b'
+      expect(cookie[:name]).to eq 'a'
+      expect(cookie[:value]).to eq 'b'
 
-        expect(cookie[:path]).to eq "/set_cookie"
-        expect(cookie[:secure]).to be true
+      expect(cookie[:path]).to eq "/set_cookie"
+      expect(cookie[:secure]).to be true
 
-        expect(cookie[:expires]).to be_kind_of(Time)
-        # a few ms slack
-        expect((cookie[:expires]).to_i).to be_within(2).of(expires.to_i)
-      end
+      expect(cookie[:expires]).to be_kind_of(Time)
+      # a few ms slack
+      expect((cookie[:expires]).to_i).to be_within(2).of(expires.to_i)
     end
+  end
 
-    not_compliant_on :internet_explorer do
-      it 'removes a cookie' do
-        browser.goto set_cookie_url
-        verify_cookies_count 1
+  not_compliant_on :internet_explorer do
+    it 'removes a cookie' do
+      browser.goto set_cookie_url
+      verify_cookies_count 1
 
-        browser.cookies.delete 'monster'
-        verify_cookies_count 0
-      end
+      browser.cookies.delete 'monster'
+      verify_cookies_count 0
+    end
 
-      bug "https://code.google.com/p/selenium/issues/detail?id=5487", :safari do
-        it 'clears all cookies' do
-          browser.goto set_cookie_url
-          browser.cookies.add 'foo', 'bar'
-          verify_cookies_count 2
+    bug "https://code.google.com/p/selenium/issues/detail?id=5487", :safari do
+      it 'clears all cookies' do
+        browser.goto set_cookie_url
+        browser.cookies.add 'foo', 'bar'
+        verify_cookies_count 2
 
-          browser.cookies.clear
-          verify_cookies_count 0
-        end
+        browser.cookies.clear
+        verify_cookies_count 0
       end
     end
+  end
 
-    not_compliant_on :internet_explorer do
-      let(:file) { "#{Dir.tmpdir}/cookies" }
+  not_compliant_on :internet_explorer do
+    let(:file) { "#{Dir.tmpdir}/cookies" }
 
-      before do
-        browser.goto set_cookie_url
-        browser.cookies.save file
-      end
+    before do
+      browser.goto set_cookie_url
+      browser.cookies.save file
+    end
 
-      describe '#save' do
-        it 'saves cookies to file' do
-          expect(IO.read(file)).to eq(browser.cookies.to_a.to_yaml)
-        end
+    describe '#save' do
+      it 'saves cookies to file' do
+        expect(IO.read(file)).to eq(browser.cookies.to_a.to_yaml)
       end
+    end
 
-      describe '#load' do
-        it 'loads cookies from file' do
-          browser.cookies.clear
-          browser.cookies.load file
-          expected = browser.cookies.to_a
-          actual = YAML.load(IO.read(file))
+    describe '#load' do
+      it 'loads cookies from file' do
+        browser.cookies.clear
+        browser.cookies.load file
+        expected = browser.cookies.to_a
+        actual = YAML.load(IO.read(file))
 
-          # https://code.google.com/p/selenium/issues/detail?id=6834
-          expected.each { |cookie| cookie.delete(:expires) }
-          actual.each { |cookie| cookie.delete(:expires) }
+        # https://code.google.com/p/selenium/issues/detail?id=6834
+        expected.each { |cookie| cookie.delete(:expires) }
+        actual.each { |cookie| cookie.delete(:expires) }
 
-          expect(actual).to eq(expected)
-        end
+        expect(actual).to eq(expected)
       end
     end
+  end
 
-    def set_cookie_url
-      # add timestamp to url to avoid caching in IE8
-      WatirSpec.url_for('set_cookie/index.html') + "?t=#{Time.now.to_i + Time.now.usec}"
-    end
+  def set_cookie_url
+    # add timestamp to url to avoid caching in IE8
+    WatirSpec.url_for('set_cookie/index.html') + "?t=#{Time.now.to_i + Time.now.usec}"
+  end
 
-    def verify_cookies_count expected_size
-      cookies = browser.cookies.to_a
-      expect(cookies.size).to eq(expected_size), "expected #{expected_size} cookies, got #{cookies.size}: #{cookies.inspect}"
-    end
+  def verify_cookies_count expected_size
+    cookies = browser.cookies.to_a
+    expect(cookies.size).to eq(expected_size), "expected #{expected_size} cookies, got #{cookies.size}: #{cookies.inspect}"
   end
 end

data/spec/watirspec/elements/div_spec.rb

@@ -166,9 +166,7 @@ describe "Div" do
         it "fires the oncontextmenu event" do
           browser.goto(WatirSpec.url_for("right_click.html"))
           browser.div(id: "click").right_click
-          bug "https://github.com/detro/ghostdriver/issues/125", :phantomjs do
-            expect(messages.first).to eq 'right-clicked'
-          end
+          expect(messages.first).to eq 'right-clicked'
         end
       end
     end

data/spec/watirspec/elements/element_spec.rb

@@ -249,6 +249,20 @@ describe "Element" do
       end
     end
 
+    context "attribute presence" do
+      before { browser.goto WatirSpec.url_for("data_attributes.html") }
+
+      it "finds element by attribute presence" do
+        expect(browser.p(data_type: true)).to exist
+        expect(browser.p(class: true)).not_to exist
+      end
+
+      it "finds element by attribute absence" do
+        expect(browser.p(data_type: false)).not_to exist
+        expect(browser.p(class: false)).to exist
+      end
+    end
+
     it "doesn't raise when called on nested elements" do
       expect(browser.div(id: 'no_such_div').link(id: 'no_such_id')).to_not exist
     end
@@ -277,8 +291,7 @@ describe "Element" do
   bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1255906", :firefox do
     describe '#send_keys' do
       before(:each) do
-        phantom = browser.driver.capabilities.browser_name == 'phantomjs'
-        @c = Selenium::WebDriver::Platform.mac? && !phantom ? :command : :control
+        @c = Selenium::WebDriver::Platform.mac? ? :command : :control
         browser.goto(WatirSpec.url_for('keylogger.html'))
       end
 

data/spec/watirspec/elements/filefield_spec.rb

@@ -110,20 +110,18 @@ describe "FileField" do
   describe "#set" do
     not_compliant_on :safari do
       bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1260233", :firefox do
-        bug "https://github.com/detro/ghostdriver/issues/183", :phantomjs do
-          it "is able to set a file path in the field and click the upload button and fire the onchange event" do
-            browser.goto WatirSpec.url_for("forms_with_input_elements.html")
+        it "is able to set a file path in the field and click the upload button and fire the onchange event" do
+          browser.goto WatirSpec.url_for("forms_with_input_elements.html")
 
-            path = File.expand_path(__FILE__)
-            element = browser.file_field(name: "new_user_portrait")
+          path = File.expand_path(__FILE__)
+          element = browser.file_field(name: "new_user_portrait")
 
-            element.set path
+          element.set path
 
-            expect(element.value).to include(File.basename(path)) # only some browser will return the full path
-            expect(messages.first).to include(File.basename(path))
+          expect(element.value).to include(File.basename(path)) # only some browser will return the full path
+          expect(messages.first).to include(File.basename(path))
 
-            browser.button(name: "new_user_submit").click
-          end
+          browser.button(name: "new_user_submit").click
         end
 
         it "raises an error if the file does not exist" do
@@ -135,41 +133,38 @@ describe "FileField" do
     end
   end
 
+  not_compliant_on :safari do
+    describe "#value=" do
+      bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1260233", :firefox do
+        it "is able to set a file path in the field and click the upload button and fire the onchange event" do
+          browser.goto WatirSpec.url_for("forms_with_input_elements.html")
 
-  bug "https://github.com/detro/ghostdriver/issues/183", :phantomjs do
-    not_compliant_on :safari do
-        describe "#value=" do
-          bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1260233", :firefox do
-            it "is able to set a file path in the field and click the upload button and fire the onchange event" do
-            browser.goto WatirSpec.url_for("forms_with_input_elements.html")
-
-            path = File.expand_path(__FILE__)
-            element = browser.file_field(name: "new_user_portrait")
+          path = File.expand_path(__FILE__)
+          element = browser.file_field(name: "new_user_portrait")
 
-            element.value = path
-            expect(element.value).to include(File.basename(path)) # only some browser will return the full path
-          end
+          element.value = path
+          expect(element.value).to include(File.basename(path)) # only some browser will return the full path
+        end
 
-          not_compliant_on :internet_explorer do
-            bug "Raises File not found error - File Bug Report", :firefox do
-              it "does not raise an error if the file does not exist" do
-                path = File.join(Dir.tmpdir, 'unlikely-to-exist')
-                browser.file_field.value = path
+        not_compliant_on :internet_explorer do
+          bug "Raises File not found error - File Bug Report", :firefox do
+            it "does not raise an error if the file does not exist" do
+              path = File.join(Dir.tmpdir, 'unlikely-to-exist')
+              browser.file_field.value = path
 
-                expected = path
-                expected.gsub!("/", "\\") if Selenium::WebDriver::Platform.windows?
+              expected = path
+              expected.gsub!("/", "\\") if Selenium::WebDriver::Platform.windows?
 
-                expect(browser.file_field.value).to include(File.basename(expected)) # only some browser will return the full path
-              end
+              expect(browser.file_field.value).to include(File.basename(expected)) # only some browser will return the full path
             end
+          end
 
-            not_compliant_on %i(chrome windows) do
-              bug "Raises File not found error - File Bug Report", :firefox do
-                it "does not alter its argument" do
-                  value = '/foo/bar'
-                  browser.file_field.value = value
-                  expect(value).to eq '/foo/bar'
-                end
+          not_compliant_on %i(chrome windows) do
+            bug "Raises File not found error - File Bug Report", :firefox do
+              it "does not alter its argument" do
+                value = '/foo/bar'
+                browser.file_field.value = value
+                expect(value).to eq '/foo/bar'
               end
             end
           end

data/spec/watirspec/elements/frame_spec.rb

@@ -50,15 +50,13 @@ describe "Frame" do
       expect(browser.frame(xpath: "//frame[@id='no_such_id']")).to_not exist
     end
 
-    bug "https://github.com/detro/ghostdriver/issues/159", :phantomjs do
-      bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1255946", :firefox do
-        it "handles nested frames" do
-          browser.goto(WatirSpec.url_for("nested_frames.html"))
+    bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1255946", :firefox do
+      it "handles nested frames" do
+        browser.goto(WatirSpec.url_for("nested_frames.html"))
 
-          browser.frame(id: "two").frame(id: "three").link(id: "four").click
+        browser.frame(id: "two").frame(id: "three").link(id: "four").click
 
-          Watir::Wait.until { browser.title == "definition_lists" }
-        end
+        Watir::Wait.until { browser.title == "definition_lists" }
       end
     end
 

data/spec/watirspec/elements/iframe_spec.rb

@@ -82,15 +82,13 @@ describe "IFrame" do
     end
 
 
-    bug "https://github.com/detro/ghostdriver/issues/159", :phantomjs do
-      bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1255946", :firefox do
-        it "handles nested iframes" do
-          browser.goto(WatirSpec.url_for("nested_iframes.html"))
+    bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1255946", :firefox do
+      it "handles nested iframes" do
+        browser.goto(WatirSpec.url_for("nested_iframes.html"))
 
-          browser.iframe(id: "two").iframe(id: "three").link(id: "four").click
+        browser.iframe(id: "two").iframe(id: "three").link(id: "four").click
 
-          Watir::Wait.until { browser.title == "definition_lists" }
-        end
+        Watir::Wait.until { browser.title == "definition_lists" }
       end
     end
 

data/spec/watirspec/elements/select_list_spec.rb

@@ -102,6 +102,18 @@ describe "SelectList" do
       expect { browser.select_list(index: 1337).value }.to raise_unknown_object_exception
     end
   end
+  
+  describe "#text" do
+    it "returns the text of the selected option" do
+      expect(browser.select_list(index: 0).text).to eq "Norway"
+      browser.select_list(index: 0).select(/Sweden/)
+      expect(browser.select_list(index: 0).text).to eq "Sweden"
+    end
+    
+    it "raises UnknownObjectException if the select list doesn't exist" do
+      expect { browser.select_list(index: 1337).text }.to raise_unknown_object_exception
+    end
+  end
 
   describe "#respond_to?" do
     it "returns true for all attribute methods" do
@@ -189,12 +201,10 @@ describe "SelectList" do
     end
 
     not_compliant_on :safari do
-      bug "Not firing events", :phantomjs do
-        bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1255957", :firefox do
-          it "fires onchange event" do
-            browser.select_list(name: "new_user_languages").clear
-            expect(messages.size).to eq 2
-          end
+      bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1255957", :firefox do
+        it "fires onchange event" do
+          browser.select_list(name: "new_user_languages").clear
+          expect(messages.size).to eq 2
         end
       end
 
@@ -305,23 +315,19 @@ describe "SelectList" do
     end
 
     not_compliant_on :safari do
-      bug "Not firing events", :phantomjs do
-        it "fires onchange event when selecting an item" do
-          browser.select_list(id: "new_user_languages").select("Danish")
-          expect(messages).to eq ['changed language']
-        end
+      it "fires onchange event when selecting an item" do
+        browser.select_list(id: "new_user_languages").select("Danish")
+        expect(messages).to eq ['changed language']
       end
 
-      bug "Not firing events", :phantomjs do
-        bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1255957", :firefox do
-          it "doesn't fire onchange event when selecting an already selected item" do
-            browser.select_list(id: "new_user_languages").clear # removes the two pre-selected options
-            browser.select_list(id: "new_user_languages").select("English")
-            expect(messages.size).to eq 3
+      bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1255957", :firefox do
+        it "doesn't fire onchange event when selecting an already selected item" do
+          browser.select_list(id: "new_user_languages").clear # removes the two pre-selected options
+          browser.select_list(id: "new_user_languages").select("English")
+          expect(messages.size).to eq 3
 
-            browser.select_list(id: "new_user_languages").select("English")
-            expect(messages.size).to eq 3
-          end
+          browser.select_list(id: "new_user_languages").select("English")
+          expect(messages.size).to eq 3
         end
       end
     end