capybara-webkit 1.14.0 → 1.15.0

data/lib/capybara/webkit/server.rb

@@ -26,15 +26,23 @@ module Capybara
         discover_port
         discover_pid
         forward_output_in_background_thread
+        register_shutdown_hook
       end
 
       private
 
       def open_pipe
-        @pipe_stdin,
-          @pipe_stdout,
-          @pipe_stderr,
-          @wait_thr = Open3.popen3(SERVER_PATH)
+        if IO.respond_to?(:popen4)
+          @pid,
+            @pipe_stdin,
+            @pipe_stdout,
+            @pipe_stderr = IO.popen4(SERVER_PATH)
+        else
+          @pipe_stdin,
+            @pipe_stdout,
+            @pipe_stderr,
+            @wait_thr = Open3.popen3(SERVER_PATH)
+        end
       end
 
       def discover_port
@@ -58,7 +66,7 @@ module Capybara
       end
 
       def discover_pid
-        @pid = @wait_thr[:pid]
+        @pid ||= @wait_thr[:pid]
       end
 
       def forward_output_in_background_thread
@@ -67,6 +75,31 @@ module Capybara
           IO.copy_stream(@pipe_stderr, @output_target) if @output_target
         end
       end
+
+      def register_shutdown_hook
+        @owner_pid = Process.pid
+        at_exit do
+          if Process.pid == @owner_pid
+            kill_process
+          end
+        end
+      end
+
+      def kill_process
+        if @pid
+          if RUBY_PLATFORM =~ /mingw32/
+            Process.kill(9, @pid)
+          else
+            Process.kill("INT", @pid)
+          end
+          Process.wait(@pid)
+          @wait_thr.join if @wait_thr
+        end
+      rescue Errno::ESRCH, Errno::ECHILD
+        # This just means that the webkit_server process has already ended
+      ensure
+        @pid = @wait_thr = nil
+      end
     end
   end
 end

data/lib/capybara/webkit/version.rb

@@ -1,7 +1,7 @@
 module Capybara
   module Driver
     class Webkit
-      VERSION = "1.14.0".freeze
+      VERSION = "1.15.0".freeze
     end
   end
 end

data/lib/capybara_webkit_builder.rb

@@ -1,3 +1,4 @@
+require 'etc'
 require "fileutils"
 require "rbconfig"
 require "shellwords"
@@ -90,7 +91,8 @@ module CapybaraWebkitBuilder
   end
 
   def make(target = "")
-    env_hide("CDPATH") { sh("#{make_bin} #{target}") }
+    job_count = Etc.respond_to?(:nprocessors) ? Etc.nprocessors : 1
+    env_hide('CDPATH') { sh("#{make_bin} #{target} --jobs=#{job_count}") }
   end
 
   def env_hide(name)

data/spec/driver_spec.rb

@@ -554,7 +554,13 @@ describe Capybara::Webkit::Driver do
 
     it "evaluates Javascript and returns an object" do
       result = driver.evaluate_script(%<({ 'one' : 1 })>)
-      expect(result).to eq 'one' => 1
+      expect(result).to eq "one" => 1
+    end
+
+    it "evaluate Javascript and returns an object when the original was readonly" do
+      result = driver.evaluate_script(%<window.getComputedStyle(document.getElementById('greeting'))>)
+      expect(result).to be_a Hash
+      expect(result["zIndex"]).to eq "auto"
     end
 
     it "evaluates Javascript and returns true" do
@@ -577,6 +583,27 @@ describe Capybara::Webkit::Driver do
       expect(result).to eq [1, 2]
     end
 
+    it "evaluates asynchronous JS which isn't" do
+      result = driver.evaluate_async_script("arguments[0](4)")
+      expect(result).to eq 4
+    end
+
+    it "evaluates asynchronous JS" do
+      result = driver.evaluate_async_script("setTimeout(function(callback){ callback('jaguar') }, 100, arguments[0])")
+      expect(result).to eq "jaguar"
+    end
+
+    it "evaluates asynchronous JS and returns an object" do
+      result = driver.evaluate_async_script(%<setTimeout(function(callback){ callback({ 'one' : 1 }) }, 100, arguments[0])>)
+      expect(result).to eq "one" => 1
+    end
+
+    it "evaluates asynchronous JS and returns an object when the original was readonly" do
+      result = driver.evaluate_async_script(%<setTimeout(function(callback){ callback(window.getComputedStyle(document.getElementById('greeting'))) }, 100, arguments[0])>)
+      expect(result).to be_a Hash
+      expect(result["zIndex"]).to eq "auto"
+    end
+
     it "executes Javascript" do
       driver.execute_script(%<document.getElementById('greeting').innerHTML = 'yo'>)
       expect(driver.find_xpath("//p[contains(., 'yo')]")).not_to be_empty
@@ -605,6 +632,12 @@ describe Capybara::Webkit::Driver do
       expect(driver.find_xpath("//p[@id='greeting'][contains(., 'new content')]")).not_to be_empty
     end
 
+    it "passes elements as arguments to asynchronous script" do
+      greeting = driver.find_xpath("//p[@id='greeting']").first
+      result = driver.evaluate_async_script(%<arguments[2]([arguments[1], arguments[0]])>, greeting, "a string")
+      expect(result).to eq ["a string", greeting]
+    end
+
     it "passes arguments to evaaluated Javascript" do
       expect(driver.evaluate_script(%<arguments[0]>, 3)).to eq 3
     end
@@ -1406,7 +1439,7 @@ describe Capybara::Webkit::Driver do
       end
 
       it "does not modify the selected attribute of a new selection" do
-        expect(monkey_option['selected']).to be_nil
+        expect(driver.evaluate_script("arguments[0].getAttribute('selected')", monkey_option)).to be_nil
       end
 
       it "returns the old value when a reset button is clicked" do
@@ -1586,35 +1619,49 @@ describe Capybara::Webkit::Driver do
             <textarea class="watch"></textarea>
             <input class="watch" type="checkbox"/>
             <input class="watch" type="radio"/>
+            <select id="single" class="watch">
+              <option>Single Option 1</option>
+              <option>Single Option 2</option>
+            </select>
+            <select id="multiple" class="watch" multiple="multiple">
+              <option  class="watch" selected="selected">Multiple Option 1</option>
+              <option  class="watch" selected="selected">Multiple Option 2</option>
+              <option  class="watch">Multiple Option 3</option>
+              <optgroup>
+                <option  class="watch">Multiple Option 4</option>
+              </optgroup>
+            </select>
           </form>
           <ul id="events"></ul>
           <script type="text/javascript">
             var events = document.getElementById("events");
             var recordEvent = function (event) {
               var element = document.createElement("li");
-              element.innerHTML = event.type;
+              var event_description = "";
+              if (event.target.id)
+                event_description += event.target.id + '.';
+              event_description += event.type;
+              element.innerHTML = event_description;
               events.appendChild(element);
             };
 
             var elements = document.getElementsByClassName("watch");
+            var watched_events = ["focus", "keydown", "keypress", "keyup", "input", "change",
+                          "blur", "mousedown", "mouseup", "click"];
             for (var i = 0; i < elements.length; i++) {
-              var element = elements[i];
-              element.addEventListener("focus", recordEvent);
-              element.addEventListener("keydown", recordEvent);
-              element.addEventListener("keypress", recordEvent);
-              element.addEventListener("keyup", recordEvent);
-              element.addEventListener("input", recordEvent);
-              element.addEventListener("change", recordEvent);
-              element.addEventListener("blur", recordEvent);
-              element.addEventListener("mousedown", recordEvent);
-              element.addEventListener("mouseup", recordEvent);
-              element.addEventListener("click", recordEvent);
+              for (var j = 0; j < watched_events.length; j++) {
+                elements[i].addEventListener(watched_events[j], recordEvent);
+              }
             }
           </script>
         </body></html>
       HTML
     end
 
+    def logged_events
+      driver.find_xpath("//li").map(&:visible_text)
+    end
+
     before { visit("/") }
 
     let(:newtext) { '12345' }
@@ -1631,29 +1678,49 @@ describe Capybara::Webkit::Driver do
       it "triggers text input events on inputs of type #{field_type}" do
         driver.find_xpath("//input[@type='#{field_type}']").first.set(newtext)
         driver.find_xpath("//body").first.click
-        expect(driver.find_xpath("//li").map(&:visible_text)).to eq textevents
+        expect(logged_events).to eq textevents
       end
     end
 
     it "triggers events for cleared inputs" do
       driver.find_xpath("//input[@type='text']").first.set('')
       driver.find_xpath("//body").first.click
-      expect(driver.find_xpath("//li").map(&:visible_text)).to include('change')
+      expect(logged_events).to include("change")
     end
 
     it "triggers textarea input events" do
       driver.find_xpath("//textarea").first.set(newtext)
-      expect(driver.find_xpath("//li").map(&:visible_text)).to eq keyevents
+      expect(logged_events).to eq keyevents
     end
 
     it "triggers radio input events" do
       driver.find_xpath("//input[@type='radio']").first.set(true)
-      expect(driver.find_xpath("//li").map(&:visible_text)).to eq %w(mousedown focus mouseup change click)
+      expect(logged_events).to eq %w(mousedown focus mouseup change click)
     end
 
     it "triggers checkbox events" do
       driver.find_xpath("//input[@type='checkbox']").first.set(true)
-      expect(driver.find_xpath("//li").map(&:visible_text)).to eq %w(mousedown focus mouseup change click)
+      expect(logged_events).to eq %w(mousedown focus mouseup change click)
+    end
+
+    it "triggers select events" do
+      driver.find_xpath("//option[text() = 'Single Option 2']").first.select_option
+      expect(logged_events).to eq %w[single.mousedown single.focus single.input single.change single.mouseup single.click]
+    end
+
+    it "triggers correct unselect events for multiple selects" do
+      driver.find_xpath("//option[text() = 'Multiple Option 2']").first.unselect_option
+      expect(logged_events).to eq %w[multiple.mousedown multiple.focus multiple.input multiple.change multiple.mouseup multiple.click]
+    end
+
+    it "triggers correct unselect events for multiple selects when already unselected" do
+      driver.find_xpath("//option[text() = 'Multiple Option 3']").first.unselect_option
+      expect(logged_events).to eq %w[multiple.mousedown multiple.focus multiple.input multiple.mouseup multiple.click]
+    end
+
+    it "triggers correct select events for multiple selects when additional option is selected" do
+      driver.find_xpath("//option[text() = 'Multiple Option 4']").first.select_option
+      expect(logged_events).to eq %w[multiple.mousedown multiple.focus multiple.input multiple.change multiple.mouseup multiple.click]
     end
   end
 
@@ -1687,12 +1754,22 @@ describe Capybara::Webkit::Driver do
               <option value="1" id="option-1" selected="selected">one</option>
               <option value="2" id="option-2">two</option>
             </select>
+            <select id="change_select_in_optgroup" name="change_select_in_optgroup">
+              <optgroup>
+                <option value="1" id="option-in-optgroup-1" selected="selected">one</option>
+                <option value="2" id="option-in-optgroup-2">two</option>
+              </optgroup>
+            </select>
           </form>
           <script type="text/javascript">
             document.getElementById("change_select").
               addEventListener("change", function () {
                 this.className = "triggered";
               });
+            document.getElementById("change_select_in_optgroup").
+              addEventListener("change", function () {
+                this.className = "triggered";
+              });
             document.getElementById("change").
               addEventListener("change", function () {
                 this.className = "triggered";
@@ -1754,12 +1831,21 @@ describe Capybara::Webkit::Driver do
     end
 
     it "fires a change on select" do
-      select = driver.find_xpath("//select").first
+      select = driver.find_xpath("//select[@id='change_select']").first
       expect(select.value).to eq "1"
       option = driver.find_xpath("//option[@id='option-2']").first
       option.select_option
       expect(select.value).to eq "2"
-      expect(driver.find_xpath("//select[@class='triggered']")).not_to be_empty
+      expect(driver.find_xpath("//select[@id='change_select'][@class='triggered']")).not_to be_empty
+    end
+
+    it "fires a change on select when using an optgroup" do
+      select = driver.find_xpath("//select[@id='change_select_in_optgroup']").first
+      expect(select.value).to eq "1"
+      option = driver.find_xpath("//option[@id='option-in-optgroup-2']").first
+      option.select_option
+      expect(select.value).to eq "2"
+      expect(driver.find_xpath("//select[@id='change_select_in_optgroup'][@class='triggered']")).not_to be_empty
     end
 
     it "fires drag events" do
@@ -2017,14 +2103,17 @@ describe Capybara::Webkit::Driver do
     end
 
     it "ignores custom fonts" do
+      skip "font replacement not needed for QT >= 5" unless driver.version =~ /Qt: 4/
       expect(font_family).to eq "Arial"
     end
 
     it "ignores custom fonts before an element" do
+      skip "font replacement not needed for QT >= 5" unless driver.version =~ /Qt: 4/
       expect(font_family).to eq "Arial"
     end
 
     it "ignores custom fonts after an element" do
+      skip "font replacement not needed for QT >= 5" unless driver.version =~ /Qt: 4/
       expect(font_family).to eq "Arial"
     end
   end

data/spec/fixtures/exit_text.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+# require 'selenium-webdriver'
+
+RSpec.describe Capybara::Webkit::Driver do
+  it "should exit with a zero exit status" do
+    browser = Capybara::Webkit::Driver.new(TestApp).browser
+    expect(true).to eq(true)
+  end
+end

data/spec/integration/session_spec.rb

@@ -337,6 +337,33 @@ describe Capybara::Session do
     end
   end
 
+  context "text" do
+    before(:all) do
+      @app = Class.new(ExampleApp) do
+        get "/" do
+          <<-HTML
+            <!DOCTYPE html>
+            <html>
+            <head></head>
+            <body>
+              <form>
+                This is my form
+                <input name="type"/>
+                <input name="tagName"/>
+              </form>
+            </body>
+            </html>
+          HTML
+        end
+      end
+    end
+
+    it "gets a forms text when inputs have conflicting names" do
+      subject.visit("/")
+      expect(subject.find(:css, "form").text).to eq("This is my form")
+    end
+  end
+
   context 'click tests' do
     before(:all) do
       @app = Class.new(ExampleApp) do
@@ -551,4 +578,46 @@ describe Capybara::Session do
       expect(session).to have_text('Hello')
     end
   end
+
+  if Capybara.respond_to?(:threadsafe)
+    context "threadsafe/per-session config mode" do
+      before do
+        Capybara::SpecHelper.reset_threadsafe(true, subject)
+      end
+
+      after do
+        Capybara::SpecHelper.reset_threadsafe(false, subject)
+      end
+
+      it "can allow reload in one session but not in another" do
+        session1, session2 = 2.times.collect do
+          session_for_app do
+            get '/' do
+              <<-HTML
+                <html>
+                  <div id="parent">
+                    <p id="removeMe">Hello</p>
+                  </div>
+                </html>
+              HTML
+            end
+          end
+        end
+
+        session1.config.automatic_reload = false
+        session2.config.automatic_reload = true
+
+        node1, node2 = [session1, session2].map do |session|
+          session.visit('/')
+
+          node = session.find(:xpath, "//p[@id='removeMe']")
+          session.execute_script("document.getElementById('parent').innerHTML = 'Magic'")
+          node
+        end
+
+        expect(node1.text).to eq 'Hello'
+        expect{ node2.text }.to raise_error(Capybara::Webkit::NodeNotAttachedError)
+      end
+    end
+  end
 end

data/spec/node_spec.rb

@@ -0,0 +1,90 @@
+# -*- encoding: UTF-8 -*-
+
+require "spec_helper"
+require "capybara/webkit/driver"
+require "base64"
+require "self_signed_ssl_cert"
+
+describe Capybara::Webkit::Node do
+  include AppRunner
+
+  def visit(path, driver = self.driver)
+    driver.visit(url(path))
+  end
+
+  def url(path)
+    "#{AppRunner.app_host}#{path}"
+  end
+
+  context "html app" do
+    let(:driver) do
+      driver_for_html(<<-HTML)
+        <html>
+          <head>
+            <title>Hello HTML</title>
+          </head>
+          <body>
+            <form action="/" method="GET">
+              <input type="text" name="foo" value="bar"/>
+              <input type="checkbox" name="checkedbox" value="1" checked="checked"/>
+              <input type="checkbox" name="uncheckedbox" value="2"/>
+              <input type="checkbox" name="falsecheckedbox" value="3" checked="false"/>
+              <input type="text" name="styled" style="font-size: 150%;"/>
+            </form>
+
+            <div id="visibility_wrapper" style="visibility: hidden">
+              <div id="hidden">Hidden</div>
+              <div id="visible" style="visibility: visible">Visibile</div>
+              <div style="visibility: visible">
+                <div id="nested_visible">Nested Visibile</div>
+              </div>
+            </div>
+
+            <div id="display_none" style="display: none">
+              <div id="not_displayed" style="visibility: visible; display: block;">Should not be displayed</div>
+            </div>
+          </body>
+        </html>
+      HTML
+    end
+
+    before { visit("/") }
+
+    context "Node#[]" do
+      it "gets boolean properties" do
+        box1 = driver.find_css('input[name="checkedbox"]').first
+        box2 = driver.find_css('input[name="uncheckedbox"]').first
+        box3 = driver.find_css('input[name="falsecheckedbox"]').first
+        expect(box1["checked"]).to eq true
+        expect(box2["checked"]).to eq false
+        expect(box3["checked"]).to eq true
+        box1.set(false)
+        expect(box1["checked"]).to eq false
+      end
+
+      it "prefers property over attribute" do
+        input = driver.find_css('input[name="foo"]').first
+        expect(input["value"]).to eq "bar"
+        input.set("new value")
+        expect(input["value"]).to eq "new value"
+      end
+
+      it "returns attribute when property is an object" do
+        input = driver.find_css('input[name="styled"]').first
+        expect(input["style"]).to eq "font-size: 150%;"
+      end
+    end
+
+    context "Node#visible" do
+      it "correctly analyzes visibility CSS" do
+        expect(driver.find_css('#hidden').first.visible?).to be false
+        expect(driver.find_css('#visible').first.visible?).to be true
+        expect(driver.find_css('#nested_visible').first.visible?).to be true
+      end
+
+      it "correctly analyzes display: none CSS" do
+        expect(driver.find_css('#not_displayed').first.visible?).to be false
+      end
+    end
+  end
+end