[tests] change super to super() - jruby/jruby#6571

Author: jsvd

spec/filewatch/reading_spec.rb

@@ -91,7 +91,7 @@ module FileWatch
     context "when watching a directory with files using striped reading" do
       let(:file_path2) { ::File.join(directory, "2.log") }
       # use a chunk size that does not align with the line boundaries
-      let(:opts) { super.merge(:file_chunk_size => 10, :file_chunk_count => 1, :file_sort_by => "path")}
+      let(:opts) { super().merge(:file_chunk_size => 10, :file_chunk_count => 1, :file_sort_by => "path")}
       let(:lines) { [] }
       let(:observer) { TestObserver.new(lines) }
       let(:listener2) { observer.listener_for(file_path2) }
@@ -121,7 +121,7 @@ module FileWatch
     end
 
     context "when a non default delimiter is specified and it is not in the content" do
-      let(:opts) { super.merge(:delimiter => "\nø") }
+      let(:opts) { super().merge(:delimiter => "\nø") }
       let(:actions) do
         RSpec::Sequencing.run("create file") do
           File.open(file_path, "wb") { |file|  file.write("line1\nline2") }
@@ -154,7 +154,7 @@ module FileWatch
       let(:file_path2) { ::File.join(directory, "2.log") }
       let(:file_path3) { ::File.join(directory, "3.log") }
 
-      let(:opts) { super.merge(:file_sort_by => "last_modified") }
+      let(:opts) { super().merge(:file_sort_by => "last_modified") }
       let(:lines) { [] }
       let(:observer) { TestObserver.new(lines) }
 
@@ -195,7 +195,7 @@ module FileWatch
     end
 
     context "when watching a directory with files using exit_after_read" do
-      let(:opts) { super.merge(:exit_after_read => true, :max_open_files => 2) }
+      let(:opts) { super().merge(:exit_after_read => true, :max_open_files => 2) }
       let(:file_path3) { ::File.join(directory, "3.log") }
       let(:file_path4) { ::File.join(directory, "4.log") }
       let(:file_path5) { ::File.join(directory, "5.log") }

spec/filewatch/rotate_spec.rb

@@ -219,7 +219,7 @@ module FileWatch
     end
 
     context "create + rename rotation: when a new logfile is renamed to a path we have seen before but not all content from the previous the file is read" do
-      let(:opts) { super.merge(
+      let(:opts) { super().merge(
           :file_chunk_size => line1.bytesize.succ,
           :file_chunk_count => 1
         ) }
@@ -296,7 +296,7 @@ module FileWatch
     end
 
     context "copy + truncate rotation: when a logfile is copied to a new path and truncated before the open file is fully read" do
-      let(:opts) { super.merge(
+      let(:opts) { super().merge(
           :file_chunk_size => line1.bytesize.succ,
           :file_chunk_count => 1
         ) }
@@ -370,7 +370,7 @@ module FileWatch
     end
 
     context "? rotation: when an active file is renamed inside the glob and the reading lags behind" do
-      let(:opts) { super.merge(
+      let(:opts) { super().merge(
           :file_chunk_size => line1.bytesize.succ,
           :file_chunk_count => 2
         ) }
@@ -409,7 +409,7 @@ module FileWatch
     end
 
     context "? rotation: when a not active file is rotated outside the glob before the file is read" do
-      let(:opts) { super.merge(
+      let(:opts) { super().merge(
           :close_older => 3600,
           :max_open_files => 1,
           :file_sort_by => "path"

spec/filewatch/tailing_spec.rb

@@ -77,7 +77,7 @@ module FileWatch
 
       context "when close_older is set" do
         let(:wait_before_quit) { 0.8 }
-        let(:opts) { super.merge(:close_older => 0.1, :max_open_files => 1, :stat_interval => 0.1) }
+        let(:opts) { super().merge(:close_older => 0.1, :max_open_files => 1, :stat_interval => 0.1) }
         let(:suffix) { "B" }
         it "opens both files" do
           actions.activate_quietly
@@ -278,7 +278,7 @@ module FileWatch
 
     context "when watching a directory with files and a file is renamed to match glob", :unix => true do
       let(:suffix) { "H" }
-      let(:opts) { super.merge(:close_older => 0) }
+      let(:opts) { super().merge(:close_older => 0) }
       let(:listener2) { observer.listener_for(file_path2) }
       let(:actions) do
         RSpec::Sequencing
@@ -346,7 +346,7 @@ module FileWatch
     end
 
     context "when close older expiry is enabled" do
-      let(:opts) { super.merge(:close_older => 1) }
+      let(:opts) { super().merge(:close_older => 1) }
       let(:suffix) { "J" }
       let(:actions) do
         RSpec::Sequencing.run("create file") do
@@ -370,7 +370,7 @@ module FileWatch
     end
 
     context "when close older expiry is enabled and after timeout the file is appended-to" do
-      let(:opts) { super.merge(:close_older => 0.5) }
+      let(:opts) { super().merge(:close_older => 0.5) }
       let(:suffix) { "K" }
       let(:actions) do
         RSpec::Sequencing
@@ -406,7 +406,7 @@ module FileWatch
     end
 
     context "when ignore older expiry is enabled and all files are already expired" do
-      let(:opts) { super.merge(:ignore_older => 1) }
+      let(:opts) { super().merge(:ignore_older => 1) }
       let(:suffix) { "L" }
       let(:actions) do
         RSpec::Sequencing
@@ -430,7 +430,7 @@ module FileWatch
 
     context "when a file is renamed before it gets activated", :unix => true do
       let(:max) { 1 }
-      let(:opts) { super.merge(:file_chunk_count => 8, :file_chunk_size => 6, :close_older => 0.1, :discover_interval => 6) }
+      let(:opts) { super().merge(:file_chunk_count => 8, :file_chunk_size => 6, :close_older => 0.1, :discover_interval => 6) }
       let(:suffix) { "M" }
       let(:start_new_files_at) { :beginning } # we are creating files and sincedb record before hand
       let(:actions) do
@@ -469,7 +469,7 @@ module FileWatch
     end
 
     context "when ignore_older is less than close_older and all files are not expired" do
-      let(:opts) { super.merge(:ignore_older => 1, :close_older => 1.1) }
+      let(:opts) { super().merge(:ignore_older => 1, :close_older => 1.1) }
       let(:suffix) { "N" }
       let(:start_new_files_at) { :beginning }
       let(:actions) do
@@ -497,7 +497,7 @@ module FileWatch
     end
 
     context "when ignore_older is less than close_older and all files are expired" do
-      let(:opts) { super.merge(:ignore_older => 10, :close_older => 1) }
+      let(:opts) { super().merge(:ignore_older => 10, :close_older => 1) }
       let(:suffix) { "P" }
       let(:actions) do
         RSpec::Sequencing
@@ -522,7 +522,7 @@ module FileWatch
     end
 
     context "when ignore older and close older expiry is enabled and after timeout the file is appended-to" do
-      let(:opts) { super.merge(:ignore_older => 20, :close_older => 0.5) }
+      let(:opts) { super().merge(:ignore_older => 20, :close_older => 0.5) }
       let(:suffix) { "Q" }
       let(:actions) do
         RSpec::Sequencing
@@ -551,7 +551,7 @@ module FileWatch
     end
 
     context "when a non default delimiter is specified and it is not in the content" do
-      let(:opts) { super.merge(:ignore_older => 20, :close_older => 1, :delimiter => "\nø") }
+      let(:opts) { super().merge(:ignore_older => 20, :close_older => 1, :delimiter => "\nø") }
       let(:suffix) { "R" }
       let(:actions) do
         RSpec::Sequencing

spec/inputs/file_read_spec.rb

@@ -267,7 +267,7 @@
   describe 'delete on complete' do
 
     let(:options) do
-      super.merge({ 'file_completed_action' => "delete", 'exit_after_read' => false })
+      super().merge({ 'file_completed_action' => "delete", 'exit_after_read' => false })
     end
 
     let(:sample_file) { File.join(temp_directory, "sample.log") }
@@ -306,7 +306,7 @@
   describe 'sincedb cleanup' do
 
     let(:options) do
-      super.merge(
+      super().merge(
           'sincedb_path' => sincedb_path,
           'sincedb_clean_after' => '1.0 seconds',
           'sincedb_write_interval' => 0.25,