Merge 45f0e41 into 88189bd

yast · Aug 11, 2015 · a3b89e8 · a3b89e8
2 parents 88189bd + 45f0e41
commit a3b89e8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ before_install:
     # disable rvm, use system Ruby
     - rvm reset
     - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
-    - sh ./travis_setup.sh -p "yast2-devtools yast2 yast2-packager yast2-installation rake" -g "gettext yast-rake yard rspec:3.3.0 simplecov coveralls rubocop:0.29.1"
+    - sh ./travis_setup.sh -p "yast2-devtools yast2 yast2-packager yast2-installation yast2-update yast2-country rake" -g "gettext yast-rake yard rspec:3.3.0 simplecov coveralls rubocop:0.29.1"
 script:
     - rake check:syntax
     - rake check:pot

diff --git a/package/yast2-migration.spec b/package/yast2-migration.spec
@@ -34,6 +34,7 @@ BuildRequires:  yast2-packager
 BuildRequires:  yast2-ruby-bindings
 # needed in build for testing
 BuildRequires:  yast2-installation >= 3.1.137
+BuildRequires:  yast2-update
 Requires:	yast2 >= 3.1.130
 Requires:	yast2-packager
 Requires:	yast2-pkg-bindings

diff --git a/test/main_workflow_test.rb b/test/main_workflow_test.rb
@@ -18,18 +18,6 @@
 # current contact information at www.suse.com.
 # ------------------------------------------------------------------------------
 
-# fake Update class to avoid loading all Update dependencies
-module Yast
-  # Faked Update module
-  class UpdateClass
-    # we need at least one non-default methods, otherwise ruby-bindings thinks
-    # it is just namespace
-    def fake_method
-    end
-  end
-  Update = UpdateClass.new
-end
-
 require_relative "test_helper"
 
 require "migration/main_workflow"