16 files changed, 6 insertions, 19 deletions
diff --git a/spec/ruby/library/zlib/zstream/adler_spec.rb b/spec/ruby/library/zlib/zstream/adler_spec.rb
index e562fd260e..55ac8ae79e 100644
--- a/spec/ruby/library/zlib/zstream/adler_spec.rb
+++ b/spec/ruby/library/zlib/zstream/adler_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'zlib'
 
 describe "Zlib::ZStream#adler" do
diff --git a/spec/ruby/library/zlib/zstream/avail_in_spec.rb b/spec/ruby/library/zlib/zstream/avail_in_spec.rb
index 25d3219a5a..eddae15830 100644
--- a/spec/ruby/library/zlib/zstream/avail_in_spec.rb
+++ b/spec/ruby/library/zlib/zstream/avail_in_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'zlib'
 
 describe "Zlib::ZStream#avail_in" do
diff --git a/spec/ruby/library/zlib/zstream/avail_out_spec.rb b/spec/ruby/library/zlib/zstream/avail_out_spec.rb
index c747bbbc2f..2e5a394ec0 100644
--- a/spec/ruby/library/zlib/zstream/avail_out_spec.rb
+++ b/spec/ruby/library/zlib/zstream/avail_out_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'zlib'
 
 describe "Zlib::ZStream#avail_out" do
diff --git a/spec/ruby/library/zlib/zstream/close_spec.rb b/spec/ruby/library/zlib/zstream/close_spec.rb
deleted file mode 100644
index 6a4c1dadb4..0000000000
--- a/spec/ruby/library/zlib/zstream/close_spec.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
diff --git a/spec/ruby/library/zlib/zstream/closed_spec.rb b/spec/ruby/library/zlib/zstream/closed_spec.rb
deleted file mode 100644
index 6a4c1dadb4..0000000000
--- a/spec/ruby/library/zlib/zstream/closed_spec.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
diff --git a/spec/ruby/library/zlib/zstream/data_type_spec.rb b/spec/ruby/library/zlib/zstream/data_type_spec.rb
index 614f0d10a2..8be96adf7c 100644
--- a/spec/ruby/library/zlib/zstream/data_type_spec.rb
+++ b/spec/ruby/library/zlib/zstream/data_type_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'zlib'
 
 describe "Zlib::ZStream#data_type" do
diff --git a/spec/ruby/library/zlib/zstream/end_spec.rb b/spec/ruby/library/zlib/zstream/end_spec.rb
deleted file mode 100644
index 6a4c1dadb4..0000000000
--- a/spec/ruby/library/zlib/zstream/end_spec.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
diff --git a/spec/ruby/library/zlib/zstream/ended_spec.rb b/spec/ruby/library/zlib/zstream/ended_spec.rb
deleted file mode 100644
index 6a4c1dadb4..0000000000
--- a/spec/ruby/library/zlib/zstream/ended_spec.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
diff --git a/spec/ruby/library/zlib/zstream/finish_spec.rb b/spec/ruby/library/zlib/zstream/finish_spec.rb
deleted file mode 100644
index 6a4c1dadb4..0000000000
--- a/spec/ruby/library/zlib/zstream/finish_spec.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
diff --git a/spec/ruby/library/zlib/zstream/finished_spec.rb b/spec/ruby/library/zlib/zstream/finished_spec.rb
deleted file mode 100644
index 6a4c1dadb4..0000000000
--- a/spec/ruby/library/zlib/zstream/finished_spec.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
diff --git a/spec/ruby/library/zlib/zstream/flush_next_in_spec.rb b/spec/ruby/library/zlib/zstream/flush_next_in_spec.rb
deleted file mode 100644
index 6a4c1dadb4..0000000000
--- a/spec/ruby/library/zlib/zstream/flush_next_in_spec.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
diff --git a/spec/ruby/library/zlib/zstream/flush_next_out_spec.rb b/spec/ruby/library/zlib/zstream/flush_next_out_spec.rb
index 8ba8414cd1..63676a8203 100644
--- a/spec/ruby/library/zlib/zstream/flush_next_out_spec.rb
+++ b/spec/ruby/library/zlib/zstream/flush_next_out_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'zlib'
 
 describe "Zlib::ZStream#flush_next_out" do
@@ -8,9 +8,7 @@ describe "Zlib::ZStream#flush_next_out" do
     zs << [120, 156, 75, 203, 207, 7, 0, 2, 130, 1, 69].pack('C*')
 
     zs.flush_next_out.should == 'foo'
-    zs.finished?.should == true
+    zs.should.finished?
     zs.flush_next_out.should == ''
   end
 end
-
-
diff --git a/spec/ruby/library/zlib/zstream/reset_spec.rb b/spec/ruby/library/zlib/zstream/reset_spec.rb
deleted file mode 100644
index 6a4c1dadb4..0000000000
--- a/spec/ruby/library/zlib/zstream/reset_spec.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
diff --git a/spec/ruby/library/zlib/zstream/stream_end_spec.rb b/spec/ruby/library/zlib/zstream/stream_end_spec.rb
deleted file mode 100644
index 6a4c1dadb4..0000000000
--- a/spec/ruby/library/zlib/zstream/stream_end_spec.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
diff --git a/spec/ruby/library/zlib/zstream/total_in_spec.rb b/spec/ruby/library/zlib/zstream/total_in_spec.rb
deleted file mode 100644
index 6a4c1dadb4..0000000000
--- a/spec/ruby/library/zlib/zstream/total_in_spec.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
diff --git a/spec/ruby/library/zlib/zstream/total_out_spec.rb b/spec/ruby/library/zlib/zstream/total_out_spec.rb
deleted file mode 100644
index 6a4c1dadb4..0000000000
--- a/spec/ruby/library/zlib/zstream/total_out_spec.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.expand_path('../../../../spec_helper', __FILE__)