capybara-webkit 1.12.0 → 1.13.0

data/spec/errors_spec.rb

@@ -7,5 +7,5 @@ describe Capybara::Webkit::JsonError do
 
   it { should be_an_instance_of Capybara::Webkit::ClickFailed }
 
-  its(:message) { should == 'Error clicking this element' }
+  it { expect(subject.message).to eq 'Error clicking this element' }
 end

data/spec/integration/session_spec.rb

@@ -50,7 +50,7 @@ describe Capybara::Session do
     it "waits for a request to load" do
       subject.visit("/")
       subject.find_button("Submit").click
-      subject.should have_content("Goodbye");
+      expect(subject).to have_content("Goodbye");
     end
   end
 
@@ -76,12 +76,12 @@ describe Capybara::Session do
     end
 
     it "inspects nodes" do
-      subject.all(:xpath, "//strong").first.inspect.should include("strong")
+      expect(subject.all(:xpath, "//strong").first.inspect).to include("strong")
     end
 
     it "can read utf8 string" do
       utf8str = subject.all(:xpath, "//span").first.text
-      utf8str.should eq('UTF8文字列')
+      expect(utf8str).to eq('UTF8文字列')
     end
 
     it "can click utf8 string" do
@@ -91,7 +91,7 @@ describe Capybara::Session do
     it "raises an ElementNotFound error when the selector scope is no longer valid" do
       subject.within('//body') do
         subject.click_link 'Link'
-        lambda { subject.find('//strong') }.should raise_error(Capybara::ElementNotFound)
+        expect { subject.find('//strong') }.to raise_error(Capybara::ElementNotFound)
       end
     end
   end
@@ -119,26 +119,26 @@ describe Capybara::Session do
 
     it "should get status code" do
       subject.visit '/'
-      subject.status_code.should eq 200
+      expect(subject.status_code).to eq 200
     end
 
     it "should reset status code" do
       subject.visit '/'
-      subject.status_code.should eq 200
+      expect(subject.status_code).to eq 200
       subject.reset!
-      subject.status_code.should eq 0
+      expect(subject.status_code).to eq 0
     end
 
     it "should get response headers" do
       subject.visit '/'
-      subject.response_headers['X-Capybara'].should eq 'WebKit'
+      expect(subject.response_headers['X-Capybara']).to eq 'WebKit'
     end
 
     it "should reset response headers" do
       subject.visit '/'
-      subject.response_headers['X-Capybara'].should eq 'WebKit'
+      expect(subject.response_headers['X-Capybara']).to eq 'WebKit'
       subject.reset!
-      subject.response_headers['X-Capybara'].should eq nil
+      expect(subject.response_headers['X-Capybara']).to eq nil
     end
   end
 
@@ -188,7 +188,7 @@ describe Capybara::Session do
       subject.visit("/")
       subject.click_link('Click Me!')
       Capybara.using_wait_time(5) do
-        subject.should have_content("finished")
+        expect(subject).to have_content("finished")
       end
     end
   end
@@ -235,7 +235,7 @@ describe Capybara::Session do
       subject.fill_in('password', with: 'temp4now')
       subject.click_button('Submit')
       subject.visit('/other')
-      subject.should have_content('admin')
+      expect(subject).to have_content('admin')
     end
   end
 
@@ -299,7 +299,7 @@ describe Capybara::Session do
       subject.within_frame 'a_frame' do
         subject.within_frame 'b_frame' do
           subject.click_button 'B Button'
-          subject.should have_content('Page C')
+          expect(subject).to have_content('Page C')
         end
       end
     end
@@ -319,9 +319,9 @@ describe Capybara::Session do
 
       subject.within_frame('a_frame') do
         subject.within_frame('b_frame') do
-          lambda {
+          expect {
             subject.click_button 'B Button'
-          }.should raise_error(Capybara::Webkit::ClickFailed)
+          }.to raise_error(Capybara::Webkit::ClickFailed)
         end
       end
     end
@@ -379,29 +379,29 @@ describe Capybara::Session do
     it 'clicks in the center of an element' do
       subject.visit('/')
       subject.find(:css, '#one').click
-      subject.find(:css, '#one')['data-click-x'].should eq '199'
-      subject.find(:css, '#one')['data-click-y'].should eq '199'
+      expect(subject.find(:css, '#one')['data-click-x']).to eq '199'
+      expect(subject.find(:css, '#one')['data-click-y']).to eq '199'
     end
 
     it 'clicks in the center of the viewable area of an element' do
       subject.visit('/')
       subject.driver.resize_window(200, 200)
       subject.find(:css, '#one').click
-      subject.find(:css, '#one')['data-click-x'].should eq '149'
-      subject.find(:css, '#one')['data-click-y'].should eq '99'
+      expect(subject.find(:css, '#one')['data-click-x']).to eq '149'
+      expect(subject.find(:css, '#one')['data-click-y']).to eq '99'
     end
 
     it 'does not raise an error when an anchor contains empty nodes' do
       subject.visit('/')
-      lambda { subject.click_link('Some link') }.should_not raise_error
+      expect { subject.click_link('Some link') }.not_to raise_error
     end
 
     it 'scrolls an element into view when clicked' do
       subject.visit('/')
       subject.driver.resize_window(200, 200)
       subject.find(:css, '#two').click
-      subject.find(:css, '#two')['data-click-x'].should_not be_nil
-      subject.find(:css, '#two')['data-click-y'].should_not be_nil
+      expect(subject.find(:css, '#two')['data-click-x']).not_to be_nil
+      expect(subject.find(:css, '#two')['data-click-y']).not_to be_nil
     end
 
     it 'raises an error if an element is obscured when clicked' do
@@ -417,11 +417,11 @@ describe Capybara::Session do
       expect {
         subject.find(:css, '#one').click
       }.to raise_error(Capybara::Webkit::ClickFailed) { |exception|
-        exception.message.should =~ %r{Failed.*\[@id='one'\].*overlapping.*\[@id='two'\].*at position}
+        expect(exception.message).to match %r{Failed.*\[@id='one'\].*overlapping.*\[@id='two'\].*at position}
         screenshot_pattern = %r{A screenshot of the page at the time of the failure has been written to (.*)}
-        exception.message.should =~ screenshot_pattern
+        expect(exception.message).to match screenshot_pattern
         file = exception.message.match(screenshot_pattern)[1]
-        File.exist?(file).should be_true
+        expect(File.exist?(file)).to be true
       }
     end
 
@@ -438,9 +438,9 @@ describe Capybara::Session do
         document.body.appendChild(div);
       JS
 
-      lambda {
+      expect {
         subject.check('bar')
-      }.should raise_error(Capybara::Webkit::ClickFailed)
+      }.to raise_error(Capybara::Webkit::ClickFailed)
     end
 
     it 'raises an error if an element is not visible when clicked' do
@@ -449,7 +449,7 @@ describe Capybara::Session do
       begin
         subject.visit('/')
         subject.execute_script "document.getElementById('foo').style.display = 'none'"
-        lambda { subject.click_link "Click Me" }.should raise_error(
+        expect { subject.click_link "Click Me" }.to raise_error(
           Capybara::Webkit::ClickFailed,
           /\[@id='foo'\].*visible/
         )
@@ -460,7 +460,7 @@ describe Capybara::Session do
 
     it 'raises an error if an element is not in the viewport when clicked' do
       subject.visit('/')
-      lambda { subject.click_link "Click Me" }.should raise_error(Capybara::Webkit::ClickFailed)
+      expect { subject.click_link "Click Me" }.to raise_error(Capybara::Webkit::ClickFailed)
     end
 
     context "with wait time of 1 second" do
@@ -479,7 +479,7 @@ describe Capybara::Session do
           }, 400);
         JS
 
-        lambda { subject.click_link "Click Me" }.should_not raise_error
+        expect { subject.click_link "Click Me" }.not_to raise_error
       end
     end
   end
@@ -538,7 +538,7 @@ describe Capybara::Session do
       session.attach_file 'File', file.path
       session.click_on 'Go'
 
-      session.should have_text('Hello')
+      expect(session).to have_text('Hello')
     end
   end
 end

data/spec/selenium_compatibility_spec.rb

@@ -107,7 +107,7 @@ describe Capybara::Webkit, 'compatibility with selenium' do
   end
 
   def compare_for_drivers(first, second, &block)
-    for_driver(first, &block).should == for_driver(second, &block)
+    expect(for_driver(first, &block)).to eq for_driver(second, &block)
   end
 
   def for_driver(name, &block)

data/spec/server_spec.rb

@@ -16,7 +16,7 @@ describe Capybara::Webkit::Connection do
     write_io.close
 
     webkit_pid = read_io.read.to_i
-    webkit_pid.should be > 1
+    expect(webkit_pid).to be > 1
     read_io.close
     Process.kill(9, fork_pid)
 
@@ -59,14 +59,14 @@ describe Capybara::Webkit::Connection do
     socket.puts 1
     socket.puts url.to_s.bytesize
     socket.print url
-    socket.gets.should eq "ok\n"
-    socket.gets.should eq "0\n"
+    expect(socket.gets).to eq "ok\n"
+    expect(socket.gets).to eq "0\n"
     socket.puts "Body"
     socket.puts 0
-    socket.gets.should eq "ok\n"
+    expect(socket.gets).to eq "ok\n"
     response_length = socket.gets.to_i
     response = socket.read(response_length)
-    response.should include("Hey there")
+    expect(response).to include("Hey there")
   end
 
   it "forwards stderr to the given IO object" do
@@ -86,27 +86,27 @@ describe Capybara::Webkit::Connection do
   end
 
   it "does not forward stderr to nil" do
-    IO.should_not_receive(:copy_stream)
+    expect(IO).not_to receive(:copy_stream)
     start_server(stderr: nil)
   end
 
   it "prints a deprecation warning if the stdout option is used" do
-    Capybara::Webkit::Server.any_instance.should_receive(:warn)
+    expect_any_instance_of(Capybara::Webkit::Server).to receive(:warn)
     start_server(stdout: nil)
   end
 
   it "does not forward stdout to nil if the stdout option is used" do
-    Capybara::Webkit::Server.any_instance.stub(:warn)
-    IO.should_not_receive(:copy_stream)
+    allow_any_instance_of(Capybara::Webkit::Server).to receive(:warn)
+    expect(IO).not_to receive(:copy_stream)
     start_server(stdout: nil)
   end
 
   it "returns the server port" do
-    start_server.port.should be_between 0x400, 0xffff
+    expect(start_server.port).to be_between 0x400, 0xffff
   end
 
   it "chooses a new port number for a new connection" do
-    start_server.port.should_not == start_server.port
+    expect(start_server.port).not_to eq start_server.port
   end
 
   before(:all) do

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'rspec'
-require 'rspec/autorun'
 require 'rbconfig'
 require 'capybara'
 
@@ -48,12 +47,20 @@ RSpec.configure do |c|
   require 'capybara_webkit_builder'
   c.filter_run_excluding :skip_on_qt4 => !(%x(#{CapybaraWebkitBuilder.qmake_bin} -v).match(/Using Qt version 4/)).nil?
 
-  # We can't support outerWidth and outerHeight without a visible window.
+  # We can't support outerWidth and outerHeight without a visible window. Only affects Capybara < 2.12.0
   # We focus the next window instead of failing when closing windows.
+  # Accessing unattached nodes is allowed when reload is disabled - Legacy behavior
+  # Node#send_keys does not support modifiers and only supports a subset of special keys
   c.filter_run_excluding :full_description => lambda { |description, metadata|
     (description !~ /Capybara::Session webkit node #send_keys should send a string of keys to an element/) && (
-      description =~ /Capybara::Session webkit Capybara::Window #(size|resize_to|maximize|close.*no_such_window_error|send_keys)/ ||
-      description =~ /Capybara::Session webkit node #send_keys/
+        description =~ /Capybara::Session webkit node #send_keys/ ||
+        description =~ /Capybara::Session webkit node #reload without automatic reload should not automatically reload/ ||
+      if Gem::Version.new(Capybara::VERSION) < Gem::Version.new("2.12.0")
+        description =~ /Capybara::Session webkit Capybara::Window\s*#(size|resize_to|maximize|close.*no_such_window_error|send_keys)/ ||
+        description =~ /Capybara::Session webkit node\s*#set should allow me to change the contents of a contenteditable elements child/
+      else
+        description =~ /Capybara::Session webkit Capybara::Window\s*#close.*no_such_window_error/
+      end
     )
   }
 end

data/spec/support/app_runner.rb

@@ -21,6 +21,7 @@ module AppRunner
     end
 
     self.browser = $webkit_browser
+    self.browser.reset!
 
     self.configuration = Capybara::Webkit::Configuration.new
   end

data/spec/support/matchers/include_response.rb

@@ -14,11 +14,11 @@ RSpec::Matchers.define :include_response do |expected_response|
     found_response
   end
 
-  failure_message_for_should do |actual|
+  send(respond_to?(:failure_message) ? :failure_message : :failure_message_for_should) do |actual|
     "expected #{response} to include #{expected_response}"
   end
 
-  failure_message_for_should_not do |actual|
+  send(respond_to?(:failure_message_when_negated) ? :failure_message_when_negated : :failure_message_for_should_not) do |actual|
     "expected #{response} to not include #{expected_response}"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - thoughtbot
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -55,14 +55,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ files:
 - bin/Info.plist
 - capybara-webkit.gemspec
 - extconf.rb
-- gemfiles/2.11.gemfile
+- gemfiles/2.12.gemfile
 - gemfiles/2.7.gemfile
 - gemfiles/master.gemfile
 - lib/capybara-webkit.rb
@@ -385,7 +385,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Qt >= 4.8
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Headless Webkit driver for Capybara