Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions lib/que/command_line_interface.rb
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,7 @@ def parse(
end

args.each do |file|
begin
require file
rescue LoadError => e
output.puts "Could not load file '#{file}': #{e}"
return 1
end
require File.expand_path(file)
end

Que.logger ||= Logger.new(STDOUT)
Expand Down
7 changes: 2 additions & 5 deletions spec/que/command_line_interface_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def write_file
it "should infer the default require file if it exists" do
filename = write_file

assert_successful_invocation "", default_require_file: "./#{filename}.rb"
assert_successful_invocation "", default_require_file: "#{filename}.rb"

assert_equal(
{filename => true},
Expand Down Expand Up @@ -161,10 +161,7 @@ def write_file

it "should raise an error if any of the files don't exist" do
name = write_file
code = execute "./#{name} ./nonexistent_file"
assert_equal 1, code

assert_equal ["Could not load file './nonexistent_file': cannot load such file -- ./nonexistent_file"], output.messages
assert_raises(LoadError) { execute "#{name} ./nonexistent_file" }

assert_equal(
{name => true},
Expand Down