Merge pull request #201 from yast/popup_test

fixed popup_test.rb, added test_helper.rb
yast · Mar 27, 2014 · 7f3bf8c · 7f3bf8c
2 parents edcecc5 + 105c3c6
commit 7f3bf8c
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 9 deletions.
diff --git a/library/general/test/Makefile.am b/library/general/test/Makefile.am
@@ -2,9 +2,10 @@ TESTS = \
   asciifile_test.rb \
   linuxrc_test.rb \
   hooks_test.rb \
+  os_release_test.rb \
   popup_test.rb
 
 TEST_EXTENSIONS = .rb
 RB_LOG_COMPILER = rspec
 VERBOSE = 1
-EXTRA_DIST = $(TESTS)
+EXTRA_DIST = $(TESTS) test_helper.rb
diff --git a/library/general/test/asciifile_test.rb b/library/general/test/asciifile_test.rb
@@ -1,6 +1,6 @@
 #! /usr/bin/env rspec
 
-ENV["Y2DIR"] = File.expand_path("../../src", __FILE__)
+require File.expand_path("../test_helper.rb", __FILE__)
 
 require "yast"
 include Yast

diff --git a/library/general/test/hooks_test.rb b/library/general/test/hooks_test.rb
@@ -1,6 +1,6 @@
 #! /usr/bin/env rspec
 
-ENV["Y2DIR"] = File.expand_path("../../src", __FILE__)
+require File.expand_path("../test_helper.rb", __FILE__)
 
 require "yast"
 

diff --git a/library/general/test/linuxrc_test.rb b/library/general/test/linuxrc_test.rb
@@ -1,6 +1,6 @@
 #! /usr/bin/rspec
 
-ENV["Y2DIR"] = File.expand_path("../../src", __FILE__)
+require File.expand_path("../test_helper.rb", __FILE__)
 
 require "yast"
 include Yast

diff --git a/library/general/test/os_release_test.rb b/library/general/test/os_release_test.rb
@@ -1,8 +1,6 @@
 #! /usr/bin/env rspec
 
-top_srcdir = File.expand_path("../../../..", __FILE__)
-inc_dirs = Dir.glob("#{top_srcdir}/library/*/src")
-ENV["Y2DIR"] = inc_dirs.join(":")
+require File.expand_path("../test_helper.rb", __FILE__)
 
 require "yast"
 

diff --git a/library/general/test/popup_test.rb b/library/general/test/popup_test.rb
@@ -1,6 +1,6 @@
 #! /usr/bin/env rspec
 
-ENV["Y2DIR"] = File.expand_path("../../src", __FILE__)
+require File.expand_path("../test_helper.rb", __FILE__)
 
 require "yast"
 include Yast

diff --git a/library/general/test/test_helper.rb b/library/general/test/test_helper.rb
@@ -0,0 +1,5 @@
+
+top_srcdir = File.expand_path("../../../..", __FILE__)
+inc_dirs = Dir.glob("#{top_srcdir}/library/*/src")
+ENV["Y2DIR"] = inc_dirs.join(":")
+
diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 27 10:03:16 UTC 2014 - lslezak@suse.cz
+
+- fixed popup_test
+- 3.1.31
+
 -------------------------------------------------------------------
 Wed Mar 26 17:02:08 UTC 2014 - lslezak@suse.cz
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        3.1.30
+Version:        3.1.31
 Release:        0
 URL:            https://github.com/yast/yast-yast2