Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2018-09-04 22:51:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Tue Sep 4 22:51:52 2018 rev:411 rq:633039 version:4.1.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2018-08-04 21:50:57.261002030 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2018-09-04 22:51:57.080134635 +0200
@@ -1,0 +2,36 @@
+Tue Sep 4 13:34:17 UTC 2018 - [email protected]
+
+- Use /media.1/media instead the /media.1/build (bsc#1062297)
+- 4.1.13
+
+-------------------------------------------------------------------
+Mon Sep 3 08:38:32 UTC 2018 - [email protected]
+
+- Add missing help for disks activation dialog (bsc#1098563)
+- 4.1.12
+
+-------------------------------------------------------------------
+Fri Aug 24 14:42:15 UTC 2018 - [email protected]
+
+- Improve help text for system roles (bsc#1046619)
+- 4.1.11
+
+-------------------------------------------------------------------
+Thu Aug 23 07:24:18 UTC 2018 - [email protected]
+
+- Update calls to YaST2 systemd classes (related to fate#319428)
+- 4.1.10
+
+-------------------------------------------------------------------
+Fri Aug 22 16:35:47 CEST 2018 - [email protected]
+
+- Add an option to have a sidebar (boo#1088785)
+- 4.1.9
+
+-------------------------------------------------------------------
+Mon Aug 20 15:18:28 CEST 2018 - [email protected]
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+- Changed dir of COPYING file.
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-4.1.8.tar.bz2
New:
----
yast2-installation-4.1.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.L6wZac/_old 2018-09-04 22:51:57.624136500 +0200
+++ /var/tmp/diff_new_pack.L6wZac/_new 2018-09-04 22:51:57.628136514 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 4.1.8
+Version: 4.1.13
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -28,7 +28,7 @@
Requires: yast2-ruby-bindings >= 4.0.6
Summary: YaST2 - Installation Parts
-License: GPL-2.0
+License: GPL-2.0-only
Group: System/YaST
Source1: YaST2-Second-Stage.service
@@ -43,8 +43,10 @@
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(yast-rake)
-# TextHelpers#div_with_direction
-BuildRequires: yast2 >= 4.0.72
+# Yast2::Systemd::Service
+BuildRequires: yast2 >= 4.1.3
+Requires: yast2 >= 4.1.3
+
# Yast::Packages.check_remote_installation_packages
BuildRequires: yast2-packager >= 4.0.9
@@ -52,9 +54,6 @@
BuildRequires: yast2-storage-ng >= 4.0.194
Requires: yast2-storage-ng >= 4.0.175
-# TextHelpers#div_with_direction
-Requires: yast2 >= 4.0.72
-
# Language::GetLanguageItems and other API
# Language::Set (handles downloading the translation extensions)
Requires: yast2-country-data >= 2.16.11
@@ -253,7 +252,7 @@
%dir %{yast_vardir}/hooks/installation
%dir %{yast_docdir}
-%doc %{yast_docdir}/COPYING
+%license %{yast_docdir}/COPYING
%doc %{yast_docdir}/README.md
%doc %{yast_docdir}/CONTRIBUTING.md
++++++ yast2-installation-4.1.8.tar.bz2 -> yast2-installation-4.1.13.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.1.8/package/yast2-installation.changes
new/yast2-installation-4.1.13/package/yast2-installation.changes
--- old/yast2-installation-4.1.8/package/yast2-installation.changes
2018-08-02 16:12:03.000000000 +0200
+++ new/yast2-installation-4.1.13/package/yast2-installation.changes
2018-09-04 16:13:02.000000000 +0200
@@ -1,4 +1,40 @@
-------------------------------------------------------------------
+Tue Sep 4 13:34:17 UTC 2018 - [email protected]
+
+- Use /media.1/media instead the /media.1/build (bsc#1062297)
+- 4.1.13
+
+-------------------------------------------------------------------
+Mon Sep 3 08:38:32 UTC 2018 - [email protected]
+
+- Add missing help for disks activation dialog (bsc#1098563)
+- 4.1.12
+
+-------------------------------------------------------------------
+Fri Aug 24 14:42:15 UTC 2018 - [email protected]
+
+- Improve help text for system roles (bsc#1046619)
+- 4.1.11
+
+-------------------------------------------------------------------
+Thu Aug 23 07:24:18 UTC 2018 - [email protected]
+
+- Update calls to YaST2 systemd classes (related to fate#319428)
+- 4.1.10
+
+-------------------------------------------------------------------
+Fri Aug 22 16:35:47 CEST 2018 - [email protected]
+
+- Add an option to have a sidebar (boo#1088785)
+- 4.1.9
+
+-------------------------------------------------------------------
+Mon Aug 20 15:18:28 CEST 2018 - [email protected]
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+- Changed dir of COPYING file.
+
+-------------------------------------------------------------------
Thu Aug 2 09:05:07 UTC 2018 - [email protected]
- Disable display of status messages on the console (bsc#1099505).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.1.8/package/yast2-installation.spec
new/yast2-installation-4.1.13/package/yast2-installation.spec
--- old/yast2-installation-4.1.8/package/yast2-installation.spec
2018-08-02 16:12:03.000000000 +0200
+++ new/yast2-installation-4.1.13/package/yast2-installation.spec
2018-09-04 16:13:02.000000000 +0200
@@ -16,14 +16,14 @@
#
Name: yast2-installation
-Version: 4.1.8
+Version: 4.1.13
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
Group: System/YaST
-License: GPL-2.0
+License: GPL-2.0-only
Url: http://github.com/yast/yast-installation
# for AbortException and handle direct abort
Requires: yast2-ruby-bindings >= 4.0.6
@@ -42,8 +42,10 @@
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(yast-rake)
-# TextHelpers#div_with_direction
-BuildRequires: yast2 >= 4.0.72
+# Yast2::Systemd::Service
+BuildRequires: yast2 >= 4.1.3
+Requires: yast2 >= 4.1.3
+
# Yast::Packages.check_remote_installation_packages
BuildRequires: yast2-packager >= 4.0.9
@@ -51,9 +53,6 @@
BuildRequires: yast2-storage-ng >= 4.0.194
Requires: yast2-storage-ng >= 4.0.175
-# TextHelpers#div_with_direction
-Requires: yast2 >= 4.0.72
-
# Language::GetLanguageItems and other API
# Language::Set (handles downloading the translation extensions)
Requires: yast2-country-data >= 2.16.11
@@ -252,6 +251,6 @@
%dir %{yast_vardir}/hooks/installation
%dir %{yast_docdir}
-%doc %{yast_docdir}/COPYING
+%license %{yast_docdir}/COPYING
%doc %{yast_docdir}/README.md
%doc %{yast_docdir}/CONTRIBUTING.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.1.8/src/lib/installation/clients/copy_files_finish.rb
new/yast2-installation-4.1.13/src/lib/installation/clients/copy_files_finish.rb
---
old/yast2-installation-4.1.8/src/lib/installation/clients/copy_files_finish.rb
2018-08-02 16:12:03.000000000 +0200
+++
new/yast2-installation-4.1.13/src/lib/installation/clients/copy_files_finish.rb
2018-09-04 16:13:02.000000000 +0200
@@ -80,8 +80,10 @@
# FIXME: probably won't work as expected with new multimedia layout.
# Ideally final modified control.xml should be saved.
copy_control_file
- # Copy /media.1/build to the installed system (fate#311377)
- copy_build_file
+
+ # Copy /media.1/media to the installed system (fate#311377)
+ # Formerly /media.1/build (bsc#1062297)
+ copy_media_file
copy_product_profiles
# List of files used as additional workflow definitions
@@ -303,19 +305,24 @@
::FileUtils.chmod(0o644, destination)
end
- def copy_build_file
- build_file = Pkg.SourceProvideOptionalFile(
- Packages.GetBaseSourceID,
- 1,
- "/media.1/build"
- )
-
- return unless build_file
+ def copy_media_file
+ media_file = Pkg.SourceProvideOptionalFile(Packages.GetBaseSourceID, 1,
"/media.1/media")
- log.info "Copying /media.1/build file"
- destination = File.join(Installation.destdir, Directory.etcdir, "build")
- ::FileUtils.cp(build_file, destination)
- ::FileUtils.chmod(0o644, destination)
+ if media_file
+ log.info("Copying /media.1/media file to /media")
+ media_destination = File.join(Installation.destdir, Directory.etcdir,
"media")
+ ::FileUtils.cp(media_file, media_destination)
+ ::FileUtils.chmod(0o644, media_destination)
+
+ # FIXME: `/build` is deprecated, only kept for backward compatibility.
It must be removed
+ # as soon it will not longer needed.
+ log.info("Copying /media.1/media file to /build (backward
compatibility)")
+ build_destination = File.join(Installation.destdir, Directory.etcdir,
"build")
+ ::FileUtils.cp(media_file, build_destination)
+ ::FileUtils.chmod(0o644, build_destination)
+ else
+ log.error("Cannot find /media.1/media file")
+ end
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.1.8/src/lib/installation/clients/inst_disks_activate.rb
new/yast2-installation-4.1.13/src/lib/installation/clients/inst_disks_activate.rb
---
old/yast2-installation-4.1.8/src/lib/installation/clients/inst_disks_activate.rb
2018-08-02 16:12:03.000000000 +0200
+++
new/yast2-installation-4.1.13/src/lib/installation/clients/inst_disks_activate.rb
2018-09-04 16:13:02.000000000 +0200
@@ -75,11 +75,6 @@
@want_fcoe = Linuxrc.InstallInf("WithFCoE") == "1"
- # dialog caption
- @caption = _("Disk Activation")
-
- @help = ""
-
missing_part = [
VSpacing(0),
VSpacing(0)
@@ -169,9 +164,10 @@
def show_base_dialog
Wizard.SetContents(
- @caption,
+ # TRANSLATORS: dialog caption
+ _("Disk Activation"),
@contents,
- @help,
+ help,
GetInstArgs.enable_back,
GetInstArgs.enable_next
)
@@ -204,5 +200,51 @@
enable_back ? Wizard.EnableBackButton : Wizard.DisableBackButton
enable_next ? Wizard.EnableNextButton : Wizard.DisableNextButton
end
+
+ def help
+ network_button_help +
+ dasd_button_help +
+ zfcp_button_help +
+ fcoe_button_help +
+ iscsi_button_help
+ end
+
+ def network_button_help
+ # TRANSLATORS: Help text for "Network configuration..." button in the
Disks activation dialog
+ _("<h2>Network configuration</h2>" \
+ "Launches the Network configuration dialog.")
+ end
+
+ def dasd_button_help
+ return "" unless @have_dasd
+
+ # TRANSLATORS: Help text for "Configure DASD Disks" button in the Disks
activation dialog
+ _("<h2>Configure DASD Disks</h2>" \
+ "Opens the dialog to configure the " \
+ "<b>D</b>irect <b>A</b>ccess <b>S</b>torage <b>D</b>isks.")
+ end
+
+ def zfcp_button_help
+ return "" unless @have_zfcp
+
+ # TRANSLATORS: Help text for "Configure zFCP Disks" button in the Disks
activation dialog
+ _("<h2>Configure zFCP Disks</h2>" \
+ "Allows to configure the Fibre Channel Attached SCSI Disks.")
+ end
+
+ def fcoe_button_help
+ return "" unless @want_fcoe
+
+ # TRANSLATORS: Help text for "Configure FCoE Interfaces" button in the
Disks activation dialog
+ _("<h2>Configure FCoE Interfaces</h2>" \
+ "Shows the dialog to manage the " \
+ "<b>F</b>ibre <b>C</b>hannel <b>o</b>ver <b>E</b>thernet interfaces.")
+ end
+
+ def iscsi_button_help
+ # TRANSLATORS: Help text for "Configure iSCSI Disks" button in the Disks
activation dialog
+ _("<h2>Configure iSCSI Disks</h2>" \
+ "Executes the iSCSI initiator configuration.")
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.1.8/src/lib/installation/clients/installation.rb
new/yast2-installation-4.1.13/src/lib/installation/clients/installation.rb
--- old/yast2-installation-4.1.8/src/lib/installation/clients/installation.rb
2018-08-02 16:12:03.000000000 +0200
+++ new/yast2-installation-4.1.13/src/lib/installation/clients/installation.rb
2018-09-04 16:13:02.000000000 +0200
@@ -41,6 +41,8 @@
Yast.import "Hooks"
Yast.import "Linuxrc"
Yast.import "OSRelease"
+ Yast.import "ProductFeatures"
+ Yast.import "ProductControl"
# log the inst-sys identification for easier debugging
log_os_release
@@ -48,8 +50,13 @@
Hooks.search_path.join!("installation")
# Initialize the UI
- UI.SetProductLogo(true)
- Wizard.OpenLeftTitleNextBackDialog
+ if ProductFeatures.GetStringFeature("globals", "installation_ui") ==
"sidebar"
+ UI.SetProductLogo(false)
+ Wizard.OpenNextBackStepsDialog
+ else
+ UI.SetProductLogo(true)
+ Wizard.OpenLeftTitleNextBackDialog
+ end
Wizard.SetContents(
# title
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.1.8/src/lib/installation/services.rb
new/yast2-installation-4.1.13/src/lib/installation/services.rb
--- old/yast2-installation-4.1.8/src/lib/installation/services.rb
2018-08-02 16:12:03.000000000 +0200
+++ new/yast2-installation-4.1.13/src/lib/installation/services.rb
2018-09-04 16:13:02.000000000 +0200
@@ -1,6 +1,5 @@
require "yast"
-
-Yast.import "SystemdService"
+require "yast2/systemd/service"
module Installation
# Represents services manipulation in installation.
@@ -34,7 +33,7 @@
def write
enabled.each do |service|
log.info "Enabling service #{service}"
- s = Yast::SystemdService.find!(service)
+ s = Yast2::Systemd::Service.find!(service)
s.enable
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.1.8/src/lib/installation/widgets/system_role_reader.rb
new/yast2-installation-4.1.13/src/lib/installation/widgets/system_role_reader.rb
---
old/yast2-installation-4.1.8/src/lib/installation/widgets/system_role_reader.rb
2018-08-02 16:12:03.000000000 +0200
+++
new/yast2-installation-4.1.13/src/lib/installation/widgets/system_role_reader.rb
2018-09-04 16:13:02.000000000 +0200
@@ -18,6 +18,11 @@
# To contact SUSE about this file by physical or electronic mail, you may find
# current contact information at www.suse.com.
#
------------------------------------------------------------------------------
+
+require "yast"
+
+Yast.import "HTML"
+
module Installation
module Widgets
# Common methods for system roles widgets
@@ -43,7 +48,7 @@
end
def help
- Yast::ProductControl.GetTranslatedText("roles_help") + "\n\n" +
roles_help_text
+ "<p>" + Yast::ProductControl.GetTranslatedText("roles_help") +
"</p>\n" + roles_help_text
end
def store
@@ -57,7 +62,9 @@
private
def roles_help_text
- ::Installation::SystemRole.all.map { |r|
"#{r.label}\n\n#{r.description}" }.join("\n\n\n")
+ ::Installation::SystemRole.all.map do |role|
+ "<p>#{Yast::HTML.Heading(role.label)}\n\n#{role.description}</p>"
+ end.join("\n")
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.1.8/test/copy_files_finish_test.rb
new/yast2-installation-4.1.13/test/copy_files_finish_test.rb
--- old/yast2-installation-4.1.8/test/copy_files_finish_test.rb 2018-08-02
16:12:03.000000000 +0200
+++ new/yast2-installation-4.1.13/test/copy_files_finish_test.rb
2018-09-04 16:13:02.000000000 +0200
@@ -148,18 +148,40 @@
subject.write
end
- it "copies build file" do
- allow(Yast::Pkg).to receive(:SourceProvideOptionalFile).with(1, 1,
"/media.1/build")
- .and_return("/media.1/build")
+ it "copies media file to /media" do
+ allow(Yast::Pkg).to receive(:SourceProvideOptionalFile)
+ .with(1, 1, "/media.1/media")
+ .and_return("/media.1/media")
- expect(::FileUtils).to receive(:cp).with("/media.1/build",
"/mnt/etc/YaST2/build")
+ expect(::FileUtils).to receive(:cp).with("/media.1/media",
"/mnt/etc/YaST2/media")
subject.write
end
- it "ensures proper permission on copied build file" do
- allow(Yast::Pkg).to receive(:SourceProvideOptionalFile).with(1, 1,
"/media.1/build")
- .and_return("/media.1/build")
+ it "copies media file to /build (backward compatibility)" do
+ allow(Yast::Pkg).to receive(:SourceProvideOptionalFile)
+ .with(1, 1, "/media.1/media")
+ .and_return("/media.1/media")
+
+ expect(::FileUtils).to receive(:cp).with("/media.1/media",
"/mnt/etc/YaST2/build")
+
+ subject.write
+ end
+
+ it "ensures proper permission on copied /media file" do
+ allow(Yast::Pkg).to receive(:SourceProvideOptionalFile)
+ .with(1, 1, "/media.1/media")
+ .and_return("/media.1/media")
+
+ expect(::FileUtils).to receive(:chmod).with(0o644,
"/mnt/etc/YaST2/media")
+
+ subject.write
+ end
+
+ it "ensures proper permission on copied /build file (backward
compatibility)" do
+ allow(Yast::Pkg).to receive(:SourceProvideOptionalFile)
+ .with(1, 1, "/media.1/media")
+ .and_return("/media.1/media")
expect(::FileUtils).to receive(:chmod).with(0o644,
"/mnt/etc/YaST2/build")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.1.8/test/inst_disks_activate_test.rb
new/yast2-installation-4.1.13/test/inst_disks_activate_test.rb
--- old/yast2-installation-4.1.8/test/inst_disks_activate_test.rb
2018-08-02 16:12:03.000000000 +0200
+++ new/yast2-installation-4.1.13/test/inst_disks_activate_test.rb
2018-09-04 16:13:02.000000000 +0200
@@ -6,61 +6,138 @@
describe Yast::InstDisksActivateClient do
describe "#main" do
- let(:probed_disks) { [] }
let(:s390) { false }
+ let(:dasd_disks) { [] }
+ let(:zfcp_disks) { [] }
before do
Y2Storage::StorageManager.create_test_instance
- allow(Yast::Linuxrc).to
receive(:InstallInf).with("WithFCoE").and_return("0")
allow(Yast::UI).to receive(:OpenDialog)
allow(Yast::UI).to receive(:CloseDialog)
allow(Yast::Popup).to
receive(:ConfirmAbort).with(:painless).and_return(true)
allow(Yast::Arch).to receive(:s390).and_return(s390)
allow(Yast::GetInstArgs).to receive(:going_back) { going_back }
+ allow(Yast::Linuxrc).to
receive(:InstallInf).with("WithFCoE").and_return("0")
+ allow(Yast::UI).to receive(:UserInput).and_return(:abort)
allow(Y2Storage::StorageManager.instance).to receive(:probe)
+ allow(Yast::SCR).to receive(:Read).with(path(".probe.disk"))
+ .and_return(dasd_disks)
+ allow(Yast::SCR).to receive(:Read).with(path(".probe.storage"))
+ .and_return(zfcp_disks)
+
+ allow(subject).to receive(:Id)
+ allow(subject).to receive(:PushButton)
+
stub_const("Yast::Packages", double(GetBaseSourceID: 0))
end
+ it "includes help for Network configuration button" do
+ expect(Yast::Wizard).to receive(:SetContents)
+ .with(anything, anything, /Network configuration/, any_args)
+
+ subject.main
+ end
+
+ it "includes help for iSCSI disks button" do
+ expect(Yast::Wizard).to receive(:SetContents)
+ .with(anything, anything, /Configure iSCSI Disks/, any_args)
+
+ subject.main
+ end
+
context "when architecture is s390" do
let(:s390) { true }
- before do
- allow(Yast::UI).to receive(:UserInput).and_return(:abort)
- end
- it "detects DASD disks" do
- expect(Yast::SCR).to receive(:Read).with(path(".probe.disk"))
- .and_return(probed_disks)
- allow(Yast::SCR).to receive(:Read).with(path(".probe.storage"))
- .and_return(probed_disks)
- expect(subject).to receive(:show_base_dialog)
+ context "and DASD disks are detected" do
+ let(:dasd_disks) { [{ "device" => "DASD" }] }
- expect(subject.main).to eq(:abort)
+ before do
+ allow(subject).to
receive(:Id).with(:dasd).and_return("dasd_button_id")
+ end
+
+ it "includes button to configure them" do
+ expect(subject).to receive(:PushButton).with("dasd_button_id",
any_args)
+
+ subject.main
+ end
+
+ it "includes help for DASD button" do
+ expect(Yast::Wizard).to receive(:SetContents)
+ .with(anything, anything, /Configure DASD/, any_args)
+
+ subject.main
+ end
+
+ context "and DASD button is clicked" do
+ before do
+ allow(Yast::UI).to receive(:UserInput).and_return(:dasd, :abort)
+ end
+
+ it "calls inst_dasd client" do
+ expect(Yast::WFM).to receive(:call).with("inst_dasd")
+ expect(subject).to receive(:show_base_dialog).twice
+
+ subject.main
+ end
+ end
end
- it "detects zFCP disks" do
- allow(Yast::SCR).to receive(:Read).with(path(".probe.disk"))
- .and_return(probed_disks)
- expect(Yast::SCR).to receive(:Read).with(path(".probe.storage"))
- .and_return(probed_disks)
- expect(subject).to receive(:show_base_dialog)
+ context "and zFCP disks are detected" do
+ let(:zfcp_disks) { [{ "device" => "zFCP controller" }] }
- expect(subject.main).to eq(:abort)
+ before do
+ allow(subject).to
receive(:Id).with(:zfcp).and_return("zfcp_button_id")
+ end
+
+ it "includes button to configure them" do
+ expect(subject).to receive(:PushButton).with("zfcp_button_id",
any_args)
+
+ subject.main
+ end
+
+ it "includes help for zFCP button" do
+ expect(Yast::Wizard).to receive(:SetContents)
+ .with(anything, anything, /Configure zFCP/, any_args)
+
+ subject.main
+ end
+
+ context "and zFCP button is clicked" do
+ before do
+ allow(Yast::UI).to receive(:UserInput).and_return(:zfcp, :abort)
+ end
+
+ it "calls inst_dasd client" do
+ expect(Yast::WFM).to receive(:call).with("inst_zfcp")
+ expect(subject).to receive(:show_base_dialog).twice
+
+ subject.main
+ end
+ end
end
- end
- context "when dasd button is clicked" do
- before do
- allow(Yast::UI).to receive(:UserInput).and_return(:dasd, :abort)
- end
+ context "and FCoE is available" do
+ before do
+ allow(Yast::Linuxrc).to
receive(:InstallInf).with("WithFCoE").and_return("1")
+
+ allow(subject).to
receive(:Id).with(:fcoe).and_return("fcoe_button_id")
+ end
+
+ it "includes button to configure it" do
+ expect(subject).to receive(:PushButton).with("fcoe_button_id",
any_args)
+
+ subject.main
+ end
- it "calls inst_dasd client" do
- expect(Yast::WFM).to receive(:call).with("inst_dasd")
- expect(subject).to receive(:show_base_dialog).twice
+ it "includes help for FCoE button" do
+ expect(Yast::Wizard).to receive(:SetContents)
+ .with(anything, anything, /Configure FCoE/, any_args)
- subject.main
+ subject.main
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.1.8/test/lib/widgets/system_role_reader_test.rb
new/yast2-installation-4.1.13/test/lib/widgets/system_role_reader_test.rb
--- old/yast2-installation-4.1.8/test/lib/widgets/system_role_reader_test.rb
2018-08-02 16:12:03.000000000 +0200
+++ new/yast2-installation-4.1.13/test/lib/widgets/system_role_reader_test.rb
2018-09-04 16:13:02.000000000 +0200
@@ -2,6 +2,7 @@
require_relative "../../test_helper"
require "installation/widgets/system_role_reader"
+require "installation/system_role"
describe ::Installation::Widgets::SystemRoleReader do
class DummySystemRoleReader
@@ -86,7 +87,9 @@
describe "#help" do
it "returns role help" do
- expect(subject.help).to include("Default Role\n\nRole description")
+ expect(subject.help).to include("Default Role")
+ expect(subject.help).to include("Role description")
+ expect(subject.help).to include("Alternate Role")
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-4.1.8/test/services_test.rb
new/yast2-installation-4.1.13/test/services_test.rb
--- old/yast2-installation-4.1.8/test/services_test.rb 2018-08-02
16:12:03.000000000 +0200
+++ new/yast2-installation-4.1.13/test/services_test.rb 2018-09-04
16:13:02.000000000 +0200
@@ -36,16 +36,16 @@
it "enables all services previously set" do
described_class.enabled = ["test"]
service = double(enable: true)
- expect(Yast::SystemdService).to
receive(:find!).with("test").and_return(service)
+ expect(Yast2::Systemd::Service).to
receive(:find!).with("test").and_return(service)
expect(service).to receive(:enable)
described_class.write
end
- it "raises Yast::SystemdServiceNotFound exception if service to enable
does not exist" do
+ it "raises Yast2::Systemd::ServiceNotFound exception if service to enable
does not exist" do
described_class.enabled = ["non-existing-service"]
- expect { described_class.write }.to
raise_error(Yast::SystemdServiceNotFound)
+ expect { described_class.write }.to
raise_error(Yast2::Systemd::ServiceNotFound)
end
end
end
