<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -89,7 +89,7 @@ module Rails
       gems_code = &quot;config.gem '#{name}'&quot;
 
       if options.any?
-        opts = options.inject([]) {|result, h| result &lt;&lt; [&quot;:#{h[0]} =&gt; '#{h[1]}'&quot;] }.join(&quot;, &quot;)
+        opts = options.inject([]) {|result, h| result &lt;&lt; [&quot;:#{h[0]} =&gt; '#{h[1]}'&quot;] }.sort.join(&quot;, &quot;)
         gems_code &lt;&lt; &quot;, #{opts}&quot;
       end
 </diff>
      <filename>railties/lib/rails_generator/generators/applications/app/template_runner.rb</filename>
    </modified>
    <modified>
      <diff>@@ -79,7 +79,7 @@ class RailsTemplateRunnerTest &lt; GeneratorTestCase
 
   def test_gem_with_options_should_include_options_in_gem_dependency_in_environment
     run_template_method(:gem, 'mislav-will-paginate', :lib =&gt; 'will-paginate', :source =&gt; 'http://gems.github.com')
-    assert_rails_initializer_includes(&quot;config.gem 'mislav-will-paginate', :source =&gt; 'http://gems.github.com', :lib =&gt; 'will-paginate'&quot;)
+    assert_rails_initializer_includes(&quot;config.gem 'mislav-will-paginate', :lib =&gt; 'will-paginate', :source =&gt; 'http://gems.github.com'&quot;)
   end
 
   def test_environment_should_include_data_in_environment_initializer_block</diff>
      <filename>railties/test/generators/rails_template_runner_test.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>fec0ea9d6d4ca56a09e3e83002c38d69c8ad924e</id>
    </parent>
  </parents>
  <author>
    <name>Mike Gunderloy</name>
    <login>ffmike</login>
    <email>MikeG1@larkfarm.com</email>
  </author>
  <url>http://github.com/rails/rails/commit/1fb275541a58e6a2100261c6117e96e6c014cc6c</url>
  <id>1fb275541a58e6a2100261c6117e96e6c014cc6c</id>
  <committed-date>2008-12-28T09:49:58-08:00</committed-date>
  <authored-date>2008-12-28T08:57:37-08:00</authored-date>
  <message>Ensure template runner tests don't depend on hash ordering [#1654 state:resolved]

Signed-off-by: Pratik Naik &lt;pratiknaik@gmail.com&gt;</message>
  <tree>24085ff7b288b34794e354739481829fefb52ca0</tree>
  <committer>
    <name>Pratik Naik</name>
    <login>lifo</login>
    <email>pratiknaik@gmail.com</email>
  </committer>
</commit>
