This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "YaST web service".
The branch, master has been updated
via 51a352ef21eb051f8577f2ab831077b0c213eefa (commit)
from 59fe8c5ab930c4e9f49890ac8c633342c6528d75 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 51a352ef21eb051f8577f2ab831077b0c213eefa
Author: Klaus Kämpf
Date: Thu Jun 25 15:16:18 2009 +0200
Enable code coverage testing
- move RAILS_PARENT detection from test/test_helper.rb to
config/rails_parent.rb
- use this in test/test_helper.rb and Rakefile
- load the Rails environment from RAILS_PARENT
(enables use of RAILS_PARENT/vendor/plugins and thus rails_rcov)
Now you can do local (per plugin) coverage testing.
-----------------------------------------------------------------------
Summary of changes and diff:
plugins/commandline/.gitignore | 1 +
plugins/commandline/Rakefile | 3 +++
.../config/rails_parent.rb | 0
plugins/commandline/test/test_helper.rb | 14 +++-----------
plugins/network/Rakefile | 4 ++++
.../{language => network}/config/rails_parent.rb | 0
plugins/network/test/test_helper.rb | 14 +++-----------
plugins/patches/.gitignore | 1 +
plugins/patches/Rakefile | 3 +++
.../{language => patches}/config/rails_parent.rb | 0
plugins/patches/test/test_helper.rb | 14 +++-----------
plugins/samba_server/.gitignore | 1 +
plugins/samba_server/Rakefile | 3 +++
.../config/rails_parent.rb | 0
plugins/samba_server/test/test_helper.rb | 14 +++-----------
plugins/securities/.gitignore | 1 +
plugins/securities/Rakefile | 3 +++
.../config/rails_parent.rb | 0
plugins/securities/test/test_helper.rb | 14 +++-----------
plugins/services/.gitignore | 1 +
plugins/services/Rakefile | 4 ++++
.../{language => services}/config/rails_parent.rb | 0
plugins/services/test/test_helper.rb | 14 +++-----------
plugins/time/.gitignore | 1 +
plugins/time/Rakefile | 3 +++
plugins/{language => time}/config/rails_parent.rb | 0
plugins/time/test/test_helper.rb | 14 +++-----------
plugins/users/.gitignore | 1 +
plugins/users/Rakefile | 3 +++
plugins/{language => users}/config/rails_parent.rb | 0
plugins/users/test/test_helper.rb | 14 +++-----------
31 files changed, 57 insertions(+), 88 deletions(-)
copy plugins/{language => commandline}/config/rails_parent.rb (100%)
copy plugins/{language => network}/config/rails_parent.rb (100%)
copy plugins/{language => patches}/config/rails_parent.rb (100%)
copy plugins/{language => samba_server}/config/rails_parent.rb (100%)
copy plugins/{language => securities}/config/rails_parent.rb (100%)
copy plugins/{language => services}/config/rails_parent.rb (100%)
copy plugins/{language => time}/config/rails_parent.rb (100%)
copy plugins/{language => users}/config/rails_parent.rb (100%)
diff --git a/plugins/commandline/.gitignore b/plugins/commandline/.gitignore
index b3a00e1..945bd79 100644
--- a/plugins/commandline/.gitignore
+++ b/plugins/commandline/.gitignore
@@ -1,2 +1,3 @@
package/www/
package/www.tar.bz2
+coverage
diff --git a/plugins/commandline/Rakefile b/plugins/commandline/Rakefile
index 8e51c56..b859030 100644
--- a/plugins/commandline/Rakefile
+++ b/plugins/commandline/Rakefile
@@ -2,6 +2,9 @@ require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
require 'rake/packagetask'
+require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
+require File.join(RailsParent.parent, 'config', 'boot')
+require 'tasks/rails'
desc 'Default: run unit tests.'
task :default => :test
diff --git a/plugins/language/config/rails_parent.rb b/plugins/commandline/config/rails_parent.rb
similarity index 100%
copy from plugins/language/config/rails_parent.rb
copy to plugins/commandline/config/rails_parent.rb
diff --git a/plugins/commandline/test/test_helper.rb b/plugins/commandline/test/test_helper.rb
index e989867..7d67910 100644
--- a/plugins/commandline/test/test_helper.rb
+++ b/plugins/commandline/test/test_helper.rb
@@ -1,15 +1,7 @@
-rails_parent = ENV["RAILS_PARENT"]
-unless rails_parent
- if File.directory?("../../webservice/")
- $stderr.puts "Taking ../../webservice/ for RAILS_PARENT"
- rails_parent="../../webservice/"
- else
- $stderr.puts "Please set RAILS_PARENT environment"
- exit
- end
-end
+# find the rails parent
+require File.join(File.dirname(__FILE__), '..', 'config', 'rails_parent')
# first config rails
-require File.expand_path(rails_parent + "/config/environment")
+require File.expand_path( File.join("config","environment"), RailsParent.parent )
# then enable testing, this will get the routing right
ENV["RAILS_ENV"] = "test"
require 'test_help'
diff --git a/plugins/network/Rakefile b/plugins/network/Rakefile
index 2bb841f..e22857d 100644
--- a/plugins/network/Rakefile
+++ b/plugins/network/Rakefile
@@ -1,6 +1,10 @@
require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
+require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
+require File.join(RailsParent.parent, 'config', 'boot')
+require 'tasks/rails'
+
begin
require 'tasks/webservice'
rescue LoadError => e
diff --git a/plugins/language/config/rails_parent.rb b/plugins/network/config/rails_parent.rb
similarity index 100%
copy from plugins/language/config/rails_parent.rb
copy to plugins/network/config/rails_parent.rb
diff --git a/plugins/network/test/test_helper.rb b/plugins/network/test/test_helper.rb
index e989867..7d67910 100644
--- a/plugins/network/test/test_helper.rb
+++ b/plugins/network/test/test_helper.rb
@@ -1,15 +1,7 @@
-rails_parent = ENV["RAILS_PARENT"]
-unless rails_parent
- if File.directory?("../../webservice/")
- $stderr.puts "Taking ../../webservice/ for RAILS_PARENT"
- rails_parent="../../webservice/"
- else
- $stderr.puts "Please set RAILS_PARENT environment"
- exit
- end
-end
+# find the rails parent
+require File.join(File.dirname(__FILE__), '..', 'config', 'rails_parent')
# first config rails
-require File.expand_path(rails_parent + "/config/environment")
+require File.expand_path( File.join("config","environment"), RailsParent.parent )
# then enable testing, this will get the routing right
ENV["RAILS_ENV"] = "test"
require 'test_help'
diff --git a/plugins/patches/.gitignore b/plugins/patches/.gitignore
index b3a00e1..945bd79 100644
--- a/plugins/patches/.gitignore
+++ b/plugins/patches/.gitignore
@@ -1,2 +1,3 @@
package/www/
package/www.tar.bz2
+coverage
diff --git a/plugins/patches/Rakefile b/plugins/patches/Rakefile
index e179c2a..b84aaa9 100644
--- a/plugins/patches/Rakefile
+++ b/plugins/patches/Rakefile
@@ -2,6 +2,9 @@ require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
require 'rake/packagetask'
+require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
+require File.join(RailsParent.parent, 'config', 'boot')
+require 'tasks/rails'
desc 'Default: run unit tests.'
task :default => :test
diff --git a/plugins/language/config/rails_parent.rb b/plugins/patches/config/rails_parent.rb
similarity index 100%
copy from plugins/language/config/rails_parent.rb
copy to plugins/patches/config/rails_parent.rb
diff --git a/plugins/patches/test/test_helper.rb b/plugins/patches/test/test_helper.rb
index e989867..7d67910 100644
--- a/plugins/patches/test/test_helper.rb
+++ b/plugins/patches/test/test_helper.rb
@@ -1,15 +1,7 @@
-rails_parent = ENV["RAILS_PARENT"]
-unless rails_parent
- if File.directory?("../../webservice/")
- $stderr.puts "Taking ../../webservice/ for RAILS_PARENT"
- rails_parent="../../webservice/"
- else
- $stderr.puts "Please set RAILS_PARENT environment"
- exit
- end
-end
+# find the rails parent
+require File.join(File.dirname(__FILE__), '..', 'config', 'rails_parent')
# first config rails
-require File.expand_path(rails_parent + "/config/environment")
+require File.expand_path( File.join("config","environment"), RailsParent.parent )
# then enable testing, this will get the routing right
ENV["RAILS_ENV"] = "test"
require 'test_help'
diff --git a/plugins/samba_server/.gitignore b/plugins/samba_server/.gitignore
index b3a00e1..945bd79 100644
--- a/plugins/samba_server/.gitignore
+++ b/plugins/samba_server/.gitignore
@@ -1,2 +1,3 @@
package/www/
package/www.tar.bz2
+coverage
diff --git a/plugins/samba_server/Rakefile b/plugins/samba_server/Rakefile
index aba8755..65d2e09 100644
--- a/plugins/samba_server/Rakefile
+++ b/plugins/samba_server/Rakefile
@@ -2,6 +2,9 @@ require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
require 'rake/packagetask'
+require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
+require File.join(RailsParent.parent, 'config', 'boot')
+require 'tasks/rails'
# load all Yast webservice specific tasks
begin
diff --git a/plugins/language/config/rails_parent.rb b/plugins/samba_server/config/rails_parent.rb
similarity index 100%
copy from plugins/language/config/rails_parent.rb
copy to plugins/samba_server/config/rails_parent.rb
diff --git a/plugins/samba_server/test/test_helper.rb b/plugins/samba_server/test/test_helper.rb
index e989867..7d67910 100644
--- a/plugins/samba_server/test/test_helper.rb
+++ b/plugins/samba_server/test/test_helper.rb
@@ -1,15 +1,7 @@
-rails_parent = ENV["RAILS_PARENT"]
-unless rails_parent
- if File.directory?("../../webservice/")
- $stderr.puts "Taking ../../webservice/ for RAILS_PARENT"
- rails_parent="../../webservice/"
- else
- $stderr.puts "Please set RAILS_PARENT environment"
- exit
- end
-end
+# find the rails parent
+require File.join(File.dirname(__FILE__), '..', 'config', 'rails_parent')
# first config rails
-require File.expand_path(rails_parent + "/config/environment")
+require File.expand_path( File.join("config","environment"), RailsParent.parent )
# then enable testing, this will get the routing right
ENV["RAILS_ENV"] = "test"
require 'test_help'
diff --git a/plugins/securities/.gitignore b/plugins/securities/.gitignore
index b3a00e1..945bd79 100644
--- a/plugins/securities/.gitignore
+++ b/plugins/securities/.gitignore
@@ -1,2 +1,3 @@
package/www/
package/www.tar.bz2
+coverage
diff --git a/plugins/securities/Rakefile b/plugins/securities/Rakefile
index b97e581..c29e034 100644
--- a/plugins/securities/Rakefile
+++ b/plugins/securities/Rakefile
@@ -2,6 +2,9 @@ require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
require 'rake/packagetask'
+require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
+require File.join(RailsParent.parent, 'config', 'boot')
+require 'tasks/rails'
desc 'Default: run unit tests.'
task :default => :test
diff --git a/plugins/language/config/rails_parent.rb b/plugins/securities/config/rails_parent.rb
similarity index 100%
copy from plugins/language/config/rails_parent.rb
copy to plugins/securities/config/rails_parent.rb
diff --git a/plugins/securities/test/test_helper.rb b/plugins/securities/test/test_helper.rb
index e989867..7d67910 100644
--- a/plugins/securities/test/test_helper.rb
+++ b/plugins/securities/test/test_helper.rb
@@ -1,15 +1,7 @@
-rails_parent = ENV["RAILS_PARENT"]
-unless rails_parent
- if File.directory?("../../webservice/")
- $stderr.puts "Taking ../../webservice/ for RAILS_PARENT"
- rails_parent="../../webservice/"
- else
- $stderr.puts "Please set RAILS_PARENT environment"
- exit
- end
-end
+# find the rails parent
+require File.join(File.dirname(__FILE__), '..', 'config', 'rails_parent')
# first config rails
-require File.expand_path(rails_parent + "/config/environment")
+require File.expand_path( File.join("config","environment"), RailsParent.parent )
# then enable testing, this will get the routing right
ENV["RAILS_ENV"] = "test"
require 'test_help'
diff --git a/plugins/services/.gitignore b/plugins/services/.gitignore
index b3a00e1..945bd79 100644
--- a/plugins/services/.gitignore
+++ b/plugins/services/.gitignore
@@ -1,2 +1,3 @@
package/www/
package/www.tar.bz2
+coverage
diff --git a/plugins/services/Rakefile b/plugins/services/Rakefile
index 2bb841f..e22857d 100644
--- a/plugins/services/Rakefile
+++ b/plugins/services/Rakefile
@@ -1,6 +1,10 @@
require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
+require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
+require File.join(RailsParent.parent, 'config', 'boot')
+require 'tasks/rails'
+
begin
require 'tasks/webservice'
rescue LoadError => e
diff --git a/plugins/language/config/rails_parent.rb b/plugins/services/config/rails_parent.rb
similarity index 100%
copy from plugins/language/config/rails_parent.rb
copy to plugins/services/config/rails_parent.rb
diff --git a/plugins/services/test/test_helper.rb b/plugins/services/test/test_helper.rb
index e989867..7d67910 100644
--- a/plugins/services/test/test_helper.rb
+++ b/plugins/services/test/test_helper.rb
@@ -1,15 +1,7 @@
-rails_parent = ENV["RAILS_PARENT"]
-unless rails_parent
- if File.directory?("../../webservice/")
- $stderr.puts "Taking ../../webservice/ for RAILS_PARENT"
- rails_parent="../../webservice/"
- else
- $stderr.puts "Please set RAILS_PARENT environment"
- exit
- end
-end
+# find the rails parent
+require File.join(File.dirname(__FILE__), '..', 'config', 'rails_parent')
# first config rails
-require File.expand_path(rails_parent + "/config/environment")
+require File.expand_path( File.join("config","environment"), RailsParent.parent )
# then enable testing, this will get the routing right
ENV["RAILS_ENV"] = "test"
require 'test_help'
diff --git a/plugins/time/.gitignore b/plugins/time/.gitignore
index b3a00e1..945bd79 100644
--- a/plugins/time/.gitignore
+++ b/plugins/time/.gitignore
@@ -1,2 +1,3 @@
package/www/
package/www.tar.bz2
+coverage
diff --git a/plugins/time/Rakefile b/plugins/time/Rakefile
index 3659a17..84ff33a 100644
--- a/plugins/time/Rakefile
+++ b/plugins/time/Rakefile
@@ -2,6 +2,9 @@ require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
require 'rake/packagetask'
+require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
+require File.join(RailsParent.parent, 'config', 'boot')
+require 'tasks/rails'
desc 'Default: run unit tests.'
task :default => :test
diff --git a/plugins/language/config/rails_parent.rb b/plugins/time/config/rails_parent.rb
similarity index 100%
copy from plugins/language/config/rails_parent.rb
copy to plugins/time/config/rails_parent.rb
diff --git a/plugins/time/test/test_helper.rb b/plugins/time/test/test_helper.rb
index e989867..7d67910 100644
--- a/plugins/time/test/test_helper.rb
+++ b/plugins/time/test/test_helper.rb
@@ -1,15 +1,7 @@
-rails_parent = ENV["RAILS_PARENT"]
-unless rails_parent
- if File.directory?("../../webservice/")
- $stderr.puts "Taking ../../webservice/ for RAILS_PARENT"
- rails_parent="../../webservice/"
- else
- $stderr.puts "Please set RAILS_PARENT environment"
- exit
- end
-end
+# find the rails parent
+require File.join(File.dirname(__FILE__), '..', 'config', 'rails_parent')
# first config rails
-require File.expand_path(rails_parent + "/config/environment")
+require File.expand_path( File.join("config","environment"), RailsParent.parent )
# then enable testing, this will get the routing right
ENV["RAILS_ENV"] = "test"
require 'test_help'
diff --git a/plugins/users/.gitignore b/plugins/users/.gitignore
index b3a00e1..945bd79 100644
--- a/plugins/users/.gitignore
+++ b/plugins/users/.gitignore
@@ -1,2 +1,3 @@
package/www/
package/www.tar.bz2
+coverage
diff --git a/plugins/users/Rakefile b/plugins/users/Rakefile
index 28b14f5..cd7ae63 100644
--- a/plugins/users/Rakefile
+++ b/plugins/users/Rakefile
@@ -2,6 +2,9 @@ require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
require 'rake/packagetask'
+require File.join(File.dirname(__FILE__), 'config', 'rails_parent')
+require File.join(RailsParent.parent, 'config', 'boot')
+require 'tasks/rails'
desc 'Default: run unit tests.'
task :default => :test
diff --git a/plugins/language/config/rails_parent.rb b/plugins/users/config/rails_parent.rb
similarity index 100%
copy from plugins/language/config/rails_parent.rb
copy to plugins/users/config/rails_parent.rb
diff --git a/plugins/users/test/test_helper.rb b/plugins/users/test/test_helper.rb
index e989867..7d67910 100644
--- a/plugins/users/test/test_helper.rb
+++ b/plugins/users/test/test_helper.rb
@@ -1,15 +1,7 @@
-rails_parent = ENV["RAILS_PARENT"]
-unless rails_parent
- if File.directory?("../../webservice/")
- $stderr.puts "Taking ../../webservice/ for RAILS_PARENT"
- rails_parent="../../webservice/"
- else
- $stderr.puts "Please set RAILS_PARENT environment"
- exit
- end
-end
+# find the rails parent
+require File.join(File.dirname(__FILE__), '..', 'config', 'rails_parent')
# first config rails
-require File.expand_path(rails_parent + "/config/environment")
+require File.expand_path( File.join("config","environment"), RailsParent.parent )
# then enable testing, this will get the routing right
ENV["RAILS_ENV"] = "test"
require 'test_help'
hooks/post-receive
--
YaST web service
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org