1 files changed, 58 insertions, 60 deletions
diff --git a/spec/ruby/library/logger/logger/new_spec.rb b/spec/ruby/library/logger/logger/new_spec.rb
index b3eed42f00..b311c96132 100644
--- a/spec/ruby/library/logger/logger/new_spec.rb
+++ b/spec/ruby/library/logger/logger/new_spec.rb
@@ -1,5 +1,5 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../../fixtures/common', __FILE__)
+require_relative '../../../spec_helper'
+require_relative '../fixtures/common'
 
 describe "Logger#new" do
 
@@ -13,31 +13,31 @@ describe "Logger#new" do
     rm_r @file_path
   end
 
-   it "creates a new logger object" do
-     l = Logger.new(STDERR)
-     lambda { l.add(Logger::WARN, "Foo") }.should output_to_fd(/Foo/, STDERR)
-   end
+  it "creates a new logger object" do
+    l = Logger.new(STDERR)
+    -> { l.add(Logger::WARN, "Foo") }.should output_to_fd(/Foo/, STDERR)
+  end
 
-   it "receives a logging device as first argument" do
-     l = Logger.new(@log_file)
-     l.add(Logger::WARN, "Test message")
+  it "receives a logging device as first argument" do
+    l = Logger.new(@log_file)
+    l.add(Logger::WARN, "Test message")
 
-     @log_file.rewind
-     LoggerSpecs.strip_date(@log_file.readline).should == "WARN -- : Test message\n"
-     l.close
-   end
+    @log_file.rewind
+    LoggerSpecs.strip_date(@log_file.readline).should == "WARN -- : Test message\n"
+    l.close
+  end
 
   it "receives a frequency rotation as second argument" do
-     lambda { Logger.new(@log_file, "daily") }.should_not raise_error
-     lambda { Logger.new(@log_file, "weekly") }.should_not raise_error
-     lambda { Logger.new(@log_file, "monthly") }.should_not raise_error
+    -> { Logger.new(@log_file, "daily") }.should_not.raise
+    -> { Logger.new(@log_file, "weekly") }.should_not.raise
+    -> { Logger.new(@log_file, "monthly") }.should_not.raise
   end
 
   it "also receives a number of log files to keep as second argument" do
-    lambda { Logger.new(@log_file, 1).close }.should_not raise_error
+    -> { Logger.new(@log_file, 1).close }.should_not.raise
   end
 
-  it "receivs a maximum logfile size as third argument" do
+  it "receives a maximum logfile size as third argument" do
     # This should create 2 small log files, logfile_test and logfile_test.0
     # in /tmp, each one with a different message.
     path = tmp("logfile_test.log")
@@ -46,8 +46,8 @@ describe "Logger#new" do
     l.add Logger::WARN, "foo"
     l.add Logger::WARN, "bar"
 
-    File.exist?(path).should be_true
-    File.exist?(path + ".0").should be_true
+    File.should.exist?(path)
+    File.should.exist?(path + ".0")
 
     # first line will be a comment so we'll have to skip it.
     f = File.open(path)
@@ -61,60 +61,58 @@ describe "Logger#new" do
     rm_r path, "#{path}.0"
   end
 
-  ruby_version_is "2.4" do
-    it "receives level symbol as keyword argument" do
-      logger = Logger.new(STDERR, level: :info)
-      logger.level.should == Logger::INFO
-    end
+  it "receives level symbol as keyword argument" do
+    logger = Logger.new(STDERR, level: :info)
+    logger.level.should == Logger::INFO
+  end
 
-    it "receives level as keyword argument" do
-      logger = Logger.new(STDERR, level: Logger::INFO)
-      logger.level.should == Logger::INFO
-    end
+  it "receives level as keyword argument" do
+    logger = Logger.new(STDERR, level: Logger::INFO)
+    logger.level.should == Logger::INFO
+  end
 
-    it "receives progname as keyword argument" do
-      progname = "progname"
+  it "receives progname as keyword argument" do
+    progname = "progname"
 
-      logger = Logger.new(STDERR, progname: progname)
-      logger.progname.should == progname
-    end
+    logger = Logger.new(STDERR, progname: progname)
+    logger.progname.should == progname
+  end
 
-    it "receives datetime_format as keyword argument" do
-      datetime_format = "%H:%M:%S"
+  it "receives datetime_format as keyword argument" do
+    datetime_format = "%H:%M:%S"
 
-      logger = Logger.new(STDERR, datetime_format: datetime_format)
-      logger.datetime_format.should == datetime_format
-    end
+    logger = Logger.new(STDERR, datetime_format: datetime_format)
+    logger.datetime_format.should == datetime_format
+  end
 
-    it "receives formatter as keyword argument" do
-      formatter = Class.new do
-        def call(_severity, _time, _progname, _msg); end
-      end.new
+  it "receives formatter as keyword argument" do
+    formatter = Class.new do
+      def call(_severity, _time, _progname, _msg); end
+    end.new
 
-      logger = Logger.new(STDERR, formatter: formatter)
-      logger.formatter.should == formatter
-    end
+    logger = Logger.new(STDERR, formatter: formatter)
+    logger.formatter.should == formatter
+  end
 
-    it "receives shift_period_suffix " do
-      shift_period_suffix = "%Y-%m-%d"
-      path                = tmp("shift_period_suffix_test.log")
-      now                 = Time.now
-      tomorrow            = Time.at(now.to_i + 60 * 60 * 24)
-      logger              = Logger.new(path, 'daily', shift_period_suffix: shift_period_suffix)
+  it "receives shift_period_suffix" do
+    shift_period_suffix = "%Y-%m-%d"
+    path                = tmp("shift_period_suffix_test.log")
+    now                 = Time.now
+    tomorrow            = Time.at(now.to_i + 60 * 60 * 24)
+    logger              = Logger.new(path, 'daily', shift_period_suffix: shift_period_suffix)
 
-      logger.add Logger::INFO, 'message'
+    logger.add Logger::INFO, 'message'
 
-      Time.stub!(:now).and_return(tomorrow)
-      logger.add Logger::INFO, 'second message'
+    Time.stub!(:now).and_return(tomorrow)
+    logger.add Logger::INFO, 'second message'
 
-      shifted_path = "#{path}.#{now.strftime(shift_period_suffix)}"
+    shifted_path = "#{path}.#{now.strftime(shift_period_suffix)}"
 
-      File.exist?(shifted_path).should == true
+    File.should.exist?(shifted_path)
 
-      logger.close
+    logger.close
 
-      rm_r path, shifted_path
-    end
+    rm_r path, shifted_path
   end
 
 end