Update to flexmock/minitest

ngiger · Jan 9, 2017 · 08dd43c · 08dd43c
1 parent 20383de
commit 08dd43c
Show file tree

Hide file tree

Showing 454 changed files with 865 additions and 1,549 deletions.
diff --git a/ext/chapterparse/test/test_integrate.rb b/ext/chapterparse/test/test_integrate.rb
@@ -8,7 +8,7 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 $: << File.expand_path('../../..', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'chaptparser'
 require 'ext/chapterparse/src/writer'

diff --git a/ext/chapterparse/test/test_parser.rb b/ext/chapterparse/test/test_parser.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'chaptparser'
 

diff --git a/ext/chapterparse/test/test_writer.rb b/ext/chapterparse/test/test_writer.rb
@@ -7,15 +7,14 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 $: << File.expand_path('../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'writer'
 
 module ODDB
 	module ChapterParse
 		class TestWriter <Minitest::Test
-      include FlexMock::TestCase
 			def setup
 				@writer = Writer.new
 			end

diff --git a/ext/export/test/test_csv_exporter.rb b/ext/export/test/test_csv_exporter.rb
@@ -7,20 +7,19 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 $: << File.expand_path('../../../test', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'csv_exporter'
 require 'model/analysis/group'
 require 'model/doctor'
 require 'stub/odba'
 require 'model/limitationtext'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'tempfile'
 
 module ODDB
 	module OdbaExporter
 		class TestCsvExporter <Minitest::Test
-      include FlexMock::TestCase
 			def setup
         dbi = flexmock('dbi', :dbi_args => ['dbi_args'])
         flexmock(ODBA.storage, 

diff --git a/ext/export/test/test_generics_xls.rb b/ext/export/test/test_generics_xls.rb
@@ -5,17 +5,16 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 $: << File.expand_path('../../..', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'spreadsheet'
 require 'generics_xls'
 require 'date'
 
 module ODDB
   module OdbaExporter
     class TestGenericXls <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @loggroup_swiss = LogGroup.new(:swissmedic_journal)
         @loggroup_swiss.create_log(Date.today)

diff --git a/ext/fiparse/test/fachinfo_pdf_test.rb b/ext/fiparse/test/fachinfo_pdf_test.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path("../src", File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require	'fachinfo_pdf'
 require "yaml"

diff --git a/ext/fiparse/test/fiparse_test.rb b/ext/fiparse/test/fiparse_test.rb
@@ -4,7 +4,7 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path("../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'fiparse'
 

diff --git a/ext/fiparse/test/indications_test.rb b/ext/fiparse/test/indications_test.rb
@@ -4,7 +4,7 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'indications'
 

diff --git a/ext/fiparse/test/test_fachinfo_hpricot.rb b/ext/fiparse/test/test_fachinfo_hpricot.rb
@@ -10,14 +10,14 @@
 $: << File.expand_path('../../../test', File.dirname(__FILE__))
 $: << File.expand_path('../../..', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'plugin/refdata'
 require 'fachinfo_hpricot'
 require 'fiparse'
 require 'plugin/text_info'
 require 'stub/cgi'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
 	class FachinfoDocument

diff --git a/ext/fiparse/test/test_fachinfo_writer.rb b/ext/fiparse/test/test_fachinfo_writer.rb
@@ -6,15 +6,14 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'fachinfo_writer'
 
 module ODDB
   module FiParse
     class TestFachinfoWriter <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @writer = ODDB::FiParse::FachinfoWriter.new
       end

diff --git a/ext/fiparse/test/test_fiwriter.rb b/ext/fiparse/test/test_fiwriter.rb
@@ -6,16 +6,15 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'fiwriter'
 
 module ODDB
   module FiParse
 
 class TestWriter <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @writer = ODDB::FiParse::Writer.new
   end

diff --git a/ext/fiparse/test/test_patinfo_hpricot.rb b/ext/fiparse/test/test_patinfo_hpricot.rb
@@ -10,9 +10,9 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 $: << File.expand_path('../../..', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'patinfo_hpricot'
 require 'plugin/text_info'
 $: << File.expand_path('../../../test', File.dirname(__FILE__))
@@ -21,7 +21,6 @@
 module ODDB
   module FiParse
 class TestPatinfoHpricot <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @writer = PatinfoHpricot.new
   end

diff --git a/ext/fiparse/test/test_pseudo_fachinfo.rb b/ext/fiparse/test/test_pseudo_fachinfo.rb
@@ -10,14 +10,14 @@
 $: << File.expand_path('../../../test', File.dirname(__FILE__))
 $: << File.expand_path('../../..', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'fachinfo_hpricot'
 require 'fiparse'
 require 'textinfo_pseudo_fachinfo'
 require 'plugin/text_info'
 require 'stub/cgi'
-require 'flexmock'
+require 'flexmock/minitest'
 
 module ODDB
   module FiParse

diff --git a/ext/fipdf/test/chapter_wrapper_test.rb b/ext/fipdf/test/chapter_wrapper_test.rb
@@ -3,7 +3,7 @@
 
 $: << File.expand_path('../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'chapter_wrapper'
 

diff --git a/ext/fipdf/test/fachinfo_wrapper_test.rb b/ext/fipdf/test/fachinfo_wrapper_test.rb
@@ -3,7 +3,7 @@
 
 $: << File.expand_path('../src', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'fachinfo_wrapper'
 require 'delegate'

diff --git a/ext/fipdf/test/fachinfo_writer_test.rb b/ext/fipdf/test/fachinfo_writer_test.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'fachinfo_writer'
 require 'model/text'

diff --git a/ext/fipdf/test/format_test.rb b/ext/fipdf/test/format_test.rb
@@ -3,7 +3,7 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'model/text'
 require 'format'

diff --git a/ext/fipdf/test/paragraph_wrapper_test.rb b/ext/fipdf/test/paragraph_wrapper_test.rb
@@ -4,7 +4,7 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'paragraph_wrapper'
 require 'model/text'

diff --git a/ext/fipdf/test/rules_test.rb b/ext/fipdf/test/rules_test.rb
@@ -4,7 +4,7 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'fachinfo_writer'
 require 'rules.rb'

diff --git a/ext/fipdf/test/section_wrapper_test.rb b/ext/fipdf/test/section_wrapper_test.rb
@@ -4,7 +4,7 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'section_wrapper'
 require 'model/text'

diff --git a/ext/fipdf/test/substance_index_test.rb b/ext/fipdf/test/substance_index_test.rb
@@ -3,7 +3,7 @@
 
 $: << File.expand_path("../src/", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require "substance_index"
 

diff --git a/ext/meddata/test/session_test.rb b/ext/meddata/test/session_test.rb
@@ -7,10 +7,10 @@
 	File.dirname(__FILE__))
 $: << File.expand_path("../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
 require 'meddata'
-require 'flexmock' 
+require 'flexmock/minitest' 
 
 module ODDB
 	module MedData

diff --git a/ext/meddata/test/test_drbsession.rb b/ext/meddata/test/test_drbsession.rb
@@ -4,9 +4,9 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 $: << File.expand_path("../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'meddparser'
 require 'drbsession'
 require 'result'
@@ -16,7 +16,6 @@ module ODDB
   module MedData
 
 class TestDRbSession <Minitest::Test
-  include FlexMock::TestCase
   def setup
     @drb = ODDB::MedData::DRbSession.new(:partner)
   end

diff --git a/ext/meddata/test/test_ean_factory.rb b/ext/meddata/test/test_ean_factory.rb
@@ -5,7 +5,7 @@
 $: << File.expand_path('../../../src', File.dirname(__FILE__))
 
 require 'ean_factory'
-gem 'minitest'
+
 require 'minitest/autorun'
 
 module ODDB

diff --git a/ext/meddata/test/test_meddata.rb b/ext/meddata/test/test_meddata.rb
@@ -6,14 +6,13 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 $: << File.expand_path("../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'meddata'
 
 module ODDB
 	class TestMedData <Minitest::Test
-    include FlexMock::TestCase
 		def test__dispatch
 			str = MedData::Result
 			instance = str.new('bar', 'baz')

diff --git a/ext/meddata/test/test_meddparser.rb b/ext/meddata/test/test_meddparser.rb
@@ -4,15 +4,14 @@
 $: << File.expand_path("../../../src", File.dirname(__FILE__))
 $: << File.expand_path("../src", File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'meddparser'
 
 module ODDB
   module MedData
     class TestFormatter <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @writer    = flexmock('writer')
         @formatter = ODDB::MedData::Formatter.new(@writer)
@@ -24,7 +23,6 @@ def test_push_tablecell
       end
     end
     class TestResultWriter <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @writer = ODDB::MedData::ResultWriter.new
       end
@@ -58,7 +56,6 @@ def test_send_flowing_data
       end
     end
     class TestDetailWriter <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @writer = ODDB::MedData::DetailWriter.new
       end

diff --git a/ext/meddata/test/test_result.rb b/ext/meddata/test/test_result.rb
@@ -4,7 +4,7 @@
 $: << File.expand_path('../src', File.dirname(__FILE__))
 
 require 'result'
-gem 'minitest'
+
 require 'minitest/autorun'
 
 module ODDB

diff --git a/ext/meddata/test/test_session.rb b/ext/meddata/test/test_session.rb
@@ -3,9 +3,9 @@
 
 $: << File.expand_path('../..', File.dirname(__FILE__))
 
-gem 'minitest'
+
 require 'minitest/autorun'
-require 'flexmock'
+require 'flexmock/minitest'
 require 'meddata/src/session'
 
 module ODDB
@@ -21,7 +21,6 @@ def get(arg)
 module ODDB
   module MedData
     class TestSession <Minitest::Test
-      include FlexMock::TestCase
       def setup
         @response = flexmock('response') do |r|
           r.should_receive(:[]).with('set-cookie').and_return('cookie_header')
@@ -162,7 +161,6 @@ def test_detail_html
     end
 
     class TestSessionException <Minitest::Test
-      include FlexMock::TestCase
 
       def stdout_null
         require 'tempfile'