Use require_relative in specs.

gkellogg · gkellogg · commit 82d09d710b91 · 2017-12-02T15:05:53.000-08:00
diff --git a/spec/api_spec.rb b/spec/api_spec.rb
@@ -1,6 +1,5 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD::API do
   let(:logger) {RDF::Spec.logger}
diff --git a/spec/compact_spec.rb b/spec/compact_spec.rb
@@ -1,6 +1,5 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD::API do
   let(:logger) {RDF::Spec.logger}
diff --git a/spec/context_spec.rb b/spec/context_spec.rb
@@ -1,6 +1,5 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 require 'rdf/xsd'
 require 'rdf/spec/reader'
 
diff --git a/spec/expand_spec.rb b/spec/expand_spec.rb
@@ -1,6 +1,5 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD::API do
   let(:logger) {RDF::Spec.logger}
diff --git a/spec/flatten_spec.rb b/spec/flatten_spec.rb
@@ -1,6 +1,5 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD::API do
   let(:logger) {RDF::Spec.logger}
diff --git a/spec/format_spec.rb b/spec/format_spec.rb
@@ -1,6 +1,5 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 require 'rdf/spec/format'
 
 describe JSON::LD::Format do
diff --git a/spec/frame_spec.rb b/spec/frame_spec.rb
@@ -1,6 +1,5 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD::API do
   let(:logger) {RDF::Spec.logger}
diff --git a/spec/from_rdf_spec.rb b/spec/from_rdf_spec.rb
@@ -1,6 +1,5 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 require 'rdf/spec/writer'
 
 describe JSON::LD::API do
diff --git a/spec/reader_spec.rb b/spec/reader_spec.rb
@@ -1,6 +1,5 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 require 'rdf/spec/reader'
 
 describe JSON::LD::Reader do
diff --git a/spec/resource_spec.rb b/spec/resource_spec.rb
@@ -1,6 +1,5 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD::Resource do
   subject {JSON::LD::Resource.new({'@id' => '_:foo', "http://schema.org/name" => "foo"})}
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$:.unshift(File.join("../../lib", __FILE__))
 $:.unshift File.dirname(__FILE__)
 
 require "bundler/setup"
diff --git a/spec/streaming_writer_spec.rb b/spec/streaming_writer_spec.rb
@@ -1,6 +1,5 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 require 'rdf/spec/writer'
 require 'json/ld/streaming_writer'
 
diff --git a/spec/suite_compact_spec.rb b/spec/suite_compact_spec.rb
@@ -1,10 +1,9 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD do
   describe "test suite" do
-    require 'suite_helper'
+    require_relative 'suite_helper'
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/compact-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
diff --git a/spec/suite_error_spec.rb b/spec/suite_error_spec.rb
@@ -1,10 +1,9 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD do
   describe "test suite" do
-    require 'suite_helper'
+    require_relative 'suite_helper'
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/error-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
diff --git a/spec/suite_expand_spec.rb b/spec/suite_expand_spec.rb
@@ -1,10 +1,9 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD do
   describe "test suite" do
-    require 'suite_helper'
+    require_relative 'suite_helper'
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/expand-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
diff --git a/spec/suite_flatten_spec.rb b/spec/suite_flatten_spec.rb
@@ -1,11 +1,9 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD do
   describe "test suite" do
-    require 'suite_helper'
-    require 'suite_helper'
+    require_relative 'suite_helper'
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/flatten-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
diff --git a/spec/suite_frame_spec.rb b/spec/suite_frame_spec.rb
@@ -1,11 +1,9 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD do
   describe "test suite" do
-    require 'suite_helper'
-    require 'suite_helper'
+    require_relative 'suite_helper'
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/frame-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
diff --git a/spec/suite_from_rdf_spec.rb b/spec/suite_from_rdf_spec.rb
@@ -1,10 +1,9 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD do
   describe "test suite" do
-    require 'suite_helper'
+    require_relative 'suite_helper'
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/fromRdf-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
diff --git a/spec/suite_helper.rb b/spec/suite_helper.rb
@@ -1,6 +1,5 @@
 require 'json/ld'
-require 'support/extensions'
-
+require_relative 'support/extensions'
 
 # For now, override RDF::Utils::File.open_file to look for the file locally before attempting to retrieve it
 module RDF::Util
diff --git a/spec/suite_remote_doc_spec.rb b/spec/suite_remote_doc_spec.rb
@@ -1,10 +1,9 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD do
   describe "test suite" do
-    require 'suite_helper'
+    require_relative 'suite_helper'
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/remote-doc-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
diff --git a/spec/suite_to_rdf_spec.rb b/spec/suite_to_rdf_spec.rb
@@ -1,10 +1,9 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD do
   describe "test suite" do
-    require 'suite_helper'
+    require_relative 'suite_helper'
     m = Fixtures::SuiteTest::Manifest.open("#{Fixtures::SuiteTest::SUITE}tests/toRdf-manifest.jsonld")
     describe m.name do
       m.entries.each do |t|
diff --git a/spec/to_rdf_spec.rb b/spec/to_rdf_spec.rb
@@ -1,6 +1,5 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 
 describe JSON::LD::API do
   let(:logger) {RDF::Spec.logger}
diff --git a/spec/writer_spec.rb b/spec/writer_spec.rb
@@ -1,6 +1,5 @@
 # coding: utf-8
-$:.unshift "."
-require 'spec_helper'
+require_relative 'spec_helper'
 require 'rdf/spec/writer'
 
 describe JSON::LD::Writer do

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))`
	`1`	`+$:.unshift(File.join("../../lib", __FILE__))`
`2`	`2`	`$:.unshift File.dirname(__FILE__)`
`3`	`3`
`4`	`4`	`require "bundler/setup"`