spec/spec_helper.rb in hydra-derivatives-3.1.3 vs spec/spec_helper.rb in hydra-derivatives-3.1.4

- old
+ new

@@ -1,9 +1,9 @@ ENV['environment'] ||= 'test' # - RSpec adds ./lib to the $LOAD_PATH require 'hydra/derivatives' -#Resque.inline = Rails.env.test? +# Resque.inline = Rails.env.test? require 'byebug' unless ENV['TRAVIS'] require 'active_fedora/cleaner' ActiveFedora::Base.logger = Logger.new(STDOUT) RSpec.configure do |config| @@ -17,10 +17,12 @@ require 'mime-types' dng_format = MIME::Type.new('image/x-adobe-dng') dng_format.extensions = 'dng' MIME::Types.add(dng_format) -$in_travis = !ENV['TRAVIS'].nil? && ENV['TRAVIS'] == 'true' - def fixture_path File.expand_path("../fixtures", __FILE__) +end + +def in_travis? + !ENV['TRAVIS'].nil? && ENV['TRAVIS'] == 'true' end