Merge branch 'test/gitlab' into 'master'

Run tests on gitlab



See merge request !1

3 files changed, 31 insertions, 2 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..14e56a7
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,27 @@
+# This file is a template, and might need editing before it works on your project.
+# Official language image. Look for the different tagged releases at:
+# https://hub.docker.com/r/library/ruby/tags/
+image: "ruby:2.3"
+
+# Pick zero or more services to be used on all builds.
+# Only needed when using a docker container to run your tests in.
+# Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-service
+services:
+  - couchdb:1.6.1
+
+# Cache gems in between builds
+cache:
+  paths:
+    - vendor/
+
+# This is a basic example for a gem or script which doesn't use
+# services such as redis or postgres
+before_script:
+  - ruby -v
+  - curl -s couchdb:5984
+  - gem install bundler  --no-ri --no-rdoc
+  - bundle install -j $(nproc) --path vendor
+
+test:
+  script:
+  - bundle exec rake test
diff --git a/lib/nickserver/adapters/celluloid_http.rb b/lib/nickserver/adapters/celluloid_http.rb
index d326b8a..44b6fe8 100644
--- a/lib/nickserver/adapters/celluloid_http.rb
+++ b/lib/nickserver/adapters/celluloid_http.rb
@@ -6,7 +6,9 @@ require 'http'
 
 module Nickserver::Adapters
   class CelluloidHttp
-    include Celluloid::IO
+    silence_warnings do
+      include Celluloid::IO
+    end
 
     def get(url, options = {})
       response = HTTP.get url,
diff --git a/test/unit/request_handler_test.rb b/test/unit/request_handler_test.rb
index 420e74b..6c7a036 100644
--- a/test/unit/request_handler_test.rb
+++ b/test/unit/request_handler_test.rb
@@ -25,7 +25,7 @@ class Nickserver::RequestHandlerTest < Minitest::Test
     Nickserver::Hkp::Source.stub :new, source do
       assert_response status: 200, content: "200 fake content"
     end
-   end
+  end
 
   def test_fingerprint_to_short
     handle fingerprint: ['44F2F455E28']