diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-06-11 00:00:26 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-06-11 00:00:26 -0400 |
| commit | 826618304ed37bb2f4ff4875915538c337538fc8 (patch) | |
| tree | aa91fe9b8bfe1199e74e8350fdc81ea043aa394c | |
| parent | 190c9e9f39c6d14c2a47083fcd5d64717919d9eb (diff) | |
| download | gitlab-ce-rs-upgrade-capybara-poltergeist.tar.gz | |
Upgrade capybara and poltergeist gemsrs-upgrade-capybara-poltergeist
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 14 |
2 files changed, 10 insertions, 8 deletions
@@ -226,7 +226,7 @@ group :development, :test do gem 'rubocop', '0.28.0', require: false gem 'spinach-rails' gem "rspec-rails", '2.99' - gem 'capybara', '~> 2.2.1' + gem 'capybara', '~> 2.3.0' gem 'capybara-screenshot', '~> 1.0.0' gem "pry-rails" gem "awesome_print" @@ -240,7 +240,7 @@ group :development, :test do gem 'ffaker', '~> 2.0.0' # PhantomJS driver for Capybara - gem 'poltergeist', '~> 1.5.1' + gem 'poltergeist', '~> 1.6.0' gem 'teaspoon', '~> 1.0.0' gem 'teaspoon-jasmine' diff --git a/Gemfile.lock b/Gemfile.lock index 1de29ad8f8a..f79cdcca353 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,7 +82,7 @@ GEM columnize (~> 0.8) debugger-linecache (~> 1.2) cal-heatmap-rails (0.0.1) - capybara (2.2.1) + capybara (2.3.0) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -366,7 +366,7 @@ GEM mini_portile (0.6.2) minitest (5.3.5) mousetrap-rails (1.4.6) - multi_json (1.10.1) + multi_json (1.11.0) multi_xml (0.5.5) multipart-post (1.2.0) mysql2 (0.3.16) @@ -432,7 +432,7 @@ GEM parser (2.2.0.2) ast (>= 1.1, < 3.0) pg (0.15.1) - poltergeist (1.5.1) + poltergeist (1.6.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) @@ -707,7 +707,9 @@ GEM webmock (1.21.0) addressable (>= 2.3.6) crack (>= 0.3.2) - websocket-driver (0.3.3) + websocket-driver (0.5.4) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) wikicloth (0.8.1) builder expression_parser @@ -735,7 +737,7 @@ DEPENDENCIES browser (~> 0.8.0) byebug cal-heatmap-rails (~> 0.0.1) - capybara (~> 2.2.1) + capybara (~> 2.3.0) capybara-screenshot (~> 1.0.0) carrierwave charlock_holmes @@ -800,7 +802,7 @@ DEPENDENCIES omniauth-twitter org-ruby (= 0.9.12) pg - poltergeist (~> 1.5.1) + poltergeist (~> 1.6.0) pry-rails quiet_assets (~> 1.0.1) rack-attack (~> 4.3.0) |