diff --git a/.github/workflows/foreman.yml b/.github/workflows/foreman.yml index 38cc1f8433d4..de48a9c7227f 100644 --- a/.github/workflows/foreman.yml +++ b/.github/workflows/foreman.yml @@ -8,7 +8,7 @@ env: RAILS_ENV: test DATABASE_URL: postgresql://postgres:password@localhost/test DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: true - BUNDLE_WITHOUT: "console:development:journald:libvirt" + BUNDLE_WITHOUT: "console:development:journald" jobs: test: @@ -31,7 +31,7 @@ jobs: - "12" steps: - run: sudo apt-get update - - run: sudo apt-get install build-essential libcurl4-openssl-dev zlib1g-dev libpq-dev + - run: sudo apt-get install build-essential libcurl4-openssl-dev zlib1g-dev libpq-dev libvirt-dev - name: "Check out Foreman develop" uses: actions/checkout@v4 with: diff --git a/app/models/host.rb b/app/models/host.rb index 12d7d98593ee..5c71a671f2d1 100644 --- a/app/models/host.rb +++ b/app/models/host.rb @@ -12,7 +12,11 @@ def self.method_missing(method, *args, &block) end end if type.constantize.respond_to?(method, true) - type.constantize.send(method, *args, &block) + if method.to_s =~ /\Afind_in_(.*)\Z/ && args.size == 1 && args[0].is_a?(Hash) + type.constantize.send(method, **args[0], &block) + else + type.constantize.send(method, *args, &block) + end else super end diff --git a/db/migrate/20150525081931_remove_duplicate_tokens.rb b/db/migrate/20150525081931_remove_duplicate_tokens.rb index a43edd20fc8f..29efabcfee13 100644 --- a/db/migrate/20150525081931_remove_duplicate_tokens.rb +++ b/db/migrate/20150525081931_remove_duplicate_tokens.rb @@ -1,15 +1,15 @@ class RemoveDuplicateTokens < ActiveRecord::Migration[4.2] def up - remove_foreign_key :tokens, :column => :host_id if foreign_key_exists?(:tokens, { :name => "tokens_host_id_fk" }) + remove_foreign_key :tokens, :column => :host_id if foreign_key_exists?(:tokens, name: "tokens_host_id_fk") remove_index :tokens, :host_id if index_exists? :tokens, :host_id add_index :tokens, :host_id, :unique => true - add_foreign_key :tokens, :hosts, :name => "tokens_host_id_fk" unless foreign_key_exists?(:tokens, { :name => "tokens_host_id_fk" }) + add_foreign_key :tokens, :hosts, :name => "tokens_host_id_fk" unless foreign_key_exists?(:tokens, name: "tokens_host_id_fk") end def down - remove_foreign_key :tokens, :column => :host_id if foreign_key_exists?(:tokens, { :name => "tokens_host_id_fk" }) + remove_foreign_key :tokens, :column => :host_id if foreign_key_exists?(:tokens, name: "tokens_host_id_fk") remove_index :tokens, :host_id if index_exists? :tokens, :host_id add_index :tokens, :host_id - add_foreign_key :tokens, :hosts, :name => "tokens_host_id_fk" unless foreign_key_exists?(:tokens, { :name => "tokens_host_id_fk" }) + add_foreign_key :tokens, :hosts, :name => "tokens_host_id_fk" unless foreign_key_exists?(:tokens, name: "tokens_host_id_fk") end end diff --git a/db/migrate/20180613100703_add_type_to_token.rb b/db/migrate/20180613100703_add_type_to_token.rb index 1f1e7901c63c..953ea271d0e6 100644 --- a/db/migrate/20180613100703_add_type_to_token.rb +++ b/db/migrate/20180613100703_add_type_to_token.rb @@ -1,9 +1,9 @@ class AddTypeToToken < ActiveRecord::Migration[5.1] def up - remove_foreign_key :tokens, :column => :host_id if foreign_key_exists?(:tokens, { :name => "tokens_host_id_fk" }) + remove_foreign_key :tokens, :column => :host_id if foreign_key_exists?(:tokens, name: "tokens_host_id_fk") remove_index :tokens, :host_id if index_exists? :tokens, :host_id # was unique add_index :tokens, :host_id - add_foreign_key :tokens, :hosts, :name => "tokens_host_id_fk" unless foreign_key_exists?(:tokens, { :name => "tokens_host_id_fk" }) + add_foreign_key :tokens, :hosts, :name => "tokens_host_id_fk" unless foreign_key_exists?(:tokens, name: "tokens_host_id_fk") add_column :tokens, :type, :string, default: 'Token::Build', null: false, index: true change_column :tokens, :value, :text end @@ -11,9 +11,9 @@ def up def down change_column :tokens, :value, :string, limit: 255 remove_column :tokens, :type - remove_foreign_key :tokens, :column => :host_id if foreign_key_exists?(:tokens, { :name => "tokens_host_id_fk" }) + remove_foreign_key :tokens, :column => :host_id if foreign_key_exists?(:tokens, name: "tokens_host_id_fk") remove_index :tokens, :host_id if index_exists? :tokens, :host_id add_index :tokens, :host_id, :unique => true - add_foreign_key :tokens, :hosts, :name => "tokens_host_id_fk" unless foreign_key_exists?(:tokens, { :name => "tokens_host_id_fk" }) + add_foreign_key :tokens, :hosts, :name => "tokens_host_id_fk" unless foreign_key_exists?(:tokens, name: "tokens_host_id_fk") end end diff --git a/test/controllers/home_controller_test.rb b/test/controllers/home_controller_test.rb index 75ce9c9d2098..d61724e93e8f 100644 --- a/test/controllers/home_controller_test.rb +++ b/test/controllers/home_controller_test.rb @@ -2,7 +2,7 @@ class HomeControllerTest < ActionController::TestCase test "should get status without an error" do - get :status, {:format => "json"} + get :status, :format => "json" assert_response :success end end diff --git a/test/models/lookup_key_test.rb b/test/models/lookup_key_test.rb index d236677b098c..9b336df7c2ae 100644 --- a/test/models/lookup_key_test.rb +++ b/test/models/lookup_key_test.rb @@ -218,10 +218,10 @@ class LookupKeyTest < ActiveSupport::TestCase :sc_type => 'hash', :value => 'a:test', }, - { - :sc_type => 'yaml', - :value => '{a:test}', - }, + # { + # :sc_type => 'yaml', + # :value => '{a:test}', # TODO: update test; apparently starting Ruby 2.7.8 this won't raise an Psych::SyntaxError. Apparently YAML/parser allows that. PKM (: + # }, { :sc_type => 'json', :value => RFauxFactory.gen_alpha,