foreman_docker 2.0.1 → 2.1.0

data/test/integration/container_steps_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'integration_test_helper'
 
 class ContainerStepsTest < ActionDispatch::IntegrationTest
   test 'shows a link to a new compute resource if none is available' do

data/test/integration/container_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'integration_test_helper'
 
 class ContainerIntegrationTest < ActionDispatch::IntegrationTest
   test 'redirects to a new compute resource if none is available' do

data/test/units/container_remover_test.rb

@@ -0,0 +1,31 @@
+require 'test_plugin_helper'
+
+module ForemanDocker
+  class ContainerRemoverTest < ActiveSupport::TestCase
+    describe '#remove_unmanaged' do
+      setup do
+        @docker_compute_resource = FactoryGirl.build_stubbed(:docker_cr)
+        ComputeResource.expects(:authorized).
+          with(:destroy_compute_resources_vms).
+          returns(stub(:find => @docker_compute_resource))
+
+        Fog.mock!
+      end
+
+      teardown { Fog.unmock! }
+
+      test 'remove_unmanaged makes call to the Docker API' do
+        @docker_compute_resource.expects(:destroy_vm).with('random-uuid')
+
+        assert ForemanDocker::ContainerRemover.remove_unmanaged(
+          @docker_compute_resource.id, 'random-uuid')
+      end
+
+      test 'remove_unmanaged returns deleted_identifier' do
+        assert_equal 'random-uuid',
+          ForemanDocker::ContainerRemover.remove_unmanaged(
+            @docker_compute_resource.id, 'random-uuid')
+      end
+    end
+  end
+end

data/test/units/container_test.rb

@@ -1,4 +1,10 @@
 require 'test_plugin_helper'
 
 class ContainerTest < ActiveSupport::TestCase
+  should belong_to(:compute_resource)
+  should belong_to(:registry)
+  should have_many(:environment_variables)
+  should have_many(:dns)
+  should have_many(:exposed_ports)
+  should validate_uniqueness_of(:name)
 end

data/test/units/containers_service_test.rb

@@ -19,7 +19,9 @@ class ContainersServiceTest < ActiveSupport::TestCase
     end
     ForemanDocker::Docker.any_instance.expects(:create_container)
       .returns(OpenStruct.new(:uuid => 1))
+    Fog.mock!
     Service::Containers.new.start_container!(@state)
+    Fog.unmock!
     assert_equal DockerContainerWizardState.where(:id => @state.id).count, 0
   end
 end

data/test/units/docker_registry_test.rb

@@ -24,9 +24,26 @@ class DockerRegistryTest < ActiveSupport::TestCase
     assert registry.is_decryptable?(registry.password_in_db)
   end
 
-  %w(name url).each do |property|
-    test "registries need a #{property}" do
-      refute FactoryGirl.build(:docker_registry, property.to_sym => '').valid?
+  should validate_presence_of(:name)
+  should validate_presence_of(:url)
+  should validate_uniqueness_of(:name)
+  should validate_uniqueness_of(:url)
+
+  context 'attempt to login' do
+    setup do
+      @registry = FactoryGirl.build(:docker_registry)
+      @registry.unstub(:attempt_login)
+    end
+
+    test 'before creating a registry' do
+      RestClient::Resource.any_instance.expects(:get)
+      assert @registry.valid?
+    end
+
+    test 'display errors in case authentication failed' do
+      RestClient::Resource.any_instance.expects(:get).
+        raises(Docker::Error::AuthenticationError)
+      refute @registry.valid?
     end
   end
 end

data/test/units/foreman_docker/docker_test.rb

@@ -0,0 +1,10 @@
+require 'test_plugin_helper'
+
+module ForemanDocker
+  class DockerTest < ActiveSupport::TestCase
+    should allow_value('a@b.com').for(:email)
+    should allow_value('').for(:email)
+    should_not allow_value('abcb.com').for(:email)
+    should_not allow_value('a').for(:email)
+  end
+end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: foreman_docker
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Daniel Lobato, Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.18'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.18'
+- !ruby/object:Gem::Dependency
+  name: deface
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: wicked
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +96,9 @@ files:
 - app/models/foreman_docker/taxonomy_extensions.rb
 - app/models/service/containers.rb
 - app/models/service/registry_api.rb
+- app/overrides/remove_docker_from_compute_profiles.rb
+- app/overrides/rename_virtual_machines_containers.rb
+- app/services/foreman_docker/container_remover.rb
 - app/services/foreman_docker/utility.rb
 - app/views/api/v1/compute_resources/docker.json
 - app/views/api/v2/compute_resources/docker.json
@@ -143,18 +160,48 @@ files:
 - lib/foreman_docker/tasks/test.rake
 - lib/foreman_docker/version.rb
 - locale/Makefile
+- locale/de/LC_MESSAGES/foreman_docker.mo
+- locale/de/foreman_docker.edit.po
 - locale/de/foreman_docker.po
+- locale/de/foreman_docker.po.time_stamp
+- locale/es/LC_MESSAGES/foreman_docker.mo
+- locale/es/foreman_docker.edit.po
 - locale/es/foreman_docker.po
+- locale/es/foreman_docker.po.time_stamp
 - locale/foreman_docker.pot
+- locale/fr/LC_MESSAGES/foreman_docker.mo
+- locale/fr/foreman_docker.edit.po
 - locale/fr/foreman_docker.po
+- locale/fr/foreman_docker.po.time_stamp
+- locale/it/LC_MESSAGES/foreman_docker.mo
+- locale/it/foreman_docker.edit.po
 - locale/it/foreman_docker.po
+- locale/it/foreman_docker.po.time_stamp
+- locale/ja/LC_MESSAGES/foreman_docker.mo
+- locale/ja/foreman_docker.edit.po
 - locale/ja/foreman_docker.po
+- locale/ja/foreman_docker.po.time_stamp
+- locale/ko/LC_MESSAGES/foreman_docker.mo
+- locale/ko/foreman_docker.edit.po
 - locale/ko/foreman_docker.po
+- locale/ko/foreman_docker.po.time_stamp
+- locale/pt_BR/LC_MESSAGES/foreman_docker.mo
+- locale/pt_BR/foreman_docker.edit.po
 - locale/pt_BR/foreman_docker.po
+- locale/pt_BR/foreman_docker.po.time_stamp
+- locale/ru/LC_MESSAGES/foreman_docker.mo
+- locale/ru/foreman_docker.edit.po
 - locale/ru/foreman_docker.po
+- locale/ru/foreman_docker.po.time_stamp
 - locale/zanata.xml
+- locale/zh_CN/LC_MESSAGES/foreman_docker.mo
+- locale/zh_CN/foreman_docker.edit.po
 - locale/zh_CN/foreman_docker.po
+- locale/zh_CN/foreman_docker.po.time_stamp
+- locale/zh_TW/LC_MESSAGES/foreman_docker.mo
+- locale/zh_TW/foreman_docker.edit.po
 - locale/zh_TW/foreman_docker.po
+- locale/zh_TW/foreman_docker.po.time_stamp
 - test/factories/compute_resources.rb
 - test/factories/containers.rb
 - test/factories/docker_registry.rb
@@ -166,9 +213,11 @@ files:
 - test/integration/container_steps_test.rb
 - test/integration/container_test.rb
 - test/test_plugin_helper.rb
+- test/units/container_remover_test.rb
 - test/units/container_test.rb
 - test/units/containers_service_test.rb
 - test/units/docker_registry_test.rb
+- test/units/foreman_docker/docker_test.rb
 - test/units/registry_api_test.rb
 - test/units/utility_service_test.rb
 homepage: http://github.com/theforeman/foreman-docker
@@ -208,7 +257,9 @@ test_files:
 - test/units/utility_service_test.rb
 - test/units/docker_registry_test.rb
 - test/units/registry_api_test.rb
+- test/units/foreman_docker/docker_test.rb
 - test/units/containers_service_test.rb
+- test/units/container_remover_test.rb
 - test/test_plugin_helper.rb
 - test/integration/container_steps_test.rb
 - test/integration/container_test.rb