From: Jan Provaznik<jprovazn(a)redhat.com>
https://bugzilla.redhat.com/show_bug.cgi?id=664066
---
src/app/util/repository_manager.rb | 2 +-
.../templates/_metagroup_packages.haml | 2 +-
src/features/template.feature | 17 ++++++++++++++---
src/spec/fixtures/packagegroupcategories.json | 2 +-
src/spec/fixtures/packagegroups.json | 4 ++--
src/spec/utils/repository_manager_spec.rb | 2 +-
6 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/app/util/repository_manager.rb b/src/app/util/repository_manager.rb
index 8ada489..6440417 100644
--- a/src/app/util/repository_manager.rb
+++ b/src/app/util/repository_manager.rb
@@ -65,7 +65,7 @@ class RepositoryManager
group = grps.find{|g| g[:id] == gname}
next unless cat and cat[:groups].include?(gname) and group
next if res.find{|g| g[:name] == gname}
- res<< {:name => gname, :packages => group[:packages].keys}
+ res<< {:label => group[:name], :name => gname, :packages =>
group[:packages].keys}
end
res
end
diff --git a/src/app/views/image_factory/templates/_metagroup_packages.haml
b/src/app/views/image_factory/templates/_metagroup_packages.haml
index 3e83d34..82c2697 100644
--- a/src/app/views/image_factory/templates/_metagroup_packages.haml
+++ b/src/app/views/image_factory/templates/_metagroup_packages.haml
@@ -9,7 +9,7 @@
- selected = false
%h5
= check_box_tag 'selected_groups[]', group[:id], selected, {:disabled
=> selected, :id => "group_#{group[:id]}", :class =>
"softwaregroups #{selected ? 'selected' : ''}"}
- = label_tag "group_#{group[:id]}", group[:name]
+ = label_tag "group_#{group[:id]}", group[:label]
%ul
- group[:packages].each do |pkg|
%li
diff --git a/src/features/template.feature b/src/features/template.feature
index 4fe8e9a..922d59f 100644
--- a/src/features/template.feature
+++ b/src/features/template.feature
@@ -21,6 +21,17 @@ Feature: Manage Templates
And I should see "Template saved"
And I should see "mocktemplate"
+ Scenario: Add a package to a new template
+ Given I am on the new image factory template page
+ When I press "Add Software"
+ When I press "admin-tools"
+ Then I should see "System Tools"
+ And I should see "libdeltacloud"
+ When I check "libdeltacloud"
+ And I press "Add Selected"
+ Then I should see "New Template"
+ And I should see "libdeltacloud"
+
Scenario: Add a searched package to a new template
Given I am on the new image factory template page
When I press "Add Software"
@@ -41,7 +52,7 @@ Feature: Manage Templates
And I press "Add Software"
Then I should see "Managed Content Selection"
When I press "Collections"
- And I check "group_conductor"
+ And I check "group_system-tools"
And I press "Add Selected"
Then I should see "Managed Content to Bundle"
And the "tpl[name]" field by name should contain
"mocktemplate"
@@ -61,7 +72,7 @@ Feature: Manage Templates
And I press "Add Software"
Then I should see "Managed Content Selection"
When I press "Collections"
- And I check "group_conductor"
+ And I check "group_system-tools"
And I press "Add Selected"
Then I should see "Managed Content to Bundle"
And the page should contain "#package_libdeltacloud" selector
@@ -103,7 +114,7 @@ Feature: Manage Templates
# test that we see a metagroup
Then I should see an input "admin-tools"
# test that we see a collection (collections are loaded by default)
- And I should see an input "conductor"
+ And I should see an input "system-tools"
Scenario: See upload status
Given there is a "mock1" template
diff --git a/src/spec/fixtures/packagegroupcategories.json
b/src/spec/fixtures/packagegroupcategories.json
index 5b0a05e..ce6809f 100644
--- a/src/spec/fixtures/packagegroupcategories.json
+++ b/src/spec/fixtures/packagegroupcategories.json
@@ -4,7 +4,7 @@
"id" : "base-system",
"immutable" : true,
"name" : "Base System",
- "packagegroupids" : [ "deltacloud" ],
+ "packagegroupids" : [ "system-tools" ],
"repo_defined" : true,
"translated_description" : { },
"translated_name" : { }
diff --git a/src/spec/fixtures/packagegroups.json b/src/spec/fixtures/packagegroups.json
index a556ca9..963ae8a 100644
--- a/src/spec/fixtures/packagegroups.json
+++ b/src/spec/fixtures/packagegroups.json
@@ -1,4 +1,4 @@
-{ "conductor" : { "_id" : "conductor",
+{ "system-tools" : { "_id" : "conductor",
"conditional_package_names" : { },
"default" : true,
"default_package_names" : [ "libdeltacloud",
@@ -10,7 +10,7 @@
"immutable" : true,
"langonly" : null,
"mandatory_package_names" : [ ],
- "name" : "Aeolus Conductor",
+ "name" : "System Tools",
"optional_package_names" : [ ],
"repo_defined" : true,
"translated_description" : { },
diff --git a/src/spec/utils/repository_manager_spec.rb
b/src/spec/utils/repository_manager_spec.rb
index 6c3c9ec..53ce840 100644
--- a/src/spec/utils/repository_manager_spec.rb
+++ b/src/spec/utils/repository_manager_spec.rb
@@ -37,7 +37,7 @@ describe RepositoryManager do
it 'should return a list of packagegroups' do
rep = @rmanager.repositories.first
- rep.groups.first[:id].should == 'conductor'
+ rep.groups.first[:id].should == 'system-tools'
end
it 'should return a list of categories' do