foreman_docker 3.2.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd1c67d97ef630b9eb968adff64763a36cfa5c51
-  data.tar.gz: c89e5b7cc99ede834019b2e5635d6fe54d4e284d
+  metadata.gz: e552869e1ab0cfde41332e6ab9717d5f13415d70
+  data.tar.gz: e00b20498e799f4b647ada00f7778b45b25bc230
 SHA512:
-  metadata.gz: 49ba4a4b2c15a5578648ab89da4a6f04a9deb53ea78da1a24c623776776a45504270747115817c5ef27f29a7e85b4f3c8120c6d72b6bed6b3d43e44f8afc9620
-  data.tar.gz: 9b3266a52e3e0b1b04204fc82703b749bed883aef9dd67d4db3257d7ab2e32bc5cf12f2263d05ededbbf81642bdfa429b155112026cf85eb78acfcf4cfd7edeb
+  metadata.gz: 6162d8977618e99eed69ff55308f00d1f1983288d5cadd801c6a3aeebb2f10aae1e48d1225568ea34d38bc4463dc0ab5efb58b35bf584a51a21b658cbd74bd99
+  data.tar.gz: 6121f40a5b10d66b9aafee7a498ed16966c9db755a695eeb0b71eb4b97a63801d4e276944dea02b49bfe7fa93bcc3a06a9f8b1189a7960ff74ad6384315597ae

data/.rubocop.yml

@@ -3,7 +3,8 @@ inherit_from:
   - .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.0
+  TargetRubyVersion: 2.2
+  TargetRailsVersion: 5.1
 
 Rails: # always run the rails cops
   Enabled: true

data/app/controllers/api/v2/containers_controller.rb

@@ -2,7 +2,7 @@
 module Api
   module V2
     class ContainersController < ::Api::V2::BaseController
-      before_filter :find_resource, :except => %w(index create)
+      before_action :find_resource, :except => %w(index create)
 
       resource_description do
         resource_id 'containers'
@@ -17,11 +17,9 @@ module Api
       param_group :search_and_pagination, ::Api::V2::BaseController
 
       def index
-        compute_resource_id = params[:compute_resource_id].tap do |id|
-          id.present? ? { :compute_resource_id => id } : nil
-        end
-        scoped = Container.where(compute_resource_id)
-        @containers = scoped.search_for(params[:search], :order => params[:order])
+        scope = resource_scope
+        scope = scope.where(:compute_resource => params[:compute_resource_id]) if params[:compute_resource_id].present?
+        @containers = scope.search_for(params[:search], :order => params[:order])
                       .paginate(:page => params[:page])
       end
 

data/app/controllers/api/v2/registries_controller.rb

@@ -2,7 +2,7 @@ module Api
   module V2
     class RegistriesController < ::Api::V2::BaseController
       include Foreman::Controller::Parameters::DockerRegistry
-      before_filter :find_resource, :except => %w(index create)
+      before_action :find_resource, :except => %w(index create)
 
       resource_description do
         resource_id 'registries'

data/app/controllers/containers/steps_controller.rb

@@ -5,9 +5,9 @@ module Containers
 
     steps :preliminary, :image, :configuration, :environment
 
-    before_filter :find_state
-    before_filter :build_state, :only => [:update]
-    before_filter :set_form, :only => [:show]
+    before_action :find_state
+    before_action :build_state, :only => [:update]
+    before_action :set_form, :only => [:show]
 
     def show
       @container_resources = allowed_resources if step == :preliminary

data/app/controllers/containers_controller.rb

@@ -1,7 +1,7 @@
 class ContainersController < ::ApplicationController
   include ForemanDocker::FindContainer
 
-  before_filter :find_container, :only => [:show, :commit, :power]
+  before_action :find_container, :only => [:show, :commit, :power]
 
   def index
     @container_resources = allowed_resources
@@ -100,7 +100,7 @@ class ContainersController < ::ApplicationController
 
   def container_deletion
     # TODO: Refactor to recognize params[:compute_resource_id] as well.
-    compute_resource_id = params[:compute_resource_id].tap { |id| id.present? ? id : nil }
+    compute_resource_id = params[:compute_resource_id].present? ? params[:compute_resource_id] : nil
     if compute_resource_id
       container_uuid = params[:id]
       @container ||= Container.authorized("#{action_permission}_#{controller_name}".to_sym).find_by_uuid(container_uuid)

data/app/controllers/registries_controller.rb

@@ -1,7 +1,7 @@
 class RegistriesController < ::ApplicationController
   include Foreman::Controller::AutoCompleteSearch
   include Foreman::Controller::Parameters::DockerRegistry
-  before_filter :find_registry, :only => [:edit, :update, :destroy]
+  before_action :find_registry, :only => [:edit, :update, :destroy]
 
   def index
     @registries = DockerRegistry.search_for(params[:search], :order => params[:order])

data/app/models/container.rb

@@ -1,4 +1,4 @@
-class Container < ActiveRecord::Base
+class Container < ApplicationRecord
   include Authorizable
   include Taxonomix
 

data/app/models/docker_container_wizard_state.rb

@@ -1,4 +1,4 @@
-class DockerContainerWizardState < ActiveRecord::Base
+class DockerContainerWizardState < ApplicationRecord
   has_one :preliminary, :class_name => DockerContainerWizardStates::Preliminary,
                         :dependent => :destroy, :validate => true, :autosave => true
   has_one :image, :class_name => DockerContainerWizardStates::Image,

data/app/models/docker_container_wizard_states/configuration.rb

@@ -1,5 +1,5 @@
 module DockerContainerWizardStates
-  class Configuration < ActiveRecord::Base
+  class Configuration < ApplicationRecord
     self.table_name_prefix = 'docker_container_wizard_states_'
     belongs_to :wizard_state, :class_name => DockerContainerWizardState,
                               :foreign_key => :docker_container_wizard_state_id

data/app/models/docker_container_wizard_states/environment.rb

@@ -1,5 +1,5 @@
 module DockerContainerWizardStates
-  class Environment < ActiveRecord::Base
+  class Environment < ApplicationRecord
     self.table_name_prefix = 'docker_container_wizard_states_'
     belongs_to :wizard_state, :class_name => DockerContainerWizardState
 

data/app/models/docker_container_wizard_states/image.rb

@@ -1,5 +1,5 @@
 module DockerContainerWizardStates
-  class Image < ActiveRecord::Base
+  class Image < ApplicationRecord
     self.table_name_prefix = 'docker_container_wizard_states_'
     belongs_to :wizard_state, :class_name => DockerContainerWizardState,
                               :foreign_key => :docker_container_wizard_state_id

data/app/models/docker_container_wizard_states/preliminary.rb

@@ -1,5 +1,5 @@
 module DockerContainerWizardStates
-  class Preliminary < ActiveRecord::Base
+  class Preliminary < ApplicationRecord
     include Taxonomix
 
     self.table_name_prefix = 'docker_container_wizard_states_'

data/app/models/docker_parameter.rb

@@ -1,4 +1,4 @@
-class DockerParameter < ActiveRecord::Base
+class DockerParameter < ApplicationRecord
   extend FriendlyId
   friendly_id :key
   include Parameterizable::ByIdName

data/app/models/docker_registry.rb

@@ -1,4 +1,4 @@
-class DockerRegistry < ActiveRecord::Base
+class DockerRegistry < ApplicationRecord
   include Authorizable
   include Taxonomix
   include Encryptable

data/app/models/foreman_docker/docker.rb

@@ -2,7 +2,7 @@ require 'uri'
 
 module ForemanDocker
   class Docker < ::ComputeResource
-    validates :url, :format => { :with => URI.regexp }
+    validates :url, :format => { :with => URI.regexp }, :presence => true
     validates :email, :format => { :with => /.+@.+\..+/i }, :allow_blank => true
 
     def self.model_name

data/app/models/service/registry_api.rb

@@ -1,9 +1,10 @@
 module Service
   class RegistryApi
-    DOCKER_HUB = 'https://registry.hub.docker.com/'.freeze
+    DOCKER_HUB = 'https://index.docker.io/'.freeze
     DEFAULTS = {
       url: 'http://localhost:5000'.freeze,
-      connection: { omit_default_port: true }
+      connection: { omit_default_port: true,
+                    headers: { "Content-Type" => "application/json" }}
     }
 
     attr_accessor :config, :url

data/db/migrate/20140930175337_add_email_to_compute_resource.rb

@@ -1,4 +1,4 @@
-class AddEmailToComputeResource < ActiveRecord::Migration
+class AddEmailToComputeResource < ActiveRecord::Migration[4.2]
   def change
     add_column :compute_resources, :email, :string
   end

data/db/migrate/20141005233312_create_containers.rb

@@ -1,4 +1,4 @@
-class CreateContainers < ActiveRecord::Migration
+class CreateContainers < ActiveRecord::Migration[4.2]
   def change
     create_table :containers do |t|
       t.string :name

data/db/migrate/20141007225130_add_compute_resource_id_to_container.rb

@@ -1,4 +1,4 @@
-class AddComputeResourceIdToContainer < ActiveRecord::Migration
+class AddComputeResourceIdToContainer < ActiveRecord::Migration[4.2]
   def change
     add_column :containers, :compute_resource_id, :integer
   end

data/db/migrate/20141009001613_add_tag_to_container.rb

@@ -1,4 +1,4 @@
-class AddTagToContainer < ActiveRecord::Migration
+class AddTagToContainer < ActiveRecord::Migration[4.2]
   def change
     add_column :containers, :tag, :string
   end

data/db/migrate/20141009011026_add_attributes_to_container.rb

@@ -1,4 +1,4 @@
-class AddAttributesToContainer < ActiveRecord::Migration
+class AddAttributesToContainer < ActiveRecord::Migration[4.2]
   def change
     add_column :containers, :entrypoint, :string
     add_column :containers, :cpu_set, :integer

data/db/migrate/20141010173220_create_docker_images.rb

@@ -1,4 +1,4 @@
-class CreateDockerImages < ActiveRecord::Migration
+class CreateDockerImages < ActiveRecord::Migration[4.2]
   def up
     create_table :docker_images do |t|
       t.string  :image_id

data/db/migrate/20141018110810_add_uuid_to_containers.rb

@@ -1,4 +1,4 @@
-class AddUuidToContainers < ActiveRecord::Migration
+class AddUuidToContainers < ActiveRecord::Migration[4.2]
   def change
     add_column :containers, :uuid, :string
     add_index  :containers, [:uuid, :compute_resource_id]

data/db/migrate/20141024163003_create_docker_registries.rb

@@ -1,4 +1,4 @@
-class CreateDockerRegistries < ActiveRecord::Migration
+class CreateDockerRegistries < ActiveRecord::Migration[4.2]
   def change
     create_table :docker_registries do |t|
       t.string :url

data/db/migrate/20141028164206_change_memory_in_container.rb

@@ -1,4 +1,4 @@
-class ChangeMemoryInContainer < ActiveRecord::Migration
+class ChangeMemoryInContainer < ActiveRecord::Migration[4.2]
   def up
     change_column :containers, :memory, :string
   end

data/db/migrate/20141028164633_change_cpuset_in_container.rb

@@ -1,4 +1,4 @@
-class ChangeCpusetInContainer < ActiveRecord::Migration
+class ChangeCpusetInContainer < ActiveRecord::Migration[4.2]
   def up
     change_column :containers, :cpu_set, :string
   end

data/db/migrate/20141120123003_add_user_credentials_to_docker_registries.rb

@@ -1,4 +1,4 @@
-class AddUserCredentialsToDockerRegistries < ActiveRecord::Migration
+class AddUserCredentialsToDockerRegistries < ActiveRecord::Migration[4.2]
   def change
     add_column :docker_registries, :username, :string
     add_column :docker_registries, :password, :string

data/db/migrate/20141209182008_remove_docker_tables.rb

@@ -1,4 +1,4 @@
-class RemoveDockerTables < ActiveRecord::Migration
+class RemoveDockerTables < ActiveRecord::Migration[4.2]
   class DockerImage
   end
 

data/db/migrate/20141222113313_create_wizard_states.rb

@@ -1,4 +1,4 @@
-class CreateWizardStates < ActiveRecord::Migration
+class CreateWizardStates < ActiveRecord::Migration[4.2]
   # rubocop:disable Metrics/MethodLength
   def change
     create_table :docker_container_wizard_states, &:timestamps

data/db/migrate/20150122011747_add_katello_flag_to_docker_wizard_image.rb

@@ -1,4 +1,4 @@
-class AddKatelloFlagToDockerWizardImage < ActiveRecord::Migration
+class AddKatelloFlagToDockerWizardImage < ActiveRecord::Migration[4.2]
   def up
     add_column :docker_container_wizard_states_images, :katello, :boolean
   end

data/db/migrate/20150129054944_add_katello_flag_to_containers.rb

@@ -1,4 +1,4 @@
-class AddKatelloFlagToContainers < ActiveRecord::Migration
+class AddKatelloFlagToContainers < ActiveRecord::Migration[4.2]
   def up
     add_column :containers, :katello, :boolean
   end

data/db/migrate/20150303175646_remove_katello_flag_from_containers.rb

@@ -1,4 +1,4 @@
-class RemoveKatelloFlagFromContainers < ActiveRecord::Migration
+class RemoveKatelloFlagFromContainers < ActiveRecord::Migration[4.2]
   def up
     remove_column :containers, :katello
   end

data/db/migrate/20150814205620_change_container_column_type.rb

@@ -1,4 +1,4 @@
-class ChangeContainerColumnType < ActiveRecord::Migration
+class ChangeContainerColumnType < ActiveRecord::Migration[4.2]
   def up
     change_column :containers, :cpu_shares, :integer
     change_column :docker_container_wizard_states_configurations, :cpu_shares, :integer

data/db/migrate/20160605133025_create_docker_parameters.rb

@@ -1,4 +1,4 @@
-class CreateDockerParameters < ActiveRecord::Migration
+class CreateDockerParameters < ActiveRecord::Migration[4.2]
   def change
     create_table :docker_parameters do |t|
       t.string :key, :limit => 255

data/db/migrate/20160605134652_move_parameters_to_docker_parameters.rb

@@ -1,9 +1,9 @@
-class MoveParametersToDockerParameters < ActiveRecord::Migration
-  class FakeDockerParameter < ActiveRecord::Base
+class MoveParametersToDockerParameters < ActiveRecord::Migration[4.2]
+  class FakeDockerParameter < ApplicationRecord
     self.table_name = 'docker_parameters'
   end
 
-  class FakeParameter < ActiveRecord::Base
+  class FakeParameter < ApplicationRecord
     self.table_name = 'parameters'
   end
 

data/db/migrate/20170508130316_add_verify_ssl_option_to_docker_registries.rb

@@ -1,4 +1,4 @@
-class AddVerifySslOptionToDockerRegistries < ActiveRecord::Migration
+class AddVerifySslOptionToDockerRegistries < ActiveRecord::Migration[4.2]
   def change
     add_column :docker_registries, :verify_ssl, :boolean, default: true
   end

data/lib/foreman_docker/engine.rb

@@ -47,6 +47,7 @@ module ForemanDocker
         compute_resource ForemanDocker::Docker
 
         sub_menu :top_menu, :containers_menu, :caption => N_('Containers'),
+                                              :icon => 'fa fa-cube',
                                               :after => :monitor_menu do
           menu :top_menu, :containers,    :caption => N_('All Containers'),
                                           :url_hash => { :controller => :containers,

data/lib/foreman_docker/version.rb

@@ -1,3 +1,3 @@
 module ForemanDocker
-  VERSION = '3.2.1'
+  VERSION = '4.0.0'
 end

data/test/factories/compute_resources.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :container_resource, :class => ComputeResource do
     sequence(:name) { |n| "compute_resource#{n}" }
 

data/test/factories/containers.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :container do
     sequence(:name) { |n| "container_#{n}" }
     association :compute_resource, :factory => :docker_cr

data/test/factories/docker_registry.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :docker_registry do
     sequence(:name) { |n| "hub#{n}" }
     sequence(:url) { |n| "http://localhost/#{n}" }
@@ -11,10 +11,10 @@ FactoryGirl.define do
   end
 
   trait :with_location do
-    locations { [FactoryGirl.build(:location)] }
+    locations { [FactoryBot.build(:location)] }
   end
 
   trait :with_organization do
-    organizations { [FactoryGirl.build(:organization)] }
+    organizations { [FactoryBot.build(:organization)] }
   end
 end

data/test/functionals/api/v2/containers_controller_test.rb

@@ -9,38 +9,38 @@ module Api
       end
 
       test 'index returns a list of all containers' do
-        get :index, {}, set_session_user
+        get :index, session: set_session_user
         assert_response :success
         assert_template 'index'
       end
 
       test 'index can be filtered by name' do
         %w(thomas clayton wolfe).each do |name|
-          FactoryGirl.create(:container, :name => name)
+          FactoryBot.create(:container, :name => name)
         end
-        get :index, { :search => 'name = thomas' }, set_session_user
+        get :index, params: { :search => 'name = thomas' }, session: set_session_user
         assert_response :success
         assert_equal 1, assigns(:containers).length
       end
 
       context 'container operations' do
         setup do
-          @container = FactoryGirl.create(:container, :name => 'foo')
-          @registry = FactoryGirl.create(:docker_registry)
-          @compute_resource = FactoryGirl.create(:docker_cr)
+          @container = FactoryBot.create(:container, :name => 'foo')
+          @registry = FactoryBot.create(:docker_registry)
+          @compute_resource = FactoryBot.create(:docker_cr)
         end
 
         test 'logs returns latest lines of container log' do
           fake_container = Struct.new(:logs)
           fake_container.expects(:logs).returns('I am a log').twice
           Docker::Container.expects(:get).with(@container.uuid).returns(fake_container)
-          get :logs, :id => @container.id
+          get :logs, params: { :id => @container.id }
           assert_response :success
           assert_equal ActiveSupport::JSON.decode(response.body)['logs'], fake_container.logs
         end
 
         test 'show returns information about container' do
-          get :show, :id => @container.id
+          get :show, params: { :id => @container.id }
           assert_response :success
           assert_equal ActiveSupport::JSON.decode(response.body)['name'], 'foo'
         end
@@ -52,7 +52,7 @@ module Api
 
           test 'delete removes a container in foreman and in Docker host' do
             Fog.mock!
-            delete :destroy, :id => @container.id
+            delete :destroy, params: { :id => @container.id }
             Fog.unmock!
             assert_response :success
             assert_equal ActiveSupport::JSON.decode(response.body)['name'], 'foo'
@@ -62,7 +62,7 @@ module Api
             ComputeResource.any_instance.expects(:destroy_vm).
               with('randomuuid').
               raises(::Foreman::Exception.new('Problem removing container'))
-            delete :destroy, :id => @container.id
+            delete :destroy, params: { :id => @container.id }
             assert_response :precondition_failed
           end
         end
@@ -73,20 +73,20 @@ module Api
 
           test 'power call turns on/off container in Docker host' do
             Fog::Compute::Fogdocker::Server.any_instance.expects(:start)
-            put :power, :id => @container.id, :power_action => 'start'
+            put :power, params: { :id => @container.id, :power_action => 'start' }
             assert_response :success
           end
 
           test 'power call checks status of container in Docker host' do
             Fog::Compute::Fogdocker::Server.any_instance.expects(:ready?).returns(false)
-            put :power, :id => @container.id, :power_action => 'status'
+            put :power, params: { :id => @container.id, :power_action => 'status' }
             assert_response :success
             assert_equal ActiveSupport::JSON.decode(response.body)['running'], false
           end
 
           test 'power call host' do
             Fog::Compute::Fogdocker::Server.any_instance.expects(:ready?).returns(false)
-            put :power, :id => @container.id, :power_action => 'status'
+            put :power, params: { :id => @container.id, :power_action => 'status' }
             assert_response :success
             assert_equal ActiveSupport::JSON.decode(response.body)['running'], false
           end
@@ -107,11 +107,11 @@ module Api
               container.repository_pull_url.must_include(registry_uri.host)
               container.repository_pull_url.must_include("#{repository_name}:#{tag}")
             end
-            post :create, :container => { :compute_resource_id => @compute_resource.id,
-                                          :name => name,
-                                          :registry_id => @registry.id,
-                                          :repository_name => repository_name,
-                                          :tag => tag }
+            post :create, params: { :container => { :compute_resource_id => @compute_resource.id,
+                                                    :name => name,
+                                                    :registry_id => @registry.id,
+                                                    :repository_name => repository_name,
+                                                    :tag => tag } }
             assert_response :created
           end
 
@@ -121,12 +121,12 @@ module Api
             name = "foo2"
             Service::Containers.any_instance.expects(:pull_image).returns(true)
             Service::Containers.any_instance.expects(:start_container).returns(true)
-            post :create, :container => { :compute_resource_id => @compute_resource.id,
-                                          :name => name,
-                                          :registry_id => @registry.id,
-                                          :repository_name => repository_name,
-                                          :tag => tag,
-                                          :environment_variables => [{:key => 'ping_host', :value => 'example.com'}]}
+            post :create, params: { :container => { :compute_resource_id => @compute_resource.id,
+                                                    :name => name,
+                                                    :registry_id => @registry.id,
+                                                    :repository_name => repository_name,
+                                                    :tag => tag,
+                                                    :environment_variables => [{:key => 'ping_host', :value => 'example.com'}]} }
             assert_response :created
           end
         end
@@ -150,20 +150,20 @@ module Api
             container_attributes[:name].must_equal(name)
             wizard_state.image.capsule_id.must_equal(capsule_id)
           end
-          post :create, :container => { :compute_resource_id => @compute_resource.id,
-                                        :name => name,
-                                        :capsule_id => capsule_id,
-                                        :repository_name => repository_name,
-                                        :tag => tag }
+          post :create, params: { :container => { :compute_resource_id => @compute_resource.id,
+                                                  :name => name,
+                                                  :capsule_id => capsule_id,
+                                                  :repository_name => repository_name,
+                                                  :tag => tag } }
           assert_response :created
         end
 
         test 'creation fails with invalid container name' do
-          post :create, :container => { :compute_resource_id => @container.compute_resource_id,
-                                        :name => @container.name,
-                                        :registry_id => @registry.id,
-                                        :repository_name => 'centos',
-                                        :tag => 'latest' }
+          post :create, params: { :container => { :compute_resource_id => @container.compute_resource_id,
+                                                  :name => @container.name,
+                                                  :registry_id => @registry.id,
+                                                  :repository_name => 'centos',
+                                                  :tag => 'latest' } }
           assert_response :unprocessable_entity
           assert_match /Name has already been taken/, @response.body
         end

data/test/functionals/api/v2/registries_controller_test.rb

@@ -4,53 +4,53 @@ module Api
   module V2
     class RegistriesControllerTest < ActionController::TestCase
       setup do
-        @registry = FactoryGirl.create(:docker_registry)
+        @registry = FactoryBot.create(:docker_registry)
       end
 
       test 'index returns a list of all containers' do
-        get :index, {}, set_session_user
+        get :index, session: set_session_user
         assert_response :success
         assert_template 'index'
       end
 
       test 'index can be filtered by name' do
         %w(thomas clayton wolfe).each do |name|
-          FactoryGirl.create(:docker_registry, :name => name)
+          FactoryBot.create(:docker_registry, :name => name)
         end
-        get :index, { :search => 'name = thomas' }, set_session_user
+        get :index, params: { :search => 'name = thomas' }, session: set_session_user
         assert_response :success
         assert_equal 1, assigns(:registries).length
       end
 
       test 'creates a new registry with valid params' do
-        docker_attrs = FactoryGirl.attributes_for(:docker_registry)
+        docker_attrs = FactoryBot.attributes_for(:docker_registry)
         DockerRegistry.any_instance.stubs(:attempt_login)
-        post :create, :registry => docker_attrs
+        post :create, params: { :registry => docker_attrs }
         assert_response :success
       end
 
       test 'does not create a new registry with invalid params' do
-        docker_attrs = FactoryGirl.attributes_for(:docker_registry)
+        docker_attrs = FactoryBot.attributes_for(:docker_registry)
         docker_attrs.delete(:name)
-        post :create, :registry => docker_attrs
+        post :create, params: { :registry => docker_attrs }
         assert_response 422
       end
 
       test 'shows a docker registry' do
-        get :show, :id => @registry.id
+        get :show, params: { :id => @registry.id }
         assert_response :success
       end
 
       test 'update a docker registry' do
         DockerRegistry.any_instance.stubs(:attempt_login)
         new_name = 'hello_world'
-        put :update, :id => @registry.id, :registry => { :name => new_name }
+        put :update, params: { :id => @registry.id, :registry => { :name => new_name } }
         assert_response :success
         assert_equal new_name, @registry.reload.name
       end
 
       test 'deletes a docker registry' do
-        delete :destroy, :id => @registry.id
+        delete :destroy, params: { :id => @registry.id }
         assert_response :success
         assert DockerRegistry.where(:id => @registry.id).blank?
       end

data/test/functionals/containers_controller_test.rb

@@ -7,7 +7,7 @@ class ContainersControllerTest < ActionController::TestCase
   end
 
   test 'redirect if Docker provider is not available' do
-    get :index, {}, set_session_user
+    get :index, session: set_session_user
     assert_redirected_to new_compute_resource_path
   end
 
@@ -15,15 +15,15 @@ class ContainersControllerTest < ActionController::TestCase
     Fog.mock!
     # Avoid rendering errors by not retrieving any container
     ComputeResource.any_instance.stubs(:vms).returns([])
-    FactoryGirl.create(:docker_cr)
-    get :index, {}, set_session_user
+    FactoryBot.create(:docker_cr)
+    get :index, session: set_session_user
     assert_template 'index'
   end
 
   context 'delete container' do
     setup do
       Fog.mock!
-      @container_resource = FactoryGirl.create(:docker_cr)
+      @container_resource = FactoryBot.create(:docker_cr)
       @container          = @container_resource.vms.first
     end
 
@@ -31,8 +31,7 @@ class ContainersControllerTest < ActionController::TestCase
 
     test 'deleting an unmanaged container redirects to containers index' do
       ComputeResource.any_instance.expects(:destroy_vm).with(@container.id)
-      delete :destroy, { :compute_resource_id => @container_resource,
-                         :id                  => @container.id }, set_session_user
+      delete :destroy, params: { :compute_resource_id => @container_resource, :id => @container.id }, session: set_session_user
       assert_redirected_to containers_path
       assert_equal "Container #{@container.id} is being deleted.",
         flash[:notice]
@@ -42,8 +41,7 @@ class ContainersControllerTest < ActionController::TestCase
       ComputeResource.any_instance.stubs(:destroy_vm).
         raises(::Foreman::Exception.new('Could not destroy Docker container'))
       @request.env['HTTP_REFERER'] = "http://test.host/#{containers_path}"
-      delete :destroy, { :compute_resource_id => @container_resource,
-                         :id                  => @container.id }, set_session_user
+      delete :destroy, params: { :compute_resource_id => @container_resource, :id => @container.id }, session: set_session_user
       assert @container.present?
       assert_redirected_to :back
       assert_equal 'Your container could not be deleted in Docker',
@@ -51,29 +49,28 @@ class ContainersControllerTest < ActionController::TestCase
     end
 
     test 'deleting a managed container deletes container in Docker' do
-      managed_container = FactoryGirl.create(
+      managed_container = FactoryBot.create(
         :container,
         :compute_resource => @container_resource)
       ComputeResource.any_instance.expects(:destroy_vm).
         with('randomuuid')
       Container.any_instance.expects(:uuid).returns('randomuuid').at_least_once
       Container.any_instance.expects(:destroy)
-      delete :destroy, { :id => managed_container.id }, set_session_user
+      delete :destroy, params: { :id => managed_container.id }, session: set_session_user
       assert_redirected_to containers_path
       assert_equal "Container #{managed_container.uuid} is being deleted.",
         flash[:notice]
     end
 
     test 'deleting with container params deletes container object' do
-      managed_container = FactoryGirl.create(
+      managed_container = FactoryBot.create(
         :container,
         :compute_resource => @container_resource)
       managed_container.update(:uuid => @container.id)
       ComputeResource.any_instance.expects(:destroy_vm).
         with(@container.id).returns(true)
       Container.any_instance.expects(:destroy)
-      delete :destroy, { :compute_resource_id => @container_resource.id,
-                         :id                  => @container.id }, set_session_user
+      delete :destroy, params: { :compute_resource_id => @container_resource.id, :id => @container.id }, session: set_session_user
       assert_redirected_to containers_path
       assert_equal "Container #{managed_container.uuid} is being deleted.",
         flash[:notice]
@@ -82,10 +79,10 @@ class ContainersControllerTest < ActionController::TestCase
     test 'failed deletion of managed container keeps container in Foreman' do
       ComputeResource.any_instance.stubs(:destroy_vm).
         raises(::Foreman::Exception.new('Could not destroy Docker container'))
-      managed_container = FactoryGirl.create(
+      managed_container = FactoryBot.create(
         :container,
         :compute_resource => @container_resource)
-      delete :destroy, { :id => managed_container.id }, set_session_user
+      delete :destroy, params: { :id => managed_container.id }, session: set_session_user
       assert managed_container.present? # Foreman container would not be deleted
       assert_redirected_to containers_path
       assert_equal 'Your container could not be deleted in Docker',
@@ -94,7 +91,7 @@ class ContainersControllerTest < ActionController::TestCase
   end
 
   test 'committing a managed container' do
-    container = FactoryGirl.create(:container)
+    container = FactoryBot.create(:container)
     request.env['HTTP_REFERER'] = container_path(:id => container.id)
     commit_hash = { :author => 'a', :repo => 'b', :tag => 'c', :comment => 'd' }
 
@@ -103,7 +100,6 @@ class ContainersControllerTest < ActionController::TestCase
       .returns(mock_container)
     mock_container.expects(:commit).with(commit_hash)
 
-    post :commit, { :commit => commit_hash,
-                    :id     => container.id }, set_session_user
+    post :commit, params: { :commit => commit_hash, :id => container.id }, session: set_session_user
   end
 end

data/test/functionals/containers_steps_controller_test.rb

@@ -5,25 +5,21 @@ module Containers
     setup do
       stub_image_existance
       stub_registry_api
-      @container = FactoryGirl.create(:container)
+      @container = FactoryBot.create(:container)
       @state = DockerContainerWizardState.create!
     end
 
     test 'wizard finishes with a redirect to the managed container' do
       Service::Containers.any_instance.expects(:start_container!).with(equals(@state))
         .returns(@container)
-      put :update, { :wizard_state_id => @state.id,
-                     :id => :environment,
-                     :start_on_create => true,
-                     :docker_container_wizard_states_environment => { :tty => false } },
-          set_session_user
+      put :update, params: { :wizard_state_id => @state.id, :id => :environment, :start_on_create => true, :docker_container_wizard_states_environment => { :tty => false } }, session: set_session_user
 
       assert_redirected_to container_path(:id => @container.id)
     end
 
     describe 'on image step' do
       setup do
-        @compute_resource = FactoryGirl.create(:docker_cr)
+        @compute_resource = FactoryBot.create(:docker_cr)
         @create_options = { :wizard_state => @state,
                            :compute_resource_id => @compute_resource.id }
         @state.preliminary = DockerContainerWizardStates::Preliminary.create!(@create_options)
@@ -31,7 +27,7 @@ module Containers
       end
 
       test 'image show doesnot load katello' do
-        get :show, { :wizard_state_id => @state.id, :id => :image }, set_session_user
+        get :show, params: { :wizard_state_id => @state.id, :id => :image }, session: set_session_user
         refute @state.image.katello?
         refute response.body.include?("katello") # this is code generated by katello partial
         docker_image = @controller.instance_eval do
@@ -54,14 +50,14 @@ module Containers
         end
 
         test 'has no errors if the image exists' do
-          put :update, @params, set_session_user
+          put :update, params: @params, session: set_session_user
           assert_valid @state.image
           assert css_select('#hub_image_search.has-error').size == 0
         end
 
         test 'shows an error when the image does not exist' do
           stub_image_existance(false)
-          put :update, @params, set_session_user
+          put :update, params: @params, session: set_session_user
           refute_valid @state.image
           assert_select '#hub_image_search.has-error'
         end
@@ -75,7 +71,7 @@ module Containers
       @state.environment = DockerContainerWizardStates::Environment.create!(environment_options)
       @state.environment.exposed_ports.create!(:key => '1654', :value => 'tcp')
       @state.environment.exposed_ports.create!(:key => '1655', :value => 'udp')
-      get :show, { :wizard_state_id => @state.id, :id => :environment }, set_session_user
+      get :show, params: { :wizard_state_id => @state.id, :id => :environment }, session: set_session_user
       assert response.body.include?("1654")
       assert response.body.include?("1655")
 
@@ -97,7 +93,7 @@ module Containers
       @state.environment = DockerContainerWizardStates::Environment.create!(environment_options)
       @state.environment.dns.create!(:key => '18.18.18.18')
       @state.environment.dns.create!(:key => '19.19.19.19')
-      get :show, { :wizard_state_id => @state.id, :id => :environment }, set_session_user
+      get :show, params: { :wizard_state_id => @state.id, :id => :environment }, session: set_session_user
       assert response.body.include?("18.18.18.18")
       assert response.body.include?("19.19.19.19")
 

data/test/functionals/image_search_controller_test.rb

@@ -6,8 +6,8 @@ class ImageSearchControllerTest < ActionController::TestCase
   let(:term) { docker_image }
 
   let(:docker_hub) { Service::RegistryApi.new(url: 'https://nothub.com') }
-  let(:compute_resource) { FactoryGirl.create(:docker_cr) }
-  let(:registry) { FactoryGirl.create(:docker_registry) }
+  let(:compute_resource) { FactoryBot.create(:docker_cr) }
+  let(:registry) { FactoryBot.create(:docker_registry) }
   let(:image_search_service) { ForemanDocker::ImageSearch.new }
 
   setup do

data/test/integration/container_steps_test.rb

@@ -2,8 +2,8 @@ require 'integration_test_helper'
 
 class ContainerStepsTest < IntegrationTestWithJavascript
   let(:wizard_state) { DockerContainerWizardState.create! }
-  let(:compute_resource) { FactoryGirl.create(:docker_cr) }
-  let(:registry) { FactoryGirl.create(:docker_registry) }
+  let(:compute_resource) { FactoryBot.create(:docker_cr) }
+  let(:registry) { FactoryBot.create(:docker_registry) }
   let(:image_search_service) { ForemanDocker::ImageSearch.new }
   let(:image_search_results) do
     [{ 'name' => 'my_fake_repository_result',

data/test/integration/container_test.rb

@@ -10,7 +10,7 @@ class ContainerIntegrationTest < ActionDispatch::IntegrationTest
     test 'shows containers list if compute resource is available' do
       Fog.mock!
       ComputeResource.any_instance.stubs(:vms).returns([])
-      FactoryGirl.create(:docker_cr)
+      FactoryBot.create(:docker_cr)
       visit containers_path
       assert page.has_link? 'Create container'
       refute_equal current_path, new_compute_resource_path

data/test/integration/registry_creation_test.rb

@@ -1,7 +1,7 @@
 require 'integration_test_helper'
 
 class RegistryiCreationTest < IntegrationTestWithJavascript
-  let(:registry_values) { FactoryGirl.build(:docker_registry) }
+  let(:registry_values) { FactoryBot.build(:docker_registry) }
 
   setup do
     DockerRegistry.any_instance.stubs(:attempt_login).returns(true)

data/test/test_plugin_helper.rb

@@ -9,9 +9,9 @@ def assert_row_button(index_path, link_text, button_text, dropdown = false)
   end
 end
 
-# 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
 
 def stub_image_existance(exists = true)
   Docker::Image.any_instance.stubs(:exist?).returns(exists)

data/test/units/container_remover_test.rb

@@ -4,7 +4,7 @@ module ForemanDocker
   class ContainerRemoverTest < ActiveSupport::TestCase
     describe '#remove_unmanaged' do
       setup do
-        @docker_compute_resource = FactoryGirl.build_stubbed(:docker_cr)
+        @docker_compute_resource = FactoryBot.build_stubbed(:docker_cr)
         ComputeResource.expects(:authorized).
           with(:destroy_compute_resources_vms).
           returns(stub(:find => @docker_compute_resource))

data/test/units/containers_service_test.rb

@@ -7,7 +7,7 @@ class ContainersServiceTest < ActiveSupport::TestCase
     stub_registry_api
 
     @state = DockerContainerWizardState.create! do |s|
-      s.build_preliminary(:compute_resource_id => FactoryGirl.create(:docker_cr).id,
+      s.build_preliminary(:compute_resource_id => FactoryBot.create(:docker_cr).id,
                           :locations           => [taxonomies(:location1)],
                           :organizations       => [taxonomies(:organization1)])
       s.build_image(:repository_name => 'test', :tag => 'test', :wizard_state => s)

data/test/units/docker_container_wizard_states/image_test.rb

@@ -5,8 +5,8 @@ module DockerContainerWizardStates
     let(:image) { 'centos' }
     let(:tags) { ['latest', '5', '4.3'] }
     let(:docker_hub) { Service::RegistryApi.new(url: 'https://nothub.com') }
-    let(:registry) { FactoryGirl.create(:docker_registry) }
-    let(:compute_resource) { FactoryGirl.create(:docker_cr) }
+    let(:registry) { FactoryBot.create(:docker_registry) }
+    let(:compute_resource) { FactoryBot.create(:docker_cr) }
     let(:image_search_service) { ForemanDocker::ImageSearch.new }
     let(:wizard_state) do
       DockerContainerWizardState.create

data/test/units/docker_registry_test.rb

@@ -1,26 +1,26 @@
 require 'test_plugin_helper'
 
 class DockerRegistryTest < ActiveSupport::TestCase
-  subject { FactoryGirl.create(:docker_registry) }
+  subject { FactoryBot.create(:docker_registry) }
 
   test 'used_location_ids should return correct location ids' do
-    location = FactoryGirl.build(:location)
+    location = FactoryBot.build(:location)
     r = as_admin do
-      FactoryGirl.create(:docker_registry, :locations => ([location]))
+      FactoryBot.create(:docker_registry, :locations => ([location]))
     end
     assert r.used_location_ids.include?(location.id)
   end
 
   test 'used_organization_ids should return correct organization ids' do
-    organization = FactoryGirl.build(:organization)
+    organization = FactoryBot.build(:organization)
     r = as_admin do
-      FactoryGirl.create(:docker_registry, :organizations => ([organization]))
+      FactoryBot.create(:docker_registry, :organizations => ([organization]))
     end
     assert r.used_organization_ids.include?(organization.id)
   end
 
   test 'password is stored encrypted' do
-    registry = as_admin { FactoryGirl.build(:docker_registry) }
+    registry = as_admin { FactoryBot.build(:docker_registry) }
     registry.password = 'encrypted-whatever'
     DockerRegistry.any_instance.expects(:encryption_key).at_least_once.returns('fakeencryptionkey')
     assert registry.is_decryptable?(registry.password_in_db)

data/test/units/foreman_docker/docker_test.rb

@@ -2,6 +2,7 @@ require 'test_plugin_helper'
 
 module ForemanDocker
   class DockerTest < ActiveSupport::TestCase
+    should validate_presence_of(:url)
     should allow_value('a@b.com').for(:email)
     should allow_value('').for(:email)
     should_not allow_value('abcb.com').for(:email)

data/test/units/image_search_service_test.rb

@@ -1,8 +1,8 @@
 require 'test_plugin_helper'
 
 class ImageSearchServiceTest < ActiveSupport::TestCase
-  let(:compute_resource) { FactoryGirl.create(:docker_cr) }
-  let(:registry) { FactoryGirl.create(:docker_registry).api }
+  let(:compute_resource) { FactoryBot.create(:docker_cr) }
+  let(:registry) { FactoryBot.create(:docker_registry).api }
   let(:term) { 'centos' }
   let(:query) { { term: term, tags: 'false' } }
 

data/test/units/registry_api_test.rb

@@ -13,6 +13,10 @@ class RegistryApiTest < ActiveSupport::TestCase
       assert_equal url, subject.connection.url
     end
 
+    test 'it requests json' do
+      assert_equal 'application/json', subject.connection.options[:headers]['Content-Type']
+    end
+
     context 'authentication is set' do
       let(:user) { 'username' }
       let(:password) { 'secretpassword' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_docker
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Daniel Lobato, Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.52.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.52.0
 description: Provision and manage Docker containers and images from Foreman.
 email:
 - dlobatog@redhat.com, abenari@redhat.com
@@ -268,11 +268,11 @@ test_files:
 - test/factories/compute_resources.rb
 - test/factories/containers.rb
 - test/factories/docker_registry.rb
-- test/functionals/api/v2/registries_controller_test.rb
 - test/functionals/api/v2/containers_controller_test.rb
+- test/functionals/api/v2/registries_controller_test.rb
+- test/functionals/image_search_controller_test.rb
 - test/functionals/containers_controller_test.rb
 - test/functionals/containers_steps_controller_test.rb
-- test/functionals/image_search_controller_test.rb
 - test/integration/container_test.rb
 - test/integration/container_steps_test.rb
 - test/integration/registry_creation_test.rb