Permalink
Browse files

Rollback [4584], bad test. Reopens #3819.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4586 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 1060fe2 commit 80b5331c0f2eba19e53b5c9bc8e9b3e5faffc499 @jeremy jeremy committed Jul 8, 2006
Showing with 2 additions and 17 deletions.
  1. +0 −2 activerecord/CHANGELOG
  2. +1 −1 activerecord/lib/active_record/base.rb
  3. +1 −14 activerecord/test/finder_test.rb
View
2 activerecord/CHANGELOG
@@ -2,8 +2,6 @@
* Update callbacks documentation. #3970 [Robby Russell <robby@planetargon.com>]
-* Don't modify options parameters in-place. #3819 [mpalmer@hezmatt.org]
-
* PostgreSQL: correctly quote the ' in pk_and_sequence_for. #5462 [tietew@tietew.net]
* PostgreSQL: correctly quote microseconds in timestamps. #5641 [rick@rickbradley.com]
View
2 activerecord/lib/active_record/base.rb
@@ -1390,7 +1390,7 @@ def raise_if_bind_arity_mismatch(statement, expected, provided) #:nodoc:
end
def extract_options_from_args!(args) #:nodoc:
- args.last.is_a?(Hash) ? args.pop.dup : {}
+ args.last.is_a?(Hash) ? args.pop : {}
end
VALID_FIND_OPTIONS = [ :conditions, :include, :joins, :limit, :offset,
View
15 activerecord/test/finder_test.rb
@@ -5,10 +5,9 @@
require 'fixtures/entrant'
require 'fixtures/developer'
require 'fixtures/post'
-require 'fixtures/author'
class FinderTest < Test::Unit::TestCase
- fixtures :authors, :companies, :topics, :entrants, :developers, :developers_projects, :posts, :accounts
+ fixtures :companies, :topics, :entrants, :developers, :developers_projects, :posts, :accounts
def test_find
assert_equal(topics(:first).title, Topic.find(1).title)
@@ -450,18 +449,6 @@ def test_select_values
assert_equal ["37signals","Summit","Microsoft", "Flamboyant Software", "Ex Nihilo", "RailsCore", "Leetsoft", "Jadedpixel"], Company.connection.select_values("SELECT name FROM companies ORDER BY id")
end
- def test_find_doesnt_mangle_parameters
- author = Author.find(1)
-
- args = [:all, {:conditions => "body like '%t%'"}]
-
- author.posts.each do |p|
- assert_equal Post.find(p.id).comments.length,
- p.comments.find(*args).length,
- "Post ##{p.id} doesn't find correct number of comments"
- end
- end
-
protected
def bind(statement, *vars)
if vars.first.is_a?(Hash)

0 comments on commit 80b5331

Please sign in to comment.