diff options
| author | Yehuda Katz <wycats@gmail.com> | 2012-04-25 16:43:01 -0500 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2012-04-25 16:43:01 -0500 |
| commit | 47be2f101cf133d6d1b9527b8764306d6ddcbf2c (patch) | |
| tree | 225f51ce88cbc35212ec7098753f2c907394cd26 | |
| parent | fe6573e7184cb7e55b4045d2b61696315e13a201 (diff) | |
| download | rails-47be2f101cf133d6d1b9527b8764306d6ddcbf2c.tar.gz rails-47be2f101cf133d6d1b9527b8764306d6ddcbf2c.tar.bz2 rails-47be2f101cf133d6d1b9527b8764306d6ddcbf2c.zip | |
Fix the build
| -rw-r--r-- | actionpack/test/dispatch/mapper_test.rb | 3 | ||||
| -rw-r--r-- | railties/lib/rails/engine.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/mapper_test.rb b/actionpack/test/dispatch/mapper_test.rb index 8070bdec8a..bd078d2b21 100644 --- a/actionpack/test/dispatch/mapper_test.rb +++ b/actionpack/test/dispatch/mapper_test.rb @@ -4,11 +4,12 @@ module ActionDispatch module Routing class MapperTest < ActiveSupport::TestCase class FakeSet - attr_reader :routes + attr_reader :routes, :draw_paths alias :set :routes def initialize @routes = [] + @draw_paths = [] end def resources_path_names diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 3b302b23a7..de0b9a3761 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -517,7 +517,7 @@ module Rails # # Blog::Engine.load_seed def load_seed - seed_file = paths["db/seeds"].existent.first + seed_file = paths["db/seeds.rb"].existent.first load(seed_file) if seed_file end |