Skip to content

Commit 45d4641

Browse files
committed
Merge pull request #1220 from dblock/fix-build
Fix standard logger format.
2 parents 844b6ac + 8ffb199 commit 45d4641

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

spec/grape/api_spec.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,11 +1147,7 @@ def self.io
11471147
it 'defaults to a standard logger log format' do
11481148
t = Time.at(100)
11491149
allow(Time).to receive(:now).and_return(t)
1150-
if ActiveSupport::VERSION::MAJOR >= 4
1151-
expect(subject.io).to receive(:write).with("I, [#{Logger::Formatter.new.send(:format_datetime, t)}\##{Process.pid}] INFO -- : this will be logged\n")
1152-
else
1153-
expect(subject.io).to receive(:write).with("this will be logged\n")
1154-
end
1150+
expect(subject.io).to receive(:write).with("I, [#{Logger::Formatter.new.send(:format_datetime, t)}\##{Process.pid}] INFO -- : this will be logged\n")
11551151
subject.logger.info 'this will be logged'
11561152
end
11571153
end

0 commit comments

Comments
 (0)