ref: refs/heads/master
commit 5c0c8c458e80b36665f91a7a9cee53f268956724
Author: Ladislav Slezak
Date: Wed Jul 15 13:49:57 2009 +0200
Share the common functions in UI test cases
The common functions have been moved to Selenium::TestCase module
---
webclient/lib/selenium/test_case.rb | 38 +++++++++++++++++++++++++++++++++++
webclient/test/ui/login_test.rb | 30 +++++----------------------
2 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/webclient/lib/selenium/test_case.rb b/webclient/lib/selenium/test_case.rb
new file mode 100644
index 0000000..f1fb54b
--- /dev/null
+++ b/webclient/lib/selenium/test_case.rb
@@ -0,0 +1,38 @@
+require "rubygems"
+gem "selenium-client", ">=1.2.16"
+
+require "selenium"
+require "test/unit"
+
+module Selenium
+
+ module TestCase
+
+ def setup
+ @verification_errors = []
+
+ if $selenium
+ @selenium = $selenium
+ else
+ # Start Firefox browser by default (supportred browsers: *firefox2,
+ # *firefox3, *opera, *konqueror *chrome)
+ # specify the exact path to the binary (/usr/bin/firefox is a script,
+ # Selenium server cannot correctly close the browser if it is started via the script)
+ firefox = (File.exists? "/usr/lib64/firefox/firefox") ? "/usr/lib64/firefox/firefox" :
+ "/usr/lib/firefox/firefox"
+
+ @selenium = Selenium::SeleniumDriver.new("localhost", 4444, "*firefox #{firefox}",
+ "http://localhost:3000", 10000);
+ @selenium.start
+ end
+
+ @selenium.set_context("test_login")
+ end
+
+ def teardown
+ @selenium.stop unless $selenium
+ assert_equal [], @verification_errors
+ end
+ end
+
+end
diff --git a/webclient/test/ui/login_test.rb b/webclient/test/ui/login_test.rb
index b0d778d..3c7bd99 100644
--- a/webclient/test/ui/login_test.rb
+++ b/webclient/test/ui/login_test.rb
@@ -1,31 +1,9 @@
-require "rubygems"
-gem "selenium-client", ">=1.2.16"
-require "selenium"
-require "test/unit"
+require 'selenium/test_case'
class LoginTest < Test::Unit::TestCase
- def setup
- @verification_errors = []
- if $selenium
- @selenium = $selenium
- else
- # Start Firefox browser by default (supportred browsers: *firefox2, *firefox3, *opera, *konqueror *chrome)
- # specify the exact path to the binary (/usr/bin/firefox is a script,
- # Selenium server cannot correctly close the browser if it is started via the script)
- firefox = (File.exists? "/usr/lib64/firefox/firefox") ? "/usr/lib64/firefox/firefox" : "/usr/lib/firefox/firefox"
-
- @selenium = Selenium::SeleniumDriver.new("localhost", 4444, "*firefox #{firefox}", "http://localhost:3000", 10000);
- @selenium.start
- end
- @selenium.set_context("test_login")
- end
-
- def teardown
- @selenium.stop unless $selenium
- assert_equal [], @verification_errors
- end
+ include Selenium::TestCase
# check if the service selection is displayed at the main page
def test_host_selection
@@ -44,4 +22,8 @@ class LoginTest < Test::Unit::TestCase
assert @selenium.is_element_present("password")
assert @selenium.is_element_present("login")
end
+
end
+
+# vim: ft=ruby
+
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
Ladislav Slezak