TEST_LIVE_API = false

require 'rubygems'
require 'test/unit'
require 'mocha/setup'

unless(TEST_LIVE_API)
  require 'webmock/test_unit'
  include WebMock::API
end

require_files = []
require_files << File.join(File.dirname(__FILE__), '..', 'lib', 'ruby-tmdb3.rb')
require_files.concat Dir[File.join(File.dirname(__FILE__), 'setup', '*.rb')]

require_files.each do |file|
  require File.expand_path(file)
end

#load(File.join('unit', 'test_direct_require.rb'), true)
system('ruby ' + File.expand_path(File.join(File.dirname(__FILE__), 'unit', 'test_direct_require.rb')))

TEST_LIVE_API = false

require 'rubygems'
require 'test/unit'
require 'mocha'

unless(TEST_LIVE_API)
  require 'webmock/test_unit'
  include WebMock::API
end

require_files = []
require_files << File.join(File.dirname(__FILE__), '..', 'lib', 'ruby-tmdb3.rb')
require_files.concat Dir[File.join(File.dirname(__FILE__), 'setup', '*.rb')]

require_files.each do |file|
  require File.expand_path(file)
end

#load(File.join('unit', 'test_direct_require.rb'), true)
system('ruby ' + File.expand_path(File.join(File.dirname(__FILE__), 'unit', 'test_direct_require.rb')))
--- 
+++ 
@@ -2,7 +2,7 @@
 
 require 'rubygems'
 require 'test/unit'
-require 'mocha'
+require 'mocha/setup'
 
 unless(TEST_LIVE_API)
   require 'webmock/test_unit'
Update mocha require statement to the new 'mocha/setup' file
