Fixes building the plugin only for Ruby 2.7.

Updates the testing library.
Set specific gem versions.

Author: martencassel

.github/workflows/ci.yml

@@ -11,8 +11,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - "2.5"
-          - "2.6"
           - "2.7"
     name: Ruby ${{ matrix.ruby }}
     steps:

Dockerfile

@@ -0,0 +1,6 @@
+FROM ruby:2.7
+RUN apt update -y && apt install libkrb5-dev libldap-dev libsasl2-dev -y && \
+    gem install bundler -v 2.4.22
+COPY . /src
+WORKDIR /src
+RUN bundle install

Gemfile

@@ -2,11 +2,9 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  if RUBY_VERSION < '2.2.2'
-    gem 'rack-test', '~> 0.7.0'
-  else
-    gem 'rack-test'
-  end
-
+  gem 'rack-test'
+  gem 'minitest'
+  gem 'mocha'
   gem 'smart_proxy', :git => 'https://github.com/theforeman/smart-proxy.git', :branch => 'develop'
+  gem 'minitest-reporters', '~> 1.7.1'
 end

Makefile

@@ -0,0 +1,7 @@
+ruby-2.7:
+	docker build --no-cache=true -t dev:ruby-2.7 .
+	docker run -it dev:ruby-2.7 /bin/bash
+
+.PHONY: test
+test:
+	bundle exec rake test

Rakefile

@@ -11,4 +11,4 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.test_files = FileList['test/**/*_test.rb']
   t.verbose = true
-end
+end

lib/smart_proxy_realm_ad/provider.rb

@@ -103,7 +103,7 @@ def radcli_join(hostfqdn, computername, password)
       enroll = setup_enroll(hostfqdn, computername, password)
       begin
         enroll.join
-        logger.info "Successfully joined computer #{computername} with FQDN #{hostfqdn}")
+        logger.info "Successfully joined computer #{computername} with FQDN #{hostfqdn}"
         true
       rescue RuntimeError => ex
         handle_runtime_error(ex, enroll)

smart_proxy_realm_ad_plugin.gemspec

@@ -6,6 +6,8 @@ Gem::Specification.new do |s|
   s.version     = Proxy::AdRealm::VERSION
   s.date        = Date.today.to_s
   s.license     = 'GPL-3.0'
+  s.required_ruby_version = '>= 2.7'
+
   s.authors     = ['Mårten Cassel']
   s.email       = ['marten.cassel@gmail.com']
   s.homepage    = 'https://github.com/theforeman/smart_proxy_realm_ad_plugin'
@@ -16,9 +18,10 @@ Gem::Specification.new do |s|
   s.files       = Dir['{config,lib,bundler.d}/**/*'] + ['README.md', 'LICENSE']
   s.test_files  = Dir['test/**/*']
 
-  s.add_development_dependency('rake')
-  s.add_development_dependency('mocha')
-  s.add_development_dependency('test-unit')
-  s.add_dependency('rkerberos')
-  s.add_dependency('radcli')
+  s.add_development_dependency('rake', '~> 13.2.1')
+  s.add_development_dependency('mocha', '~> 2.7.1')
+  s.add_development_dependency('minitest', '~> 5.25.4')
+  s.add_development_dependency('test-unit', '~> 3.6.7')
+  s.add_dependency('rkerberos', '~> 0.1.5')
+  s.add_dependency('radcli', '~> 1.1.0')
 end

test/ad_provider_test.rb

@@ -3,7 +3,7 @@
 require 'smart_proxy_realm_ad/provider'
 require 'radcli'
 
-class RealmAdTest < Test::Unit::TestCase
+class RealmAdTest < Minitest::Test
   def setup
     @realm = 'test_realm'
     @provider = Proxy::AdRealm::Provider.new(
@@ -72,7 +72,7 @@ def test_rebuild_host_returns_password
   end
 
   def test_generate_password_returns_random_passwords
-    assert_not_equal @provider.generate_password, @provider.generate_password
+    refute_equal @provider.generate_password, @provider.generate_password
   end
 
   def test_generate_password_returns_20_char_long_password
@@ -81,22 +81,22 @@ def test_generate_password_returns_20_char_long_password
 
   def test_apply_computername_prefix_should_return_false_when_prefix_is_nil
     provider = Proxy::AdRealm::Provider.new(computername_prefix: nil, realm: 'example.com')
-    assert_false provider.apply_computername_prefix?('host.example.com')
+    refute provider.apply_computername_prefix?('host.example.com')
   end
 
   def test_apply_computername_prefix_should_return_false_when_prefix_is_empty
     provider = Proxy::AdRealm::Provider.new(computername_prefix: '', realm: 'example.com')
-    assert_false provider.apply_computername_prefix?('host.example.com')
+    refute provider.apply_computername_prefix?('host.example.com')
   end
 
   def test_apply_computername_prefix_should_return_false_when_hostname_contains_prefix
     provider = Proxy::AdRealm::Provider.new(computername_prefix: 'PREFIX-', realm: 'example.com')
-    assert_false provider.apply_computername_prefix?('prefix-host.example.com')
+    refute provider.apply_computername_prefix?('prefix-host.example.com')
   end
 
   def test_apply_computername_prefix_should_return_true_when_computername_hash_is_used
     provider = Proxy::AdRealm::Provider.new(computername_prefix: 'PREFIX-', computername_hash: true, realm: 'example.com')
-    assert_true provider.apply_computername_prefix?('host.example.com')
+    assert provider.apply_computername_prefix?('host.example.com')
   end
 
   def test_hostfqdn_to_computername_uses_prefix
@@ -119,7 +119,7 @@ def test_unrecognized_realm_raises_exception
   end
 
   def test_find
-    assert_true @provider.find('a_host_fqdn')
+    assert @provider.find('a_host_fqdn')
   end
 
   def test_delete

test/internal_api_test.rb

@@ -15,7 +15,7 @@ def container_instance; end
 
 require 'realm/realm_api'
 
-class InternalApiTest < Test::Unit::TestCase
+class InternalApiTest < Minitest::Test
   include Rack::Test::Methods
 
   def app

test/test_helper.rb

@@ -1,7 +1,11 @@
 require 'test/unit'
-require 'mocha/setup'
+require 'minitest/autorun'
+require 'mocha/minitest'
+require 'minitest/reporters'
+
+Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 
 require 'smart_proxy_for_testing'
 
 # create log directory in our (not smart-proxy) directory
-FileUtils.mkdir_p File.dirname(Proxy::SETTINGS.log_file)
+FileUtils.mkdir_p File.dirname(Proxy::SETTINGS.log_file)