[DRE-commits] [ruby-capybara] 05/08: Merge tag 'upstream/2.2.1'

[Sebastien Badia]

This is an automated email from the git hooks/post-receive script.

sbadia-guest pushed a commit to branch master
in repository ruby-capybara.

commit 6f44b431e76b7b383320709ec026e37c0eb50120
Merge: b651dc3 68933a1
Author: Sebastien Badia <seb at sebian.fr>
Date:   Sun Apr 27 20:59:40 2014 +0200

    Merge tag 'upstream/2.2.1'
    
    Upstream version 2.2.1

 History.md                                      |  49 +++++++-
 README.md                                       |  40 +++---
 checksums.yaml.gz                               | Bin 0 -> 268 bytes
 checksums.yaml.gz.sig                           | Bin 0 -> 256 bytes
 data.tar.gz.sig                                 | Bin 256 -> 256 bytes
 lib/capybara.rb                                 |  29 ++++-
 lib/capybara/cucumber.rb                        |   2 -
 lib/capybara/driver/base.rb                     |  10 +-
 lib/capybara/node/actions.rb                    |   2 +-
 lib/capybara/node/finders.rb                    |   6 +-
 lib/capybara/node/matchers.rb                   |  40 +++---
 lib/capybara/node/simple.rb                     |   8 +-
 lib/capybara/query.rb                           |   1 +
 lib/capybara/rack_test/browser.rb               |   9 +-
 lib/capybara/rack_test/form.rb                  |   7 +-
 lib/capybara/rack_test/node.rb                  |   3 +-
 lib/capybara/result.rb                          |   3 +-
 lib/capybara/rspec.rb                           |   7 ++
 lib/capybara/rspec/features.rb                  |   2 +
 lib/capybara/rspec/matchers.rb                  |  12 +-
 lib/capybara/selector.rb                        |   4 +-
 lib/capybara/selenium/driver.rb                 |  14 ++-
 lib/capybara/selenium/node.rb                   |  23 +++-
 lib/capybara/server.rb                          |  10 +-
 lib/capybara/session.rb                         |  76 +++++++++---
 lib/capybara/spec/public/test.js                |   2 +-
 lib/capybara/spec/session/assert_selector.rb    |  18 +++
 lib/capybara/spec/session/attach_file_spec.rb   |   7 +-
 lib/capybara/spec/session/check_spec.rb         |  14 +++
 lib/capybara/spec/session/choose_spec.rb        |  14 +++
 lib/capybara/spec/session/click_button_spec.rb  |  21 +++-
 lib/capybara/spec/session/fill_in_spec.rb       |  20 ++-
 lib/capybara/spec/session/go_back_spec.rb       |  10 ++
 lib/capybara/spec/session/go_forward_spec.rb    |  12 ++
 lib/capybara/spec/session/has_button_spec.rb    |  24 ++++
 lib/capybara/spec/session/has_field_spec.rb     |  48 ++++++++
 lib/capybara/spec/session/has_text_spec.rb      |  18 +++
 lib/capybara/spec/session/node_spec.rb          |  37 +++++-
 lib/capybara/spec/session/reset_session_spec.rb |  10 +-
 lib/capybara/spec/session/save_page_spec.rb     |  14 ++-
 lib/capybara/spec/session/visit_spec.rb         |  16 +++
 lib/capybara/spec/session/within_frame_spec.rb  |   7 ++
 lib/capybara/spec/session/within_window_spec.rb |   7 ++
 lib/capybara/spec/test_app.rb                   |   1 +
 lib/capybara/spec/views/form.erb                |  40 ++++++
 lib/capybara/spec/views/with_html.erb           |   5 +
 lib/capybara/spec/views/with_js.erb             |   8 ++
 lib/capybara/version.rb                         |   2 +-
 metadata.gz.sig                                 | Bin 256 -> 256 bytes
 metadata.yml                                    | 155 +++++++++---------------
 spec/capybara_spec.rb                           |   2 +-
 spec/result_spec.rb                             |  14 +++
 spec/rspec/features_spec.rb                     |  15 +++
 spec/rspec/matchers_spec.rb                     |  25 +++-
 spec/selenium_spec.rb                           |  11 +-
 spec/selenium_spec_chrome.rb                    |  21 ++++
 spec/server_spec.rb                             |  18 ++-
 57 files changed, 758 insertions(+), 215 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-capybara.git