Mailinglist Archive: yast-commit (883 mails)

[Duncan Mac-Vicar P <dmacvicar@xxxxxxx>]

ref: refs/heads/master
commit fd4be06512cd3d256a066ab4c9223a39583e535f
Author: Duncan Mac-Vicar P <dmacvicar@xxxxxxx>
Date:   Tue Jul 21 15:24:38 2009 +0200

    start using the shared tasks
    clenup tabs in selenium
---
 webclient/lib/tasks/common.rake    |    6 ++++++
 webclient/lib/tasks/selenium.rake  |   30 +++++++++++++++---------------
 webclient/lib/tasks/webclient.task |   10 ----------
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/webclient/lib/tasks/common.rake b/webclient/lib/tasks/common.rake
new file mode 100644
index 0000000..1568c54
--- /dev/null
+++ b/webclient/lib/tasks/common.rake
@@ -0,0 +1,6 @@
+begin
+        require 'tasks/webservice'
+rescue LoadError => e
+        $stderr.puts "Install rubygem-yast2-webservice-tasks.rpm"
+end
+
diff --git a/webclient/lib/tasks/selenium.rake 
b/webclient/lib/tasks/selenium.rake
index 2f15eed..ce83dfb 100644
--- a/webclient/lib/tasks/selenium.rake
+++ b/webclient/lib/tasks/selenium.rake
@@ -6,19 +6,19 @@ begin
 
     # define selenium:rc:start task
     Selenium::Rake::RemoteControlStartTask.new do |rc|
-       rc.port = 4444
-       rc.timeout_in_seconds = 3 * 60
-       rc.background = true
-       rc.wait_until_up_and_running = true
-       rc.jar_file = 
Dir["vendor/selenium-remote-control/selenium-server*.jar"].first
-       rc.additional_args << "-singleWindow"
+             rc.port = 4444
+             rc.timeout_in_seconds = 3 * 60
+             rc.background = true
+             rc.wait_until_up_and_running = true
+             rc.jar_file = 
Dir["vendor/selenium-remote-control/selenium-server*.jar"].first
+             rc.additional_args << "-singleWindow"
     end
 
     # define selenium:rc:stop task
     Selenium::Rake::RemoteControlStopTask.new do |rc|
-       rc.host = "localhost"
-       rc.port = 4444
-       rc.timeout_in_seconds = 3 * 60
+        rc.host = "localhost"
+             rc.port = 4444
+             rc.timeout_in_seconds = 3 * 60
     end
 rescue LoadError
     selenium_missing = true
@@ -27,9 +27,9 @@ end
 namespace :test do
     # define test:ui:check task
     Rake::TestTask.new(:"ui:check") do |t|
-       t.libs << "test"
-       t.pattern = 'test/ui/**/*_test.rb'
-       t.verbose = true
+             t.libs << "test"
+             t.pattern = 'test/ui/**/*_test.rb'
+             t.verbose = true
     end
 
     Rake::Task['test:ui:check'].comment = "Note: Selenium Server must be 
running"
@@ -37,19 +37,19 @@ namespace :test do
     # define test:ui task - start/shut down Selenium server component 
automatically
     desc 'Run UI tests using Selenium testing framework'
     if selenium_missing
-       task :ui do 
+      task :ui do 
            $stderr.puts "ERROR: 'selenium-client' gem is missing, UI testing 
task (test:ui)"
            $stderr.puts "       cannot be started. Install 'selenium-client' 
Ruby gem first."
            exit 1
        end
     elsif !Gem.available? 'test-unit', '>=2.0.2'
-       task :ui do 
+    task :ui do 
            $stderr.puts "ERROR: 'test-unit' gem is missing, UI testing task 
(test:ui)"
            $stderr.puts "       cannot be started. Install 'test-unit' Ruby 
gem first."
            exit 1
        end
     else
-       task :ui => [:"selenium:rc:start", :"test:ui:check", 
:"selenium:rc:stop"]
+         task :ui => [:"selenium:rc:start", :"test:ui:check", 
:"selenium:rc:stop"]
     end
 end
 
diff --git a/webclient/lib/tasks/webclient.task 
b/webclient/lib/tasks/webclient.task
deleted file mode 100644
index e6b5321..0000000
--- a/webclient/lib/tasks/webclient.task
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'rake/packagetask'
-
-desc 'Generate tarball package'
-Rake::PackageTask.new('www', :noversion) do |p|
-  p.need_tar_bz2 = true
-  p.package_dir = 'package'
-  p.package_files.include('**/*')
-  p.package_files.exclude('package')
-end
-
-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx