Hello community,
here is the log from the commit of package yast2-caasp for openSUSE:Factory
checked in at 2017-05-16 14:34:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-caasp (Old)
and /work/SRC/openSUSE:Factory/.yast2-caasp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-caasp"
Tue May 16 14:34:44 2017 rev:2 rq:495218 version:1.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-caasp/yast2-caasp.changes 2017-05-06
20:46:31.649136747 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-caasp.new/yast2-caasp.changes
2017-05-16 14:34:46.314661247 +0200
@@ -1,0 +2,7 @@
+Fri May 12 14:29:47 UTC 2017 - igonzalezs...@suse.com
+
+- Adapt the system roles widget to yast2-installation 3.2.x
+ (bsc#1038854)
+- 1.1.0
+
+-------------------------------------------------------------------
Old:
----
yast2-caasp-1.0.4.tar.bz2
New:
----
yast2-caasp-1.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-caasp.spec ++++++
--- /var/tmp/diff_new_pack.YTvxBx/_old 2017-05-16 14:34:46.818590448 +0200
+++ /var/tmp/diff_new_pack.YTvxBx/_new 2017-05-16 14:34:46.822589887 +0200
@@ -17,7 +17,7 @@
Name: yast2-caasp
-Version: 1.0.4
+Version: 1.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -27,23 +27,23 @@
Requires: yast2
BuildRequires: yast2
# Overview widget
-Requires: yast2-installation >= 3.1.217.34
-BuildRequires: yast2-installation >= 3.1.217.34
+Requires: yast2-installation >= 3.2.38
+BuildRequires: yast2-installation >= 3.2.38
# CFA class
-Requires: yast2-ntp-client >= 3.1.28.1
-BuildRequires: yast2-ntp-client >= 3.1.28.1
+Requires: yast2-ntp-client >= 3.2.6
+BuildRequires: yast2-ntp-client >= 3.2.6
# System information widget
-Requires: yast2-tune >= 3.1.10
-BuildRequires: yast2-tune >= 3.1.10
+Requires: yast2-tune >= 3.2.0
+BuildRequires: yast2-tune >= 3.2.0
# Password widget
-Requires: yast2-users >= 3.1.57.7
-BuildRequires: yast2-users >= 3.1.57.7
+Requires: yast2-users >= 3.2.10
+BuildRequires: yast2-users >= 3.2.10
# Registration widget
-Requires: yast2-registration >= 3.1.190
-BuildRequires: yast2-registration >= 3.1.190
+Requires: yast2-registration >= 3.2.1
+BuildRequires: yast2-registration >= 3.2.1
# new keyboard layout cwm widget
-BuildRequires: yast2-country >= 3.1.33.1
-Requires: yast2-country >= 3.1.33.1
+BuildRequires: yast2-country >= 3.2.10
+Requires: yast2-country >= 3.2.10
# SlpServices.find
Requires: yast2-slp
BuildRequires: yast2-slp
++++++ yast2-caasp-1.0.4.tar.bz2 -> yast2-caasp-1.1.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-caasp-1.0.4/Dockerfile
new/yast2-caasp-1.1.0/Dockerfile
--- old/yast2-caasp-1.0.4/Dockerfile 2017-05-04 11:34:07.878256450 +0200
+++ new/yast2-caasp-1.1.0/Dockerfile 2017-05-16 13:12:10.960075335 +0200
@@ -1,4 +1,4 @@
-FROM yastdevel/ruby:caasp-1_0
+FROM yastdevel/ruby
RUN zypper --gpg-auto-import-keys --non-interactive in --no-recommends \
yast2-ntp-client yast2-tune yast2-registration
COPY . /usr/src/app
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-caasp-1.0.4/Rakefile
new/yast2-caasp-1.1.0/Rakefile
--- old/yast2-caasp-1.0.4/Rakefile 2017-04-28 10:22:09.921214728 +0200
+++ new/yast2-caasp-1.1.0/Rakefile 2017-05-16 13:12:10.960075335 +0200
@@ -1,6 +1,6 @@
require "yast/rake"
-Yast::Tasks.submit_to((ENV["YAST_SUBMIT"] || :casp10).to_sym)
+Yast::Tasks.submit_to((ENV["YAST_SUBMIT"] || :factory).to_sym)
Yast::Tasks.configuration do |conf|
# lets ignore license check for now
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-caasp-1.0.4/package/yast2-caasp.changes
new/yast2-caasp-1.1.0/package/yast2-caasp.changes
--- old/yast2-caasp-1.0.4/package/yast2-caasp.changes 2017-05-04
11:34:07.882256501 +0200
+++ new/yast2-caasp-1.1.0/package/yast2-caasp.changes 2017-05-16
13:12:10.960075335 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri May 12 14:29:47 UTC 2017 - igonzalezs...@suse.com
+
+- Adapt the system roles widget to yast2-installation 3.2.x
+ (bsc#1038854)
+- 1.1.0
+
+-------------------------------------------------------------------
Fri Apr 28 09:26:30 UTC 2017 - igonzalezs...@suse.com
- Move specific CaaSP code from yast2-installation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-caasp-1.0.4/package/yast2-caasp.spec
new/yast2-caasp-1.1.0/package/yast2-caasp.spec
--- old/yast2-caasp-1.0.4/package/yast2-caasp.spec 2017-05-05
17:14:24.427581065 +0200
+++ new/yast2-caasp-1.1.0/package/yast2-caasp.spec 2017-05-16
13:12:10.960075335 +0200
@@ -17,7 +17,7 @@
Name: yast2-caasp
-Version: 1.0.4
+Version: 1.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -27,23 +27,23 @@
Requires: yast2
BuildRequires: yast2
# Overview widget
-Requires: yast2-installation >= 3.1.217.34
-BuildRequires: yast2-installation >= 3.1.217.34
+Requires: yast2-installation >= 3.2.38
+BuildRequires: yast2-installation >= 3.2.38
# CFA class
-Requires: yast2-ntp-client >= 3.1.28.1
-BuildRequires: yast2-ntp-client >= 3.1.28.1
+Requires: yast2-ntp-client >= 3.2.6
+BuildRequires: yast2-ntp-client >= 3.2.6
# System information widget
-Requires: yast2-tune >= 3.1.10
-BuildRequires: yast2-tune >= 3.1.10
+Requires: yast2-tune >= 3.2.0
+BuildRequires: yast2-tune >= 3.2.0
# Password widget
-Requires: yast2-users >= 3.1.57.7
-BuildRequires: yast2-users >= 3.1.57.7
+Requires: yast2-users >= 3.2.10
+BuildRequires: yast2-users >= 3.2.10
# Registration widget
-Requires: yast2-registration >= 3.1.190
-BuildRequires: yast2-registration >= 3.1.190
+Requires: yast2-registration >= 3.2.1
+BuildRequires: yast2-registration >= 3.2.1
# new keyboard layout cwm widget
-BuildRequires: yast2-country >= 3.1.33.1
-Requires: yast2-country >= 3.1.33.1
+BuildRequires: yast2-country >= 3.2.10
+Requires: yast2-country >= 3.2.10
# SlpServices.find
Requires: yast2-slp
BuildRequires: yast2-slp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-caasp-1.0.4/src/lib/y2caasp/widgets/system_role.rb
new/yast2-caasp-1.1.0/src/lib/y2caasp/widgets/system_role.rb
--- old/yast2-caasp-1.0.4/src/lib/y2caasp/widgets/system_role.rb
2017-05-04 11:34:07.882256501 +0200
+++ new/yast2-caasp-1.1.0/src/lib/y2caasp/widgets/system_role.rb
2017-05-16 13:12:10.964075425 +0200
@@ -114,7 +114,7 @@
end
def items
- ::Installation::SystemRole.roles.map do |role|
+ ::Installation::SystemRole.all.map do |role|
[role.id, role.label]
end
end
@@ -134,7 +134,7 @@
private
def roles_help_text
- ::Installation::SystemRole.roles.map do |role|
+ ::Installation::SystemRole.all.map do |role|
role.label + "\n\n" + role.description
end.join("\n\n\n")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-caasp-1.0.4/test/lib/widgets/system_role_test.rb
new/yast2-caasp-1.1.0/test/lib/widgets/system_role_test.rb
--- old/yast2-caasp-1.0.4/test/lib/widgets/system_role_test.rb 2017-05-04
11:34:07.882256501 +0200
+++ new/yast2-caasp-1.1.0/test/lib/widgets/system_role_test.rb 2017-05-16
13:12:10.964075425 +0200
@@ -10,7 +10,15 @@
let(:controller_node_widget) { double("controller_node_widget") }
let(:ntp_server_widget) { double("ntp_server_widget") }
- Yast::ProductControl.GetTranslatedText("roles_caption")
+ let(:test_role) do
+ Installation::SystemRole.new(
+ id: "test_role", label: "Test role", description: "Test description"
+ )
+ end
+
+ before do
+ allow(Installation::SystemRole).to receive(:all).and_return([test_role])
+ end
describe "#label" do
before do
@@ -66,4 +74,45 @@
end
end
end
+
+ describe "#items" do
+ it "return a list of roles ids and labels" do
+ expect(widget.items).to eq([[test_role.id, test_role.label]])
+ end
+ end
+
+ describe "#store" do
+ before do
+ allow(widget).to receive(:value).and_return(test_role.id)
+ allow(test_role).to receive(:overlay_features)
+ allow(test_role).to receive(:adapt_services)
+ end
+
+ it "selects the current role" do
+ expect(Installation::SystemRole).to receive(:select).with(test_role.id)
+ .and_call_original
+ widget.store
+ end
+
+ it "overlays role features" do
+ expect(test_role).to receive(:overlay_features)
+ widget.store
+ end
+
+ it "adapts role services" do
+ expect(test_role).to receive(:adapt_services)
+ widget.store
+ end
+ end
+
+ describe "#help" do
+ before do
+ allow(Yast::ProductControl).to
receive(:GetTranslatedText).with("roles_help")
+ .and_return("help text")
+ end
+
+ it "contains role names" do
+ expect(widget.help).to match(/help text.+Test role/m)
+ end
+ end
end
