Merge pull request #4744 from ndbroadbent/replace_for_loops_with_enumerables

Replaced all 'for' loops with Enumerable#each

2 files changed, 4 insertions, 4 deletions

diff --git a/activeresource/Rakefile b/activeresource/Rakefile
index b1c18ff189..042d9fb0c7 100755
--- a/activeresource/Rakefile
+++ b/activeresource/Rakefile
@@ -33,7 +33,7 @@ end
 task :lines do
   lines, codelines, total_lines, total_codelines = 0, 0, 0, 0
 
-  for file_name in FileList["lib/active_resource/**/*.rb"]
+  FileList["lib/active_resource/**/*.rb"].each do |file_name|
     next if file_name =~ /vendor/
     f = File.open(file_name)
 
diff --git a/activeresource/test/cases/format_test.rb b/activeresource/test/cases/format_test.rb
index 21fdc24832..30342ecc74 100644
--- a/activeresource/test/cases/format_test.rb
+++ b/activeresource/test/cases/format_test.rb
@@ -19,7 +19,7 @@ class FormatTest < ActiveSupport::TestCase
   end
 
   def test_formats_on_single_element
-    for format in [ :json, :xml ]
+    [ :json, :xml ].each do |format|
       using_format(Person, format) do
         ActiveResource::HttpMock.respond_to.get "/people/1.#{format}", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode(@david)
         assert_equal @david[:name], Person.find(1).name
@@ -28,7 +28,7 @@ class FormatTest < ActiveSupport::TestCase
   end
 
   def test_formats_on_collection
-    for format in [ :json, :xml ]
+    [ :json, :xml ].each do |format|
       using_format(Person, format) do
         ActiveResource::HttpMock.respond_to.get "/people.#{format}", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode(@programmers)
         remote_programmers = Person.find(:all)
@@ -39,7 +39,7 @@ class FormatTest < ActiveSupport::TestCase
   end
 
   def test_formats_on_custom_collection_method
-    for format in [ :json, :xml ]
+    [ :json, :xml ].each do |format|
       using_format(Person, format) do
         ActiveResource::HttpMock.respond_to.get "/people/retrieve.#{format}?name=David", {'Accept' => ActiveResource::Formats[format].mime_type}, ActiveResource::Formats[format].encode([@david])
         remote_programmers = Person.get(:retrieve, :name => 'David')