diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-14 15:36:43 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-14 15:36:43 -0700 |
| commit | c29d497c91dfe72b5a31a6807f68c47e40689d4a (patch) | |
| tree | 075bd095f038c91e6fa74f26289f062c574dd32b | |
| parent | d21af4ad0b9f810bf7382440322b93c6c44e93a2 (diff) | |
Pull more up-to-date version of webrat from git - trying to resolve travis issues with launchy dependency.
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 17 |
2 files changed, 13 insertions, 8 deletions
@@ -52,8 +52,8 @@ group :test do gem 'test-unit', '~> 1.2.3', :platforms => :ruby_19 gem 'coveralls', :require => false # Using webrat because the preferred (capybara) doesn't work out of the box with rspec 1 - gem 'webrat' - gem 'launchy', '~> 0.4' + gem 'webrat', :git => 'https://github.com/brynary/webrat' + gem 'launchy' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 3f0f4866c..6539fd00b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,6 +21,15 @@ GIT activesupport (= 2.3.17) rake (>= 0.8.3) +GIT + remote: https://github.com/brynary/webrat + revision: e0d924ac8a4f015a5b509552928429d9e84f8105 + specs: + webrat (0.7.5) + nokogiri (>= 1.2.0) + rack (>= 1.0) + rack-test (>= 0.5.3) + GEM remote: http://rubygems.org/ specs: @@ -173,10 +182,6 @@ GEM polyglot polyglot (>= 0.3.1) vpim (0.695) - webrat (0.7.3) - nokogiri (>= 1.2.0) - rack (>= 1.0) - rack-test (>= 0.5.3) will_paginate (2.3.16) xapian-full-alaveteli (1.2.9.5) xml-simple (1.1.2) @@ -198,7 +203,7 @@ DEPENDENCIES gettext (~> 2.3.3) gettext_i18n_rails (>= 0.7.1) json - launchy (~> 0.4) + launchy locale (>= 2.0.5) mahoro mail (~> 2.4.4) @@ -223,7 +228,7 @@ DEPENDENCIES syslog_protocol test-unit (~> 1.2.3) vpim - webrat + webrat! will_paginate (~> 2.3.11) xapian-full-alaveteli (~> 1.2.9.5) xml-simple |