Permalink
Browse files

Bump webrat to 0.7.1

Signed-off-by: José Valim <jose.valim@gmail.com>
  • Loading branch information...
1 parent 8def06e commit 4310ad798c53a22da4e99265d8b6036bd07569b1 @carlosantoniodasilva carlosantoniodasilva committed with josevalim Sep 26, 2010
Showing with 59 additions and 90 deletions.
  1. +4 −10 Gemfile
  2. +51 −61 Gemfile.lock
  3. +4 −19 test/support/webrat/integrations/rails.rb
View
14 Gemfile
@@ -1,18 +1,12 @@
source "http://rubygems.org"
-gem "rails", "3.0.0"
-gem "warden", "0.10.7"
+gemspec
+
+gem "rails", "3.0.1"
gem "sqlite3-ruby"
-gem "webrat", "0.7.0"
+gem "webrat", "0.7.1"
gem "mocha", :require => false
-gem "bcrypt-ruby", :require => "bcrypt"
if RUBY_VERSION < '1.9'
gem "ruby-debug", ">= 0.10.3"
-end
-
-group :mongoid do
- gem "mongo"
- gem "mongoid", :git => "git://github.com/mongoid/mongoid.git"
- gem "bson_ext"
end
View
@@ -1,114 +1,104 @@
-GIT
- remote: git://github.com/mongoid/mongoid.git
- revision: f38e3ef
+PATH
+ remote: .
specs:
- mongoid (2.0.0.beta.16)
- activemodel (~> 3.0.0)
- bson (= 1.0.4)
- mongo (= 1.0.7)
- tzinfo (~> 0.3.22)
- will_paginate (~> 3.0.pre)
+ devise (1.1.3)
+ bcrypt-ruby (~> 2.1.2)
+ warden (~> 0.10.7)
GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
- actionmailer (3.0.0)
- actionpack (= 3.0.0)
+ actionmailer (3.0.1)
+ actionpack (= 3.0.1)
mail (~> 2.2.5)
- actionpack (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
+ actionpack (3.0.1)
+ activemodel (= 3.0.1)
+ activesupport (= 3.0.1)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.4.1)
rack (~> 1.2.1)
rack-mount (~> 0.6.12)
rack-test (~> 0.5.4)
tzinfo (~> 0.3.23)
- activemodel (3.0.0)
- activesupport (= 3.0.0)
+ activemodel (3.0.1)
+ activesupport (= 3.0.1)
builder (~> 2.1.2)
i18n (~> 0.4.1)
- activerecord (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
+ activerecord (3.0.1)
+ activemodel (= 3.0.1)
+ activesupport (= 3.0.1)
arel (~> 1.0.0)
tzinfo (~> 0.3.23)
- activeresource (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
- activesupport (3.0.0)
+ activeresource (3.0.1)
+ activemodel (= 3.0.1)
+ activesupport (= 3.0.1)
+ activesupport (3.0.1)
arel (1.0.1)
activesupport (~> 3.0.0)
bcrypt-ruby (2.1.2)
- bson (1.0.4)
- bson_ext (1.0.7)
builder (2.1.2)
- columnize (0.3.1)
+ columnize (0.3.2)
erubis (2.6.6)
abstract (>= 1.0.0)
- i18n (0.4.1)
+ i18n (0.4.2)
linecache (0.43)
- mail (2.2.5)
+ mail (2.2.10)
activesupport (>= 2.3.6)
- mime-types
- treetop (>= 1.4.5)
+ i18n (~> 0.4.1)
+ mime-types (~> 1.16)
+ treetop (~> 1.4.8)
mime-types (1.16)
- mocha (0.9.8)
+ mocha (0.9.9)
rake
- mongo (1.0.7)
- bson (>= 1.0.4)
- nokogiri (1.4.3.1)
+ nokogiri (1.4.4)
polyglot (0.3.1)
rack (1.2.1)
- rack-mount (0.6.12)
+ rack-mount (0.6.13)
rack (>= 1.0.0)
- rack-test (0.5.4)
+ rack-test (0.5.6)
rack (>= 1.0)
- rails (3.0.0)
- actionmailer (= 3.0.0)
- actionpack (= 3.0.0)
- activerecord (= 3.0.0)
- activeresource (= 3.0.0)
- activesupport (= 3.0.0)
+ rails (3.0.1)
+ actionmailer (= 3.0.1)
+ actionpack (= 3.0.1)
+ activerecord (= 3.0.1)
+ activeresource (= 3.0.1)
+ activesupport (= 3.0.1)
bundler (~> 1.0.0)
- railties (= 3.0.0)
- railties (3.0.0)
- actionpack (= 3.0.0)
- activesupport (= 3.0.0)
+ railties (= 3.0.1)
+ railties (3.0.1)
+ actionpack (= 3.0.1)
+ activesupport (= 3.0.1)
rake (>= 0.8.4)
thor (~> 0.14.0)
rake (0.8.7)
- ruby-debug (0.10.3)
+ ruby-debug (0.10.4)
columnize (>= 0.1)
- ruby-debug-base (~> 0.10.3.0)
- ruby-debug-base (0.10.3)
+ ruby-debug-base (~> 0.10.4.0)
+ ruby-debug-base (0.10.4)
linecache (>= 0.3)
- sqlite3-ruby (1.3.1)
- thor (0.14.0)
- treetop (1.4.8)
+ sqlite3-ruby (1.3.2)
+ thor (0.14.6)
+ treetop (1.4.9)
polyglot (>= 0.3.1)
tzinfo (0.3.23)
warden (0.10.7)
rack (>= 1.0.0)
- webrat (0.7.0)
+ webrat (0.7.1)
nokogiri (>= 1.2.0)
rack (>= 1.0)
rack-test (>= 0.5.3)
- will_paginate (3.0.pre2)
PLATFORMS
ruby
DEPENDENCIES
- bcrypt-ruby
- bson_ext
+ bcrypt-ruby (~> 2.1.2)
+ devise!
mocha
- mongo
- mongoid!
- rails (= 3.0.0)
+ rails (= 3.0.1)
ruby-debug (>= 0.10.3)
sqlite3-ruby
- warden (= 0.10.7)
- webrat (= 0.7.0)
+ warden (~> 0.10.7)
+ webrat (= 0.7.1)
@@ -1,9 +1,9 @@
-require 'webrat/core/elements/field'
+require 'webrat/core/elements/form'
require 'action_dispatch/testing/integration'
module Webrat
- Field.class_eval do
- def parse_rails_request_params(params)
+ Form.class_eval do
+ def self.parse_rails_request_params(params)
Rack::Utils.parse_nested_query(params)
end
end
@@ -13,20 +13,5 @@ module ActionDispatch #:nodoc:
IntegrationTest.class_eval do
include Webrat::Methods
include Webrat::Matchers
-
- # The Rails version of within supports passing in a model and Webrat
- # will apply a scope based on Rails' dom_id for that model.
- #
- # Example:
- # within User.last do
- # click_link "Delete"
- # end
- def within(selector_or_object, &block)
- if selector_or_object.is_a?(String)
- super
- else
- super('#' + RecordIdentifier.dom_id(selector_or_object), &block)
- end
- end
end
-end
+end

0 comments on commit 4310ad7

Please sign in to comment.