Skip to content

Commit

Permalink
Merge pull request rails#380 from developingchris/fix_build_192
Browse files Browse the repository at this point in the history
Fix build 192
  • Loading branch information
sferik committed Dec 5, 2013
2 parents 615d69c + 3f4b65d commit aaeccb6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion lib/thor/shell/basic.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require 'tempfile'
require 'io/console'

class Thor
module Shell
Expand Down
2 changes: 1 addition & 1 deletion spec/runner_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def when_no_thorfiles_exist

# Stub load and save to avoid thor.yaml from being overwritten
allow(YAML).to receive(:load_file).and_return(@original_yaml)
allow(File).to receive(:exists?).with(root_file).and_return(true)
allow(File).to receive(:exist?).with(root_file).and_return(true)
allow(File).to receive(:open).with(root_file, "w")
end

Expand Down

0 comments on commit aaeccb6

Please sign in to comment.