diff --git a/README.md b/README.md index 75a47e4..aa79070 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # YaST - The FTP Server Configuration Module # -[![Travis Build](https://travis-ci.org/yast/yast-ftp-server.svg?branch=master)](https://travis-ci.org/yast/yast-ftp-server) -[![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-ftp-server-master.svg)](https://ci.opensuse.org/view/Yast/job/yast-ftp-server-master/) -[![Coverage Status](https://img.shields.io/coveralls/yast/yast-ftp-server/master.svg)](https://coveralls.io/github/yast/yast-ftp-server?branch=master) +[![Workflow Status](https://github.com/yast/yast-ftp-server/workflows/CI/badge.svg?branch=master)]( +https://github.com/yast/yast-ftp-server/actions?query=branch%3Amaster) +[![Jenkins Status](https://ci.opensuse.org/buildStatus/icon?job=yast-yast-ftp-server-master)]( +https://ci.opensuse.org/view/Yast/job/yast-yast-ftp-server-master/) +[![Coverage Status](https://coveralls.io/repos/github/yast/yast-ftp-server/badge.svg?branch=master)]( +https://coveralls.io/github/yast/yast-ftp-server?branch=master) diff --git a/package/yast2-ftp-server.changes b/package/yast2-ftp-server.changes index 296cdb8..a4d300f 100644 --- a/package/yast2-ftp-server.changes +++ b/package/yast2-ftp-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 21 09:02:31 UTC 2022 - Ladislav Slezák + +- Unify YaST module mocking in unit tests (related to bsc#1194784) +- 4.4.2 + ------------------------------------------------------------------- Wed Jun 9 07:11:51 UTC 2021 - Imobach Gonzalez Sosa diff --git a/package/yast2-ftp-server.spec b/package/yast2-ftp-server.spec index 0fa2abc..8537ced 100644 --- a/package/yast2-ftp-server.spec +++ b/package/yast2-ftp-server.spec @@ -17,7 +17,7 @@ Name: yast2-ftp-server -Version: 4.4.1 +Version: 4.4.2 Release: 0 Summary: YaST2 - FTP configuration License: GPL-2.0-only diff --git a/test/spec_helper.rb b/test/spec_helper.rb index 18bb62c..ce703d2 100644 --- a/test/spec_helper.rb +++ b/test/spec_helper.rb @@ -25,14 +25,7 @@ ENV["LANG"] = "en_US.utf-8" require "yast" - -# stub module to prevent its Import -# Useful for modules from different yast packages, to avoid build dependencies -def stub_module(name) - Yast.const_set name.to_sym, Class.new { def self.fake_method; end } -end - -stub_module("Users") +require "yast/rspec" RSpec.configure do |config| config.mock_with :rspec do |c| @@ -69,3 +62,6 @@ def stub_module(name) ] end end + +# stub classes from other modules to avoid build dependencies +Yast::RSpec::Helpers.define_yast_module("Users")