Merge pull request #45 from yast/build_fix

Build fix
yast · Nov 29, 2018 · 1079d57 · 1079d57
2 parents ba998fc + 5a4a217
commit 1079d57
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/package/yast2-migration.changes b/package/yast2-migration.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 29 09:15:35 UTC 2018 - lslezak@suse.cz
+
+- Build fix, update unit tests related to the icon handling
+  (boo#1109310)
+- 4.1.1
+
 -------------------------------------------------------------------
 Sun Nov 25 18:07:13 UTC 2018 - Stasiek Michalski <hellcp@mailbox.org>
 

diff --git a/package/yast2-migration.spec b/package/yast2-migration.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-migration
-Version:        4.1.0
+Version:        4.1.1
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/test/main_workflow_test.rb b/test/main_workflow_test.rb
@@ -105,8 +105,8 @@ def mock_client(name, res)
 
     it "creates a pre snapshot before starting the migration" do
       expect(Yast::SCR).to receive(:Execute).with(bash_path, /snapper create .*--type=pre/)
-        .and_return(snapshot_created).ordered
-      mock_client("inst_rpmcopy", :next).ordered
+        .and_return(snapshot_created)
+      mock_client("inst_rpmcopy", :next)
 
       expect_any_instance_of(Migration::Restarter).to receive(:restart_yast)
         .with(pre_snapshot: 146, step: :restart_after_migration)

diff --git a/test/proposal_store_test.rb b/test/proposal_store_test.rb
@@ -72,12 +72,6 @@ module Yast
       end
     end
 
-    describe ".icon" do
-      it "returns 'yast-software'" do
-        expect(subject.icon).to eq "yast-software"
-      end
-    end
-
     describe ".tabs?" do
       it "returns false" do
         expect(subject.tabs?).to eq false

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -29,9 +29,9 @@
     add_filter "/test/"
   end
 
-  # for coverage we need to load all ruby files
+  # track all ruby files under src
   src_location = File.expand_path("../../src", __FILE__)
-  Dir["#{src_location}/{module,lib}/**/*.rb"].each { |f| require_relative f }
+  SimpleCov.track_files("#{src_location}/**/*.rb")
 
   # use coveralls for on-line code coverage reporting at Travis CI
   if ENV["TRAVIS"]