@@ -4,20 +4,21 @@ require 'uri' require 'net/http' require 'selenium/client' -require 'selenium/selenium_server' -require 'selenium/web_page' -require 'selenium/server' -require 'selenium/server' +dir = File.dirname(__FILE__) +require dir + '/selenium/selenium_server' +require dir + '/selenium/web_page' +require dir + '/selenium/server' +require dir + '/selenium/server' -require 'selenium/alert' -require 'selenium/html_element' +require dir + '/selenium/alert' +require dir + '/selenium/html_element' -require 'selenium/button' -require 'selenium/link' -require 'selenium/locator' -require 'selenium/key' -require 'selenium/text_field' -require 'selenium/text_area' +require dir + '/selenium/button' +require dir + '/selenium/link' +require dir + '/selenium/locator' +require dir + '/selenium/key' +require dir + '/selenium/text_field' +require dir + '/selenium/text_area' -require 'selenium/wait_for' -require 'selenium/selenium_driver' +require dir + '/selenium/wait_for' +require dir + '/selenium/selenium_driver' lib/selenium.rb @@ -1,4 +1,4 @@ -$:.unshift File.join(File.dirname(__FILE__), 'lib') +file = File.join(File.dirname(__FILE__), 'lib') require 'rubygems' Gem::manage_gems @@ -9,7 +9,7 @@ require 'rake/rdoctask' require 'rcov/rcovtask' require 'specs' require 'buildmaster/project/server_manager' -require 'selenium' +require file + '/selenium' rcov_dir = SITE_SPEC.output_dir.dir('rcov') rspec_dir = SITE_SPEC.output_dir.dir('rspec') rakefile.rb @@ -5,7 +5,7 @@ require 'buildmaster/project' require 'specs' root = BuildMaster::Cotta.file(__FILE__).parent -svn = BuildMaster::SvnDriver.from_path(root) +git = BuildMaster::Git.new(root) release = BuildMaster::Release.new release.task('version') do @@ -13,17 +13,17 @@ release.task('version') do SPEC.version = VERSION_NUMBER.version_number end release.task("rake") {load('rake')} -release.task('commit') {svn.commit('committing before release')} +release.task('commit') {git.commit('committing before release')} release.task('tagging') do tag = "selenium-#{SPEC.version}" puts "tagging with #{tag}" - svn.tag(tag) + git.tag(tag) end release.task("upload") do gem = "#{SPEC.name}-#{SPEC.version}" target_path = "/var/www/gforge-projects/selenium/builds/#{gem}.gem" - BuildMaster::PscpDriver.new("#{svn.user}@selenium.rubyforge.org").copy(root.file("#{gem}.gem").to_s, target_path) + BuildMaster::PscpDriver.new("wolfdancer@selenium.rubyforge.org").copy(root.file("#{gem}.gem").to_s, target_path) end release.command(ARGV) \ No newline at end of file release.rb @@ -1,11 +1,10 @@ dir = File.dirname(__FILE__) selenium_dir = File.expand_path(File.join(dir, '..', '..', '..', 'lib')) -$:.unshift(selenium_dir) unless $:.include?(selenium_dir) +require selenium_dir + "/selenium" -require "selenium" -require "#{dir}/selenium_ruby/selenium_ruby_page" -require "#{dir}/selenium_ruby/home_page" -require "#{dir}/selenium_ruby/directory_listing_page" -require "#{dir}/selenium_ruby/download_page" -require "#{dir}/selenium_ruby/license_page" -require "#{dir}/selenium_ruby/menu" +require dir + "/selenium_ruby/selenium_ruby_page" +require dir + "/selenium_ruby/home_page" +require dir + "/selenium_ruby/directory_listing_page" +require dir + "/selenium_ruby/download_page" +require dir + "/selenium_ruby/license_page" +require dir + "/selenium_ruby/menu" spec/selenium/examples/selenium_ruby.rb @@ -1,19 +1,10 @@ require "rubygems" require "spec" -$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib') - -require 'selenium' +require File.dirname(__FILE__) + '/../../lib/selenium' describe 'Time Out Control' do - before(:each) do - end - - after(:each) do - end - - it "should honor the time out argument" do link_list=["http://www.myantel.net.mm", "http://www.khitlunge.net.mm", @@ -29,7 +20,7 @@ describe 'Time Out Control' do ] - selenium=Selenium::SeleniumDriver.new("localhost",4444,"*chrome", link_list.first, 600000) + selenium=Selenium::Client::Driver.new("localhost", 4444,"*chrome", link_list.first, 600000) selenium.start selenium.set_timeout(600000) link_list.each {|url| selenium.open(url) } spec/selenium/manual_tc_timout.rb @@ -1,11 +1,11 @@ require "rubygems" -dir = File.dirname(__FILE__) -$:.unshift File.expand_path(File.join(dir, '..', '..', 'lib')) -require "selenium" - require "spec" require "mongrel" -require "#{dir}/examples/selenium_ruby" +dir = File.dirname(__FILE__) + +require dir + '/../../lib/selenium' + +require dir + "/examples/selenium_ruby" module Selenium BROWSER = RUBY_PLATFORM =~ /[^r]win/ ? @@ -42,7 +42,8 @@ describe "Selenium", :shared => true do end end -$test_app_server = Mongrel::HttpServer.new("0.0.0.0", "2000") +puts 'starting' +$test_app_server = Mongrel::HttpServer.new('0.0.0.0', 2000) puts File.expand_path(File.join(dir, '..', '..', 'site')) $test_app_server.register("/", Mongrel::DirHandler.new(File.expand_path(File.join(dir, '..', '..', 'site')))) $test_app_server.run spec/selenium/spec_helper.rb @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), "spec_helper") +require File.dirname(__FILE__) + '/spec_helper' module Selenium describe 'basic operation with selenium' do spec/selenium/tc_basic_operation.rb @@ -25,10 +25,6 @@ module Selenium driver.timeout_in_milliseconds.should == 240000 end - it "should start" do - mock(driver).start_new_browser_session - driver.start - end end describe "#inner_html_js" do @@ -66,16 +62,16 @@ module Selenium driver.type "id=foobar", "The Text" end - # it "fails when element is not present" do - # mock(driver).boolean_command("isElementPresent", ["id=foobar"]).once do - # result(false) - # end - # dont_allow(driver).remote_control_command("type", ["id=foobar", "The Text"]) - # - # proc { - # driver.type "id=foobar", "The Text" - # }.should raise_error - # end + it "fails when element is not present" do + mock(driver).boolean_command("isElementPresent", ["id=foobar"]).once do + result(false) + end + dont_allow(driver).remote_control_command("type", ["id=foobar", "The Text"]) + + proc { + driver.type "id=foobar", "The Text" + }.should raise_error + end end describe "#click" do @@ -113,16 +109,16 @@ module Selenium driver.select "id=foobar", "value=3" end - # it "fails when element is not present" do - # mock(driver).boolean_command("isElementPresent", ["id=foobar"]).once do - # result false - # end - # dont_allow(driver).remote_control_command("select", ["id=foobar", "value=3"]) - # - # proc { - # driver.select "id=foobar", "value=3" - # }.should raise_error - # end + it "fails when element is not present" do + mock(driver).boolean_command("isElementPresent", ["id=foobar"]).once do + result false + end + dont_allow(driver).remote_control_command("select", ["id=foobar", "value=3"]) + + proc { + driver.select "id=foobar", "value=3" + }.should raise_error + end end describe "#click" do spec/selenium/tc_selenium_driver.rb 42a09230c9028869abb50f54e11c8fd1ac588a87 wolfdancer wolfdancer@gmail.com http://github.com/wolfdancer/selenium/commit/3cab2f5163c172b69a3926d1b1e5fa3c35df2cfd 3cab2f5163c172b69a3926d1b1e5fa3c35df2cfd 2008-10-26T15:19:51-07:00 2008-10-26T15:19:51-07:00 fixing tests 6ea0cc9a875268ec7f0cc1aabd12e55a882abcbf wolfdancer wolfdancer@gmail.com