foreman_docker 1.3.1 → 1.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/controllers/api/v2/containers_controller.rb +2 -2
- data/app/controllers/containers/steps_controller.rb +9 -4
- data/app/controllers/image_search_controller.rb +9 -1
- data/app/helpers/containers_helper.rb +0 -8
- data/app/models/container.rb +2 -1
- data/app/models/docker_container_wizard_states/configuration.rb +0 -1
- data/app/models/service/containers.rb +41 -19
- data/app/services/foreman_docker/utility.rb +20 -0
- data/app/views/compute_resources/form/_docker.html.erb +2 -2
- data/app/views/containers/show.html.erb +5 -1
- data/app/views/containers/steps/environment.html.erb +10 -1
- data/app/views/image_search/_repository_search_results.html.erb +0 -1
- data/lib/foreman_docker/engine.rb +0 -1
- data/lib/foreman_docker/version.rb +1 -1
- data/locale/de/foreman_docker.po +456 -0
- data/locale/es/foreman_docker.po +456 -0
- data/locale/foreman_docker.pot +437 -0
- data/locale/fr/foreman_docker.po +462 -0
- data/locale/it/foreman_docker.po +459 -0
- data/locale/ja/foreman_docker.po +446 -0
- data/locale/ko/foreman_docker.po +443 -0
- data/locale/pt_BR/foreman_docker.po +453 -0
- data/locale/ru/foreman_docker.po +449 -0
- data/locale/zanata.xml +19 -0
- data/locale/zh_CN/foreman_docker.po +441 -0
- data/locale/zh_TW/foreman_docker.po +442 -0
- data/test/functionals/containers_steps_controller_test.rb +1 -0
- data/test/functionals/image_search_controller_test.rb +34 -0
- data/test/integration/container_steps_test.rb +2 -2
- data/test/units/utility_service_test.rb +27 -0
- metadata +17 -2
@@ -26,6 +26,40 @@ class ImageSearchControllerTest < ActionController::TestCase
|
|
26
26
|
end
|
27
27
|
end
|
28
28
|
|
29
|
+
test "centos 7 search responses are handled correctly" do
|
30
|
+
repository = "registry-fancycorp.rhcloud.com/fancydb-rhel7/fancydb"
|
31
|
+
repo_full_name = "redhat.com: #{repository}"
|
32
|
+
request.env["HTTP_ACCEPT"] = "application/javascript"
|
33
|
+
expected = [{ "description" => "Really fancy database app...",
|
34
|
+
"is_official" => true,
|
35
|
+
"is_trusted" => true,
|
36
|
+
"name" => repo_full_name,
|
37
|
+
"star_count" => 0
|
38
|
+
}]
|
39
|
+
ForemanDocker::Docker.any_instance.expects(:search).returns(expected).at_least_once
|
40
|
+
get :search_repository, { :search => "centos", :id => @container.id }, set_session_user
|
41
|
+
assert_response :success
|
42
|
+
refute response.body.include?(repo_full_name)
|
43
|
+
assert response.body.include?(repository)
|
44
|
+
end
|
45
|
+
|
46
|
+
test "fedora search responses are handled correctly" do
|
47
|
+
repository = "registry-fancycorp.rhcloud.com/fancydb-rhel7/fancydb"
|
48
|
+
repo_full_name = repository
|
49
|
+
request.env["HTTP_ACCEPT"] = "application/javascript"
|
50
|
+
expected = [{ "description" => "Really fancy database app...",
|
51
|
+
"is_official" => true,
|
52
|
+
"is_trusted" => true,
|
53
|
+
"name" => repo_full_name,
|
54
|
+
"star_count" => 0
|
55
|
+
}]
|
56
|
+
ForemanDocker::Docker.any_instance.expects(:search).returns(expected).at_least_once
|
57
|
+
get :search_repository, { :search => "centos", :id => @container.id }, set_session_user
|
58
|
+
assert_response :success
|
59
|
+
assert response.body.include?(repo_full_name)
|
60
|
+
assert response.body.include?(repository)
|
61
|
+
end
|
62
|
+
|
29
63
|
def assert_response_is_expected
|
30
64
|
assert_response :error
|
31
65
|
assert response.body.include?('An error occured during repository search:')
|
@@ -8,8 +8,8 @@ class ContainerStepsTest < ActionDispatch::IntegrationTest
|
|
8
8
|
|
9
9
|
test 'shows taxonomies tabs' do
|
10
10
|
visit new_container_path
|
11
|
-
assert has_selector?("a", :text => 'Locations')
|
12
|
-
assert has_selector?("a", :text => 'Organizations')
|
11
|
+
assert has_selector?("a", :text => 'Locations') if SETTINGS[:locations_enabled]
|
12
|
+
assert has_selector?("a", :text => 'Organizations') if SETTINGS[:organizations_enabled]
|
13
13
|
end
|
14
14
|
# test 'clicking on search loads repositories' do
|
15
15
|
# Capybara.javascript_driver = :webkit
|
@@ -0,0 +1,27 @@
|
|
1
|
+
require 'test_plugin_helper'
|
2
|
+
|
3
|
+
class UtilitiesServiceTest < ActiveSupport::TestCase
|
4
|
+
test "parses empty and nil input as 0" do
|
5
|
+
assert_equal ForemanDocker::Utility.parse_memory(""), 0
|
6
|
+
assert_equal ForemanDocker::Utility.parse_memory(nil), 0
|
7
|
+
assert_equal ForemanDocker::Utility.parse_memory(" "), 0
|
8
|
+
end
|
9
|
+
|
10
|
+
test "correctly parses a number without unit" do
|
11
|
+
assert_equal ForemanDocker::Utility.parse_memory("1234"), 1_234
|
12
|
+
assert_equal ForemanDocker::Utility.parse_memory(" 123 4 "), 1_234
|
13
|
+
end
|
14
|
+
|
15
|
+
test "correctl parses number with unit" do
|
16
|
+
assert_equal ForemanDocker::Utility.parse_memory("10K"), 10_240
|
17
|
+
assert_equal ForemanDocker::Utility.parse_memory("20k"), 20_480
|
18
|
+
assert_equal ForemanDocker::Utility.parse_memory("5 G"), 5_368_709_120
|
19
|
+
assert_equal ForemanDocker::Utility.parse_memory("10m"), 10_485_760
|
20
|
+
end
|
21
|
+
|
22
|
+
test "raises on bad input" do
|
23
|
+
assert_raise RuntimeError do
|
24
|
+
ForemanDocker::Utility.parse_memory("26V")
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: foreman_docker
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.4.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Daniel Lobato, Amos Benari
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-07-23 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: docker-api
|
@@ -81,6 +81,7 @@ files:
|
|
81
81
|
- app/models/foreman_docker/taxonomy_extensions.rb
|
82
82
|
- app/models/service/containers.rb
|
83
83
|
- app/models/service/registry_api.rb
|
84
|
+
- app/services/foreman_docker/utility.rb
|
84
85
|
- app/views/api/v1/compute_resources/docker.json
|
85
86
|
- app/views/api/v2/compute_resources/docker.json
|
86
87
|
- app/views/api/v2/containers/base.json.rabl
|
@@ -137,6 +138,18 @@ files:
|
|
137
138
|
- lib/foreman_docker/tasks/test.rake
|
138
139
|
- lib/foreman_docker/version.rb
|
139
140
|
- locale/Makefile
|
141
|
+
- locale/de/foreman_docker.po
|
142
|
+
- locale/es/foreman_docker.po
|
143
|
+
- locale/foreman_docker.pot
|
144
|
+
- locale/fr/foreman_docker.po
|
145
|
+
- locale/it/foreman_docker.po
|
146
|
+
- locale/ja/foreman_docker.po
|
147
|
+
- locale/ko/foreman_docker.po
|
148
|
+
- locale/pt_BR/foreman_docker.po
|
149
|
+
- locale/ru/foreman_docker.po
|
150
|
+
- locale/zanata.xml
|
151
|
+
- locale/zh_CN/foreman_docker.po
|
152
|
+
- locale/zh_TW/foreman_docker.po
|
140
153
|
- test/factories/compute_resources.rb
|
141
154
|
- test/factories/containers.rb
|
142
155
|
- test/factories/docker_registry.rb
|
@@ -152,6 +165,7 @@ files:
|
|
152
165
|
- test/units/containers_service_test.rb
|
153
166
|
- test/units/docker_registry_test.rb
|
154
167
|
- test/units/registry_api_test.rb
|
168
|
+
- test/units/utility_service_test.rb
|
155
169
|
homepage: http://github.com/theforeman/foreman-docker
|
156
170
|
licenses:
|
157
171
|
- GPL-3
|
@@ -186,6 +200,7 @@ test_files:
|
|
186
200
|
- test/factories/compute_resources.rb
|
187
201
|
- test/factories/containers.rb
|
188
202
|
- test/units/container_test.rb
|
203
|
+
- test/units/utility_service_test.rb
|
189
204
|
- test/units/docker_registry_test.rb
|
190
205
|
- test/units/registry_api_test.rb
|
191
206
|
- test/units/containers_service_test.rb
|