foreman_docker 1.3.1 → 1.4.0

data/test/functionals/containers_steps_controller_test.rb

@@ -12,6 +12,7 @@ module Containers
         .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
 

data/test/functionals/image_search_controller_test.rb

@@ -26,6 +26,40 @@ class ImageSearchControllerTest < ActionController::TestCase
     end
   end
 
+  test "centos 7 search responses are handled correctly" do
+    repository = "registry-fancycorp.rhcloud.com/fancydb-rhel7/fancydb"
+    repo_full_name = "redhat.com: #{repository}"
+    request.env["HTTP_ACCEPT"] = "application/javascript"
+    expected = [{  "description" => "Really fancy database app...",
+                   "is_official" => true,
+                   "is_trusted" => true,
+                   "name" =>  repo_full_name,
+                   "star_count" => 0
+                }]
+    ForemanDocker::Docker.any_instance.expects(:search).returns(expected).at_least_once
+    get :search_repository, { :search => "centos", :id => @container.id }, set_session_user
+    assert_response :success
+    refute response.body.include?(repo_full_name)
+    assert response.body.include?(repository)
+  end
+
+  test "fedora search responses are handled correctly" do
+    repository = "registry-fancycorp.rhcloud.com/fancydb-rhel7/fancydb"
+    repo_full_name = repository
+    request.env["HTTP_ACCEPT"] = "application/javascript"
+    expected = [{ "description" => "Really fancy database app...",
+                  "is_official" => true,
+                  "is_trusted" => true,
+                  "name" =>  repo_full_name,
+                  "star_count" => 0
+                }]
+    ForemanDocker::Docker.any_instance.expects(:search).returns(expected).at_least_once
+    get :search_repository, { :search => "centos", :id => @container.id }, set_session_user
+    assert_response :success
+    assert response.body.include?(repo_full_name)
+    assert response.body.include?(repository)
+  end
+
   def assert_response_is_expected
     assert_response :error
     assert response.body.include?('An error occured during repository search:')

data/test/integration/container_steps_test.rb

@@ -8,8 +8,8 @@ class ContainerStepsTest < ActionDispatch::IntegrationTest
 
   test 'shows taxonomies tabs'  do
     visit new_container_path
-    assert has_selector?("a", :text => 'Locations')
-    assert has_selector?("a", :text => 'Organizations')
+    assert has_selector?("a", :text => 'Locations') if SETTINGS[:locations_enabled]
+    assert has_selector?("a", :text => 'Organizations') if SETTINGS[:organizations_enabled]
   end
   # test 'clicking on search loads repositories' do
   #   Capybara.javascript_driver = :webkit

data/test/units/utility_service_test.rb

@@ -0,0 +1,27 @@
+require 'test_plugin_helper'
+
+class UtilitiesServiceTest < ActiveSupport::TestCase
+  test "parses empty and nil input as 0" do
+    assert_equal ForemanDocker::Utility.parse_memory(""), 0
+    assert_equal ForemanDocker::Utility.parse_memory(nil), 0
+    assert_equal ForemanDocker::Utility.parse_memory("        "), 0
+  end
+
+  test "correctly parses a number without unit" do
+    assert_equal ForemanDocker::Utility.parse_memory("1234"), 1_234
+    assert_equal ForemanDocker::Utility.parse_memory("  123 4     "), 1_234
+  end
+
+  test "correctl parses number with unit" do
+    assert_equal ForemanDocker::Utility.parse_memory("10K"), 10_240
+    assert_equal ForemanDocker::Utility.parse_memory("20k"), 20_480
+    assert_equal ForemanDocker::Utility.parse_memory("5 G"), 5_368_709_120
+    assert_equal ForemanDocker::Utility.parse_memory("10m"), 10_485_760
+  end
+
+  test "raises on bad input" do
+    assert_raise RuntimeError do
+      ForemanDocker::Utility.parse_memory("26V")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_docker
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Daniel Lobato, Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -81,6 +81,7 @@ files:
 - app/models/foreman_docker/taxonomy_extensions.rb
 - app/models/service/containers.rb
 - app/models/service/registry_api.rb
+- app/services/foreman_docker/utility.rb
 - app/views/api/v1/compute_resources/docker.json
 - app/views/api/v2/compute_resources/docker.json
 - app/views/api/v2/containers/base.json.rabl
@@ -137,6 +138,18 @@ files:
 - lib/foreman_docker/tasks/test.rake
 - lib/foreman_docker/version.rb
 - locale/Makefile
+- locale/de/foreman_docker.po
+- locale/es/foreman_docker.po
+- locale/foreman_docker.pot
+- locale/fr/foreman_docker.po
+- locale/it/foreman_docker.po
+- locale/ja/foreman_docker.po
+- locale/ko/foreman_docker.po
+- locale/pt_BR/foreman_docker.po
+- locale/ru/foreman_docker.po
+- locale/zanata.xml
+- locale/zh_CN/foreman_docker.po
+- locale/zh_TW/foreman_docker.po
 - test/factories/compute_resources.rb
 - test/factories/containers.rb
 - test/factories/docker_registry.rb
@@ -152,6 +165,7 @@ files:
 - test/units/containers_service_test.rb
 - test/units/docker_registry_test.rb
 - test/units/registry_api_test.rb
+- test/units/utility_service_test.rb
 homepage: http://github.com/theforeman/foreman-docker
 licenses:
 - GPL-3
@@ -186,6 +200,7 @@ test_files:
 - test/factories/compute_resources.rb
 - test/factories/containers.rb
 - test/units/container_test.rb
+- test/units/utility_service_test.rb
 - test/units/docker_registry_test.rb
 - test/units/registry_api_test.rb
 - test/units/containers_service_test.rb