Permalink
Browse files

Merge pull request #12733 from robin850/fix-railties-build

Fix railties build
  • Loading branch information...
2 parents f8483dd + bca36b0 commit 9616a7ee1a18f259dd249e6df6fafcb8b8af9b10 @rafaelfranca rafaelfranca committed Nov 1, 2013
@@ -1,6 +1,8 @@
activesupport_path = File.expand_path('../../../../activesupport/lib', __FILE__)
$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
+require 'thor/group'
+
require 'active_support'
require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/kernel/singleton_class'
@@ -9,8 +11,6 @@
require 'active_support/core_ext/module/attribute_accessors'
require 'active_support/core_ext/string/inflections'
-require 'rails/generators/base'
-
module Rails
module Generators
autoload :Actions, 'rails/generators/actions'
@@ -8,7 +8,6 @@
end
require 'rails/generators'
-require 'rails/generators/actions'
module Rails
module Generators
@@ -184,6 +184,7 @@ def initialize(*args)
end
end
+ public_task :set_default_accessors!
public_task :create_root
def create_root_files
@@ -22,8 +22,8 @@ def expects_exec(exe)
exe = "#{script_dir}/rails"
test "is not in a Rails application if #{exe} is not found in the current or parent directories" do
- File.stubs(:exists?).with('bin/rails').returns(false)
- File.stubs(:exists?).with('script/rails').returns(false)
+ File.stubs(:exist?).with('bin/rails').returns(false)
+ File.stubs(:exist?).with('script/rails').returns(false)
assert !Rails::AppRailsLoader.exec_app_rails
end
@@ -3,7 +3,7 @@
class PathsTest < ActiveSupport::TestCase
def setup
- File.stubs(:exists?).returns(true)
+ File.stubs(:exist?).returns(true)
@root = Rails::Paths::Root.new("/foo/bar")
end

0 comments on commit 9616a7e

Please sign in to comment.