diff --git a/app/helpers/container_group_helper/textual_summary.rb b/app/helpers/container_group_helper/textual_summary.rb index 04fc5cf32c7..11b2a760d50 100644 --- a/app/helpers/container_group_helper/textual_summary.rb +++ b/app/helpers/container_group_helper/textual_summary.rb @@ -30,7 +30,7 @@ def textual_group_conditions condition.status, ] end - TextualGroup.new(_("Conditions"), h) + TextualMultilabel.new(_("Conditions"), h) end def textual_group_smart_management @@ -73,7 +73,7 @@ def textual_group_volumes volume_values[0][0] = volume.name if volume_values.length > 0 h[:values] += volume_values end - TextualGroup.new(_("Volumes"), h) + TextualMultilabel.new(_("Volumes"), h) end # diff --git a/app/helpers/container_service_helper/textual_summary.rb b/app/helpers/container_service_helper/textual_summary.rb index b1b0cce2723..8287d3bc7cd 100644 --- a/app/helpers/container_service_helper/textual_summary.rb +++ b/app/helpers/container_service_helper/textual_summary.rb @@ -22,7 +22,7 @@ def textual_group_port_configs config.node_port ] end - TextualGroup.new(_("Port Configurations"), h) + TextualMultilabel.new(_("Port Configurations"), h) end def textual_group_relationships diff --git a/app/helpers/ems_container_helper/textual_summary.rb b/app/helpers/ems_container_helper/textual_summary.rb index 524b7d8ff9e..d2a04689317 100644 --- a/app/helpers/ems_container_helper/textual_summary.rb +++ b/app/helpers/ems_container_helper/textual_summary.rb @@ -37,7 +37,7 @@ def textual_group_component_statuses (cs.error || "") ] end - TextualGroup.new(_("Component Statuses"), h) + TextualMultilabel.new(_("Component Statuses"), h) end def textual_group_smart_management diff --git a/app/helpers/persistent_volume_helper/textual_summary.rb b/app/helpers/persistent_volume_helper/textual_summary.rb index 3118976a0f3..1e042b2c019 100644 --- a/app/helpers/persistent_volume_helper/textual_summary.rb +++ b/app/helpers/persistent_volume_helper/textual_summary.rb @@ -34,7 +34,7 @@ def textual_group_smart_management def textual_group_capacity labels = [_("Resource"), _("Quantity")] - TextualGroup.new(_("Capacity"), :labels => labels, :values => @record.capacity) + TextualMultilabel.new(_("Capacity"), :labels => labels, :values => @record.capacity) end # diff --git a/spec/controllers/container_build_controller_spec.rb b/spec/controllers/container_build_controller_spec.rb index f04b822048b..5aefba8f1e8 100644 --- a/spec/controllers/container_build_controller_spec.rb +++ b/spec/controllers/container_build_controller_spec.rb @@ -17,6 +17,7 @@ get :show, :params => { :id => container_build.id } expect(response.status).to eq(200) expect(response.body).to_not be_empty + expect(response).to render_template('shared/summary/_textual_multilabel') expect(assigns(:breadcrumbs)).to eq([{:name => "Builds", :url => "/container_build/show_list?page=&refresh=y"}, {:name => "Test Build (Summary)", diff --git a/spec/controllers/container_controller_spec.rb b/spec/controllers/container_controller_spec.rb index 98fac1b4ad1..45876f64d66 100644 --- a/spec/controllers/container_controller_spec.rb +++ b/spec/controllers/container_controller_spec.rb @@ -133,6 +133,7 @@ expect(response).to render_template('layouts/_textual_groups_generic') expect(response).to render_template('shared/summary/_textual_tags') + expect(response).to render_template('shared/summary/_textual_multilabel') expect(response.status).to eq(200) end end diff --git a/spec/controllers/container_group_controller_spec.rb b/spec/controllers/container_group_controller_spec.rb index 74986291403..5d75bf68e28 100644 --- a/spec/controllers/container_group_controller_spec.rb +++ b/spec/controllers/container_group_controller_spec.rb @@ -52,6 +52,7 @@ it do is_expected.to have_http_status 200 is_expected.to render_template(:partial => "layouts/listnav/_container_group") + is_expected.to render_template('shared/summary/_textual_multilabel') end end end diff --git a/spec/controllers/container_image_controller_spec.rb b/spec/controllers/container_image_controller_spec.rb index 7fb47fad613..123631e1029 100644 --- a/spec/controllers/container_image_controller_spec.rb +++ b/spec/controllers/container_image_controller_spec.rb @@ -63,6 +63,7 @@ it do is_expected.to have_http_status 200 is_expected.to render_template(:partial => "layouts/listnav/_container_image") + is_expected.to render_template('shared/summary/_textual_multilabel') end end end diff --git a/spec/controllers/container_node_controller_spec.rb b/spec/controllers/container_node_controller_spec.rb index 25c44646b6f..dac07557e2c 100644 --- a/spec/controllers/container_node_controller_spec.rb +++ b/spec/controllers/container_node_controller_spec.rb @@ -38,6 +38,7 @@ it do is_expected.to have_http_status 200 is_expected.to render_template(:partial => "layouts/listnav/_container_node") + is_expected.to render_template('shared/summary/_textual_multilabel') end end end diff --git a/spec/controllers/container_project_controller_spec.rb b/spec/controllers/container_project_controller_spec.rb index 183eb0205a2..dcc280042d0 100644 --- a/spec/controllers/container_project_controller_spec.rb +++ b/spec/controllers/container_project_controller_spec.rb @@ -38,6 +38,7 @@ it do is_expected.to have_http_status 200 is_expected.to render_template(:partial => "layouts/listnav/_container_project") + is_expected.to render_template('shared/summary/_textual_multilabel') end end end diff --git a/spec/controllers/container_service_controller_spec.rb b/spec/controllers/container_service_controller_spec.rb index 70b94497793..a2c9d21fc57 100644 --- a/spec/controllers/container_service_controller_spec.rb +++ b/spec/controllers/container_service_controller_spec.rb @@ -38,6 +38,7 @@ it do is_expected.to have_http_status 200 is_expected.to render_template(:partial => "layouts/listnav/_container_service") + is_expected.to render_template('shared/summary/_textual_multilabel') end end end diff --git a/spec/controllers/container_template_controller_spec.rb b/spec/controllers/container_template_controller_spec.rb index aeb52919fd9..acf017ca5d3 100644 --- a/spec/controllers/container_template_controller_spec.rb +++ b/spec/controllers/container_template_controller_spec.rb @@ -17,6 +17,7 @@ get :show, :params => { :id => container_template.id } expect(response.status).to eq(200) expect(response.body).to_not be_empty + expect(response).to render_template('shared/summary/_textual_multilabel') expect(assigns(:breadcrumbs)).to eq([{:name => "Container Templates", :url => "/container_template/show_list?page=&refresh=y"}, {:name => "Test Template (Summary)", diff --git a/spec/controllers/persistent_volume_controller_spec.rb b/spec/controllers/persistent_volume_controller_spec.rb index 7474284afe4..206aa54b151 100644 --- a/spec/controllers/persistent_volume_controller_spec.rb +++ b/spec/controllers/persistent_volume_controller_spec.rb @@ -61,6 +61,7 @@ is_expected.to have_http_status 200 is_expected.to render_template(:partial => 'layouts/_textual_groups_generic') is_expected.to render_template(:partial => 'layouts/listnav/_persistent_volume') + is_expected.to render_template('shared/summary/_textual_multilabel') end end end