foreman_setup 5.0.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 490654bc557051d61752f5245a69a2c2d3b0c077
-  data.tar.gz: d5ba8f8ba082ecc4f10ed8f09229bd8e7b59b1f3
+  metadata.gz: 265e5e20854aca25723e6d136a77872a9403e619
+  data.tar.gz: 826ed0175831b84322318168f697db596826da52
 SHA512:
-  metadata.gz: bb3856fb4f5da2a16cc77dbc21d1fc8d46d2357d95880b6917aaa21f0190b2c0f52b44d9251556eefc66d852aa94dae89a9b7e1b376230e4579fb8723d00d353
-  data.tar.gz: cf09e5f85600f03e33e578c5471f7049dc75cefb3f5d706f46575d95df3092789e581d0e8d245e1f7958b4c0b8294afde01654d8bb1d14b21e86969443386df8
+  metadata.gz: b943cc4e4845b66fee1f77200f6d1d8f13706ccad09daef25e87bf00b2f91858c5f3e09a3045ec68a6be6e6b2afea214bf1e42bd4f49c4a6fb8c729281b92f81
+  data.tar.gz: 5e9a61714ac9562814ffebf561ff8ab3e5fc9f925ce96e2ec4d89a803f99ad99dc5a4736997961aef8859a5b17aa056047eecc9c97a12604a5cf4919aa6d11e7

data/CHANGES.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v6.0.0
+* fix Foreman 1.17 compatibility with Rails 5
+
 ## v5.0.1
 * use case-insensitive OS family comparisons
 * change Katello installer commands

data/README.md

@@ -25,6 +25,7 @@ RPM users can install the "tfm-rubygem-foreman_setup" or
 | >= 1.9          | ~> 3.0         |
 | >= 1.12         | ~> 4.0         |
 | >= 1.13         | ~> 5.0         |
+| >= 1.17         | ~> 6.0         |
 
 # Areas this should help
 

data/app/controllers/foreman_setup/provisioners_controller.rb

@@ -7,8 +7,8 @@ module ForemanSetup
     include Foreman::Controller::Parameters::Subnet
     include Foreman::Renderer
 
-    before_filter :find_myself, :only => [:new, :create]
-    before_filter :find_resource, :except => [:index, :new, :create]
+    before_action :find_myself, :only => [:new, :create]
+    before_action :find_resource, :except => [:index, :new, :create]
 
     def index
       @provisioners = Provisioner.all.paginate :page => params[:page]

data/app/models/foreman_setup/provisioner.rb

@@ -1,7 +1,7 @@
 require 'ipaddr'
 
 module ForemanSetup
-  class Provisioner < ActiveRecord::Base
+  class Provisioner < ApplicationRecord
     include ::Authorizable
     include ::Host::Hostmix
 

data/db/migrate/20131023140100_add_provisioners.rb

@@ -1,4 +1,4 @@
-class AddProvisioners < ActiveRecord::Migration
+class AddProvisioners < ActiveRecord::Migration[4.2]
   def change
     create_table :setup_provisioners do |t|
       t.integer :host_id

data/db/migrate/20131025180600_add_provisioners_hostgroup.rb

@@ -1,4 +1,4 @@
-class AddProvisionersHostgroup < ActiveRecord::Migration
+class AddProvisionersHostgroup < ActiveRecord::Migration[4.2]
   def change
     add_column :setup_provisioners, :hostgroup_id, :integer
   end

data/db/migrate/20131028161000_add_provisioners_domain.rb

@@ -1,4 +1,4 @@
-class AddProvisionersDomain < ActiveRecord::Migration
+class AddProvisionersDomain < ActiveRecord::Migration[4.2]
   def change
     add_column :setup_provisioners, :domain_id, :integer
   end

data/db/migrate/20140305165000_update_foreman_setup_permissions.rb

@@ -1,4 +1,4 @@
-class UpdateForemanSetupPermissions < ActiveRecord::Migration
+class UpdateForemanSetupPermissions < ActiveRecord::Migration[4.2]
   def self.up
     old_permission = ::Permission.where(:name => "edit_provisioning", :resource_type => nil).first
     new_permission = ::Permission.where(:name => "edit_provisioning", :resource_type => "ForemanSetup::Provisioner").first

data/lib/foreman_setup/engine.rb

@@ -16,7 +16,7 @@ module ForemanSetup
 
     initializer 'foreman_setup.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_setup do
-        requires_foreman '>= 1.13.0'
+        requires_foreman '>= 1.17.0'
 
         menu :top_menu, :provisioners, :url_hash => {:controller=> :'foreman_setup/provisioners', :action=>:index},
                  :caption=> N_('Provisioning setup'),

data/lib/foreman_setup/version.rb

@@ -1,3 +1,3 @@
 module ForemanSetup
-  VERSION = '5.0.1'
+  VERSION = '6.0.0'
 end

data/test/factories/provisioners.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :setup_provisioner, :class => ForemanSetup::Provisioner do
     host do
-      association :host, :with_puppet_orchestration, :domain => FactoryGirl.create(:domain)
+      association :host, :with_puppet_orchestration, :domain => FactoryBot.create(:domain)
     end
     smart_proxy { association :smart_proxy, :url => "https://#{host.name}:8443" }
 
@@ -9,17 +9,17 @@ FactoryGirl.define do
     trait :step1 do
       provision_interface 'eth0'
       after(:create) do |prov, evaluator|
-        fact = FactoryGirl.create(:fact_name, :name => "ipaddress_#{prov.provision_interface}")
-        FactoryGirl.create(:fact_value, :fact_name => fact, :host => prov.host, :value => '192.168.1.20')
+        fact = FactoryBot.create(:fact_name, :name => "ipaddress_#{prov.provision_interface}")
+        FactoryBot.create(:fact_value, :fact_name => fact, :host => prov.host, :value => '192.168.1.20')
 
-        fact = FactoryGirl.create(:fact_name, :name => "network_#{prov.provision_interface}")
-        FactoryGirl.create(:fact_value, :fact_name => fact, :host => prov.host, :value => '192.168.1.0')
+        fact = FactoryBot.create(:fact_name, :name => "network_#{prov.provision_interface}")
+        FactoryBot.create(:fact_value, :fact_name => fact, :host => prov.host, :value => '192.168.1.0')
 
-        fact = FactoryGirl.create(:fact_name, :name => "netmask_#{prov.provision_interface}")
-        FactoryGirl.create(:fact_value, :fact_name => fact, :host => prov.host, :value => '255.255.255.0')
+        fact = FactoryBot.create(:fact_name, :name => "netmask_#{prov.provision_interface}")
+        FactoryBot.create(:fact_value, :fact_name => fact, :host => prov.host, :value => '255.255.255.0')
 
-        fact = FactoryGirl.create(:fact_name, :name => 'interfaces')
-        FactoryGirl.create(:fact_value, :fact_name => fact, :host => prov.host, :value => 'lo,eth0,eth1')
+        fact = FactoryBot.create(:fact_name, :name => 'interfaces')
+        FactoryBot.create(:fact_value, :fact_name => fact, :host => prov.host, :value => 'lo,eth0,eth1')
       end
     end
 

data/test/functional/foreman_setup/provisioners_controller_test.rb

@@ -2,26 +2,26 @@ require 'test_plugin_helper'
 
 class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
   test '#index without provisioner' do
-    get :index, {}, set_session_user
+    get :index, headers: set_session_user
     assert_redirected_to new_foreman_setup_provisioner_path
   end
 
   test '#index with provisioner' do
-    FactoryGirl.create :setup_provisioner
-    get :index, {}, set_session_user
+    FactoryBot.create :setup_provisioner
+    get :index, session: set_session_user
     assert_response :success
     assert_template 'foreman_setup/provisioners/index'
   end
 
   context 'pre-creation' do
     setup do
-      @host = FactoryGirl.create(:host, :domain => FactoryGirl.create(:domain))
+      @host = FactoryBot.create(:host, :domain => FactoryBot.create(:domain))
       Facter.expects(:value).with(:fqdn).returns(@host.name).at_least_once
-      @proxy = FactoryGirl.create(:smart_proxy, :url => "https://#{@host.name}:8443")
+      @proxy = FactoryBot.create(:smart_proxy, :url => "https://#{@host.name}:8443")
     end
 
     test '#new' do
-      get :new, {}, set_session_user
+      get :new, session: set_session_user
       assert_response :success
       assert_equal @host, assigns(:host)
       assert_equal @proxy, assigns(:proxy)
@@ -29,7 +29,7 @@ class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
     end
 
     test '#create success' do
-      post :create, {'foreman_setup_provisioner' => {:host_id => @host.id, :smart_proxy_id => @proxy.id, :provision_interface => 'eth0'}}, set_session_user
+      post :create, params: { 'foreman_setup_provisioner' => {:host_id => @host.id, :smart_proxy_id => @proxy.id, :provision_interface => 'eth0'} }, session: set_session_user
 
       prov = ForemanSetup::Provisioner.find_by_host_id(@host.id)
       assert prov
@@ -43,7 +43,7 @@ class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
     end
 
     test '#create failure' do
-      post :create, {}, set_session_user
+      post :create, session: set_session_user
       assert_equal @host, assigns(:host)
       assert_equal @proxy, assigns(:proxy)
       assert_template 'foreman_setup/provisioners/_step1'
@@ -51,8 +51,8 @@ class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
   end
 
   test '#step2 with new subnet' do
-    prov = FactoryGirl.create(:setup_provisioner, :step1)
-    get :step2, {:id => prov.id}, set_session_user
+    prov = FactoryBot.create(:setup_provisioner, :step1)
+    get :step2, params: { :id => prov.id }, session: set_session_user
     assert_response :success
     assert_template 'foreman_setup/provisioners/_step2'
 
@@ -65,10 +65,10 @@ class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
   end
 
   test '#step2_update' do
-    prov = FactoryGirl.create(:setup_provisioner, :step1)
+    prov = FactoryBot.create(:setup_provisioner, :step1)
     Facter.expects(:value).with(:fqdn).returns(prov.host.name).at_least_once
 
-    put :step2_update, {:id => prov.id, 'foreman_setup_provisioner' => {:subnet_attributes => {'name' => 'test', :network => '192.168.1.0', :mask => '255.255.255.0'}, :domain_name => prov.host.domain.name}}, set_session_user
+    put :step2_update, params: { :id => prov.id, 'foreman_setup_provisioner' => {:subnet_attributes => {'name' => 'test', :network => '192.168.1.0', :mask => '255.255.255.0'}, :domain_name => prov.host.domain.name} }, session: set_session_user
     assert_redirected_to step3_foreman_setup_provisioner_path(prov)
 
     as_admin do
@@ -93,14 +93,14 @@ class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
   end
 
   test '#step3' do
-    prov = FactoryGirl.create(:setup_provisioner, :step2)
-    get :step3, {:id => prov.id}, set_session_user
+    prov = FactoryBot.create(:setup_provisioner, :step2)
+    get :step3, params: { :id => prov.id }, session: set_session_user
     assert_response :success
     assert_template 'foreman_setup/provisioners/_step3'
   end
 
   test '#step4' do
-    prov = FactoryGirl.create(:setup_provisioner, :step2)
+    prov = FactoryBot.create(:setup_provisioner, :step2)
 
     SmartProxy.any_instance.expects(:refresh)
     prov.smart_proxy.features = Feature.where(:name => ['DNS', 'DHCP', 'TFTP'])
@@ -108,7 +108,7 @@ class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
 
     ProvisioningTemplate.expects(:build_pxe_default).returns(200, 'Sucess')
 
-    get :step4, {:id => prov.id}, set_session_user
+    get :step4, params: { :id => prov.id }, session: set_session_user
     assert_response :success
     assert_template 'foreman_setup/provisioners/_step4'
     assert assigns(:medium)
@@ -125,13 +125,13 @@ class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
   end
 
   test '#step4_update' do
-    prov = FactoryGirl.create(:setup_provisioner, :step2)
+    prov = FactoryBot.create(:setup_provisioner, :step2)
 
     attrs = {
       :hostgroup_attributes => {},
       :create_medium => {:name => 'test', :path => 'http://mirror.example.com'},
     }
-    put :step4_update, {:id => prov.id, 'foreman_setup_provisioner' => attrs}, set_session_user
+    put :step4_update, params: { :id => prov.id, 'foreman_setup_provisioner' => attrs }, session: set_session_user
     assert_redirected_to step5_foreman_setup_provisioner_path(prov)
 
     as_admin do
@@ -148,8 +148,8 @@ class ForemanSetup::ProvisionersControllerTest < ActionController::TestCase
   end
 
   test '#step5' do
-    prov = FactoryGirl.create(:setup_provisioner, :step2)
-    get :step5, {:id => prov.id}, set_session_user
+    prov = FactoryBot.create(:setup_provisioner, :step2)
+    get :step5, params: { :id => prov.id }, session: set_session_user
     assert_response :success
     assert_template 'foreman_setup/provisioners/_step5'
   end

data/test/test_plugin_helper.rb

@@ -1,6 +1,6 @@
 # This calls the main test_helper in Foreman core
 require 'test_helper'
 
-# Add plugin to FactoryGirl's paths
-FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
-FactoryGirl.reload
+# Add plugin to FactoryBot's paths
+FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
+FactoryBot.reload

data/test/unit/foreman_setup/provisioner_test.rb

@@ -2,12 +2,12 @@ require 'test_helper'
 
 class ForemanSetupProvisionerTest < ActiveSupport::TestCase
   test '#interfaces returns hash' do
-    prov = FactoryGirl.create(:setup_provisioner, :step1)
+    prov = FactoryBot.create(:setup_provisioner, :step1)
     assert_equal({'eth0' => {:ip => '192.168.1.20', :mask => '255.255.255.0', :network => '192.168.1.0', :cidr => '192.168.1.0/24'}}, prov.interfaces)
   end
 
   test '#provision_interface_data returns hash' do
-    prov = FactoryGirl.create(:setup_provisioner, :step1)
+    prov = FactoryBot.create(:setup_provisioner, :step1)
     assert_equal({:ip => '192.168.1.20', :mask => '255.255.255.0', :network => '192.168.1.0', :cidr => '192.168.1.0/24'}, prov.provision_interface_data)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_setup
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-15 00:00:00.000000000 Z
+date: 2017-12-26 00:00:00.000000000 Z
 dependencies: []
 description: Plugin for Foreman that helps set up provisioning.
 email: dcleal@redhat.com