diff --git a/.travis.yml b/.travis.yml index c8f45bff7..aa434f4dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,3 +21,4 @@ addons: - zlib1g-dev - liblzma-dev - libcurl4-openssl-dev + diff --git a/Gemfile b/Gemfile index bfea88ee6..ac948cae7 100644 --- a/Gemfile +++ b/Gemfile @@ -77,19 +77,6 @@ end # For running unit tests group :test do - - if defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby" - module Kernel - alias :_at_exit :at_exit - def at_exit(&block) - _at_exit do - exit_status = $!.status if $!.is_a?(SystemExit) - block.call - exit exit_status if exit_status - end - end - end - end if ENV['BEEF_TEST'] gem 'test-unit' gem 'test-unit-full' diff --git a/config.yaml b/config.yaml index 34584fd2d..d79087c6a 100644 --- a/config.yaml +++ b/config.yaml @@ -18,7 +18,7 @@ beef: # Used by both the RESTful API and the Admin interface credentials: user: "beef" - passwd: "beeF" + passwd: "beef" # Interface / IP restrictions restrictions: