From: Debian Ruby Extras Maintainers Date: Fri, 29 Jul 2016 16:17:14 +0300 Subject: Fix paths for spec_helper & random_compat --- spec/cases_spec.rb | 2 +- spec/cruby/buffer_io_spec.rb | 4 ++-- spec/cruby/buffer_packer.rb | 2 +- spec/cruby/buffer_spec.rb | 4 ++-- spec/cruby/buffer_unpacker.rb | 2 +- spec/cruby/unpacker_spec.rb | 2 +- spec/ext_value_spec.rb | 2 +- spec/factory_spec.rb | 2 +- spec/format_spec.rb | 2 +- spec/msgpack_spec.rb | 2 +- spec/pack_spec.rb | 2 +- spec/packer_spec.rb | 2 +- spec/spec_helper.rb | 1 + spec/unpack_spec.rb | 2 +- spec/unpacker_spec.rb | 2 +- 15 files changed, 17 insertions(+), 16 deletions(-) diff --git a/spec/cases_spec.rb b/spec/cases_spec.rb index 6a71b41..cde51b3 100644 --- a/spec/cases_spec.rb +++ b/spec/cases_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'spec/spec_helper' require 'json' describe MessagePack do diff --git a/spec/cruby/buffer_io_spec.rb b/spec/cruby/buffer_io_spec.rb index 3c012e8..95a562b 100644 --- a/spec/cruby/buffer_io_spec.rb +++ b/spec/cruby/buffer_io_spec.rb @@ -1,5 +1,5 @@ -require 'spec_helper' -require 'random_compat' +require 'spec/spec_helper' +require 'spec/random_compat' require 'stringio' if defined?(Encoding) diff --git a/spec/cruby/buffer_packer.rb b/spec/cruby/buffer_packer.rb index f9cd1df..1259320 100644 --- a/spec/cruby/buffer_packer.rb +++ b/spec/cruby/buffer_packer.rb @@ -1,5 +1,5 @@ # encoding: ascii-8bit -require 'spec_helper' +require 'spec/spec_helper' require 'stringio' if defined?(Encoding) diff --git a/spec/cruby/buffer_spec.rb b/spec/cruby/buffer_spec.rb index 3ee0188..22b52b4 100644 --- a/spec/cruby/buffer_spec.rb +++ b/spec/cruby/buffer_spec.rb @@ -1,5 +1,5 @@ -require 'spec_helper' -require 'random_compat' +require 'spec/spec_helper' +require 'spec/random_compat' require 'stringio' if defined?(Encoding) diff --git a/spec/cruby/buffer_unpacker.rb b/spec/cruby/buffer_unpacker.rb index 2d1f0a3..ed289da 100644 --- a/spec/cruby/buffer_unpacker.rb +++ b/spec/cruby/buffer_unpacker.rb @@ -1,5 +1,5 @@ # encoding: ascii-8bit -require 'spec_helper' +require 'spec/spec_helper' describe Unpacker do let :unpacker do diff --git a/spec/cruby/unpacker_spec.rb b/spec/cruby/unpacker_spec.rb index 2f55c4d..0d59e18 100644 --- a/spec/cruby/unpacker_spec.rb +++ b/spec/cruby/unpacker_spec.rb @@ -1,5 +1,5 @@ # encoding: ascii-8bit -require 'spec_helper' +require 'spec/spec_helper' describe Unpacker do let :unpacker do diff --git a/spec/ext_value_spec.rb b/spec/ext_value_spec.rb index eb0447c..8e5db98 100644 --- a/spec/ext_value_spec.rb +++ b/spec/ext_value_spec.rb @@ -1,5 +1,5 @@ # encoding: ascii-8bit -require 'spec_helper' +require 'spec/spec_helper' describe MessagePack::ExtensionValue do subject do diff --git a/spec/factory_spec.rb b/spec/factory_spec.rb index 25bea66..99e0711 100644 --- a/spec/factory_spec.rb +++ b/spec/factory_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'spec/spec_helper' describe MessagePack::Factory do subject do diff --git a/spec/format_spec.rb b/spec/format_spec.rb index d416eaa..ecdedb4 100644 --- a/spec/format_spec.rb +++ b/spec/format_spec.rb @@ -1,5 +1,5 @@ # encoding: ascii-8bit -require 'spec_helper' +require 'spec/spec_helper' describe MessagePack do it "nil" do diff --git a/spec/msgpack_spec.rb b/spec/msgpack_spec.rb index fd46643..8855e5d 100644 --- a/spec/msgpack_spec.rb +++ b/spec/msgpack_spec.rb @@ -1,6 +1,6 @@ # encoding: ascii-8bit -require 'spec_helper' +require 'spec/spec_helper' def utf8enc(str) str.encode('UTF-8') diff --git a/spec/pack_spec.rb b/spec/pack_spec.rb index d7ea533..9c90db3 100644 --- a/spec/pack_spec.rb +++ b/spec/pack_spec.rb @@ -1,5 +1,5 @@ # encoding: ascii-8bit -require 'spec_helper' +require 'spec/spec_helper' require 'stringio' if defined?(Encoding) diff --git a/spec/packer_spec.rb b/spec/packer_spec.rb index 3968622..66acf24 100644 --- a/spec/packer_spec.rb +++ b/spec/packer_spec.rb @@ -1,5 +1,5 @@ # encoding: ascii-8bit -require 'spec_helper' +require 'spec/spec_helper' require 'stringio' require 'tempfile' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 8dbb3bd..c3935ed 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -15,6 +15,7 @@ if ENV['GC_STRESS'] GC.stress = true end +require 'rspec' require 'msgpack' require "msgpack/bigint" diff --git a/spec/unpack_spec.rb b/spec/unpack_spec.rb index 73aab5e..38cf123 100644 --- a/spec/unpack_spec.rb +++ b/spec/unpack_spec.rb @@ -1,5 +1,5 @@ # encoding: ascii-8bit -require 'spec_helper' +require 'spec/spec_helper' require 'stringio' if defined?(Encoding) diff --git a/spec/unpacker_spec.rb b/spec/unpacker_spec.rb index 3b4b2a3..5a63a1a 100644 --- a/spec/unpacker_spec.rb +++ b/spec/unpacker_spec.rb @@ -2,7 +2,7 @@ require 'stringio' require 'tempfile' require 'zlib' -require 'spec_helper' +require 'spec/spec_helper' describe MessagePack::Unpacker do let :unpacker do diff --git a/spec/bigint_spec.rb b/spec/bigint_spec.rb index 8e6829a..691b8a3 100644 --- a/spec/bigint_spec.rb +++ b/spec/bigint_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'spec/spec_helper' describe MessagePack::Bigint do it 'serialize and deserialize arbitrary sized integer' do diff --git a/spec/timestamp_spec.rb b/spec/timestamp_spec.rb index f837bd5..8dc028c 100644 --- a/spec/timestamp_spec.rb +++ b/spec/timestamp_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require 'spec/spec_helper' describe MessagePack::Timestamp do describe 'malformed format' do