selenium-webdriver 0.0.16 → 0.0.17

data/chrome/src/extension/background.js

@@ -424,7 +424,7 @@ function parseRequest(request) {
       var len = ChromeDriver.tabs.length;
       for (var i = 0; i < len; i++) {
         if (ChromeDriver.tabs[i].selected) {
-          sendResponseToParsedRequest({statusCode: 0, value:  ChromeDriver.tabs[i].id}, false);
+          sendResponseToParsedRequest({statusCode: 0, value:  ChromeDriver.tabs[i].windowName}, false);
         }
       }
 
@@ -434,7 +434,7 @@ function parseRequest(request) {
           var len = ChromeDriver.tabs.length;
           for (var i = 0; i < len; i++) {
             if (ChromeDriver.tabs[i].tabId == tab.id) {
-              sendResponseToParsedRequest({statusCode: 0, value: ChromeDriver.tabs[i].tabId}, false);
+              sendResponseToParsedRequest({statusCode: 0, value: ChromeDriver.tabs[i].windowName}, false);
               return;
             }
           }
@@ -442,7 +442,7 @@ function parseRequest(request) {
       });
     } else {
       // Wow. I can't see this being error prone in the slightest
-      var handle = ChromeDriver.activePort.sender.tab.id;
+      var handle = ChromeDriver.windowHandlePrefix + "_" + ChromeDriver.activePort.sender.tab.id;
       sendResponseToParsedRequest({statusCode: 0, value:  handle}, false);
     };
     break;
@@ -575,7 +575,7 @@ function parsePortMessage(message) {
       "Received response from content script: " + JSON.stringify(message));
   if (!message || !message.response || !message.response.value ||
       message.response.value.statusCode === undefined ||
-      message.response.value.statusCode == null ||
+      message.response.value.statusCode === null ||
       message.sequenceNumber === undefined || message.sequenceNumber < ChromeDriver.lastReceivedSequenceNumber) {
     // Should only ever happen if we sent a bad request,
     // or the content script is broken
@@ -601,7 +601,7 @@ function parsePortMessage(message) {
   case 19: //org.openqa.selenium.XPathLookupException
   case 99: //org.openqa.selenium.WebDriverException [Native event]
     toSend = {statusCode: message.response.value.statusCode, value: null};
-    if (message.response.value !== undefined && message.response.value != null &&
+    if (message.response.value !== undefined && message.response.value !== null &&
         message.response.value.value !== undefined) {
       toSend.value = message.response.value.value;
     }
@@ -779,9 +779,9 @@ function switchToFrame(name, index) {
       break;
     }
   }
-  if (name !== undefined && name != null) {
+  if (name !== undefined && name !== null) {
     switchToFrameByName(name);
-  } else if (index !== undefined && index != null) {
+  } else if (index !== undefined && index !== null) {
     getFrameNameFromIndex(index);
   } else {
     sendResponseToParsedRequest({

data/chrome/src/extension/content_script.js

@@ -170,7 +170,7 @@ function parsePortMessage(message) {
       response.wait = false;
       break;
     case "getTitle":
-      response.value = {statusCode: 0, value: ChromeDriverContentScript.currentDocument.title};
+      response.value = {statusCode: 0, value: Utils.trim(ChromeDriverContentScript.currentDocument.title)};
       response.wait = false;
       break;
     case "getCurrentUrl":

data/chrome/src/extension/utils.js

@@ -226,3 +226,6 @@ Utils.triggerMouseEvent = function(element, eventType, clientX, clientY) {
     execute_(script, args, function(){});
 };
 
+Utils.trim = function(str) {
+  return str.replace(/^\s*/, "").replace(/\s*$/, "");
+}

data/common/src/rb/lib/selenium/webdriver/target_locator.rb

@@ -32,7 +32,15 @@ module Selenium
         if block_given?
           original = @bridge.getCurrentWindowHandle
           @bridge.switchToWindow id
+
           yield
+
+          current_handles = @bridge.getWindowHandles
+
+          if current_handles.size == 1
+            original = current_handles.shift
+          end
+
           @bridge.switchToWindow original
         else
           @bridge.switchToWindow id

data/firefox/src/rb/lib/selenium/webdriver/firefox.rb

@@ -16,6 +16,8 @@ module Selenium
        DEFAULT_PROFILE_NAME         = "WebDriver".freeze
        DEFAULT_PORT                 = 7055
        DEFAULT_ENABLE_NATIVE_EVENTS = [:windows, :linux].include? Platform.os
+       DEFAULT_SECURE_SSL           = false
+       DEFAULT_LOAD_NO_FOCUS_LIB    = Platform.os == :linux
 
     end
   end

data/firefox/src/rb/lib/selenium/webdriver/firefox/launcher.rb

@@ -9,13 +9,18 @@ module Selenium
         SOCKET_LOCK_TIMEOUT = 45
 
 
-        def initialize(binary, port = DEFAULT_PORT, profile_name = DEFAULT_PROFILE_NAME)
+        def initialize(binary, port = DEFAULT_PORT, profile = DEFAULT_PROFILE_NAME)
           @binary       = binary
           @port         = port.to_i
-          @profile_name = profile_name
-          @profile      = nil
 
-          # need to be really specific about what port to use
+          if profile.kind_of? Profile
+            @profile = profile
+          else
+            @profile_name = profile
+            @profile      = nil
+          end
+
+          # need to be really specific about what host to use
           #
           # on os x, "localhost" will resolve to 3 different addresses (see /etc/hosts)
           # Ruby will loop over these and happily bind to the same port on each one,
@@ -69,16 +74,17 @@ module Selenium
         end
 
         def create_profile
-          fetch_profile
-
-          if @profile.nil?
-            raise Error, WebDriverError, "could not find or create profile: #{profile.inspect}"
+          unless @profile
+            fetch_profile
+            if @profile.nil?
+              raise Error, WebDriverError, "could not find or create profile: #{profile.inspect}"
+            end
           end
 
           @profile.delete_extensions_cache
 
           @profile.port = @port
-          @profile.add_extension(true)
+          @profile.add_webdriver_extension(true)
           @profile.update_user_prefs
         end
 
@@ -136,7 +142,7 @@ module Selenium
             raise "unable to find or create new profile" unless existing
           end
 
-          @profile = existing.create_copy
+          @profile = existing
         end
 
         def assert_profile

data/firefox/src/rb/lib/selenium/webdriver/firefox/profile.rb

@@ -32,7 +32,8 @@ module Selenium
         ]
 
         attr_reader :name, :directory
-        attr_accessor :port, :secure_ssl, :native_events, :load_no_focus_lib
+        attr_writer :secure_ssl, :native_events, :load_no_focus_lib
+        attr_accessor :port
 
         class << self
 
@@ -47,17 +48,18 @@ module Selenium
         end
 
         def initialize(directory = nil)
-          if directory
-            @directory = directory
-          else
-            @directory = Dir.mktmpdir("webdriver-profile")
-          end
+          @directory = directory ? create_tmp_copy(directory) : Dir.mktmpdir("webdriver-profile")
 
-          unless File.directory?(@directory)
+          unless File.directory? @directory
             raise Error::WebDriverError, "Profile directory does not exist: #{@directory.inspect}"
           end
 
-          @extension_source = DEFAULT_EXTENSION_SOURCE # make configurable?
+          # TODO: replace constants with options hash
+          @port              = DEFAULT_PORT
+          @extension_source  = DEFAULT_EXTENSION_SOURCE
+          @native_events     = DEFAULT_ENABLE_NATIVE_EVENTS
+          @secure_ssl        = DEFAULT_SECURE_SSL
+          @load_no_focus_lib = DEFAULT_LOAD_NO_FOCUS_LIB
         end
 
         def absolute_path
@@ -69,19 +71,19 @@ module Selenium
         end
 
         def update_user_prefs
-          prefs = existing_user_prefs.merge DEFAULT_PREFERENCES
+          prefs = current_user_prefs.merge DEFAULT_PREFERENCES
           prefs['webdriver_firefox_port'] = @port
-          prefs['webdriver_accept_untrusted_certs'] = 'true' unless @secure_ssl == true
+          prefs['webdriver_accept_untrusted_certs'] = 'true' unless secure_ssl?
           prefs['webdriver_enable_native_events'] = 'true' if native_events?
 
           write_prefs prefs
         end
 
-        def add_extension(force = false)
+        def add_webdriver_extension(force_creation = false)
           ext_path = File.join(extensions_dir, EXTENSION_NAME)
 
           if File.exists?(ext_path)
-            return unless force
+            return unless force_creation
           end
 
           FileUtils.rm_rf ext_path
@@ -103,7 +105,7 @@ module Selenium
             end
           end
 
-          if Platform.os == :linux || load_no_focus_lib?
+          if load_no_focus_lib?
             from_to += NO_FOCUS
             modify_link_library_path(NO_FOCUS.map { |source, dest| File.join(ext_path, File.dirname(dest)) })
           end
@@ -117,20 +119,7 @@ module Selenium
           delete_extensions_cache
         end
 
-        def create_copy
-          tmp_directory = Dir.mktmpdir("webdriver-rb-profilecopy")
-
-          # TODO: must be a better way..
-          FileUtils.rm_rf tmp_directory
-          FileUtils.mkdir_p File.dirname(tmp_directory), :mode => 0700
-          FileUtils.cp_r @directory, tmp_directory
-
-          Profile.new(tmp_directory)
-        end
-
-        def port
-          @port ||= Firefox::DEFAULT_PORT
-        end
+        # TODO: add_extension
 
         def extensions_dir
           @extensions_dir ||= File.join(directory, "extensions")
@@ -157,17 +146,32 @@ module Selenium
         end
 
         def native_events?
-          !!(@native_events ||= Firefox::DEFAULT_ENABLE_NATIVE_EVENTS)
+          @native_events == true
         end
 
         def load_no_focus_lib?
-          !!(@load_no_focus_lib ||= false)
+          @load_no_focus_lib == true
         end
 
+        def secure_ssl?
+          @secure_ssl == true
+        end
 
         private
 
-        def existing_user_prefs
+        def create_tmp_copy(directory)
+          tmp_directory = Dir.mktmpdir("webdriver-rb-profilecopy")
+
+          # TODO: must be a better way..
+          FileUtils.rm_rf tmp_directory
+          FileUtils.mkdir_p File.dirname(tmp_directory), :mode => 0700
+          FileUtils.cp_r directory, tmp_directory
+
+          tmp_directory
+        end
+
+
+        def current_user_prefs
           return {} unless File.exist?(user_prefs_path)
 
           prefs = {}

data/firefox/src/rb/lib/selenium/webdriver/firefox/profiles_ini.rb

@@ -4,24 +4,25 @@ module Selenium
       class ProfilesIni
 
         def initialize
-          @path = File.join(Util.app_data_path, "profiles.ini")
-          @profiles = {}
-          parse if File.exist?(@path)
+          @ini_path = File.join(Util.app_data_path, "profiles.ini")
+          @profile_paths = {}
+
+          parse if File.exist?(@ini_path)
         end
 
         def [](name)
-          @profiles[name]
+          Profile.new @profile_paths[name]
         end
 
         def refresh
-          @profiles.clear
+          @profile_paths.clear
           parse
         end
 
         private
 
         def parse
-          string      = File.read @path
+          string      = File.read @ini_path
           name        = nil
           is_relative = nil
           path        = nil
@@ -29,8 +30,8 @@ module Selenium
           string.split("\n").each do |line|
             case line
             when /^\[Profile/
-              if p = new_profile(name, is_relative, path)
-                @profiles[name] = p
+              if p = path_for(name, is_relative, path)
+                @profile_paths[name] = p
                 name, path = nil
               end
             when /^Name=(.+)$/
@@ -42,16 +43,14 @@ module Selenium
             end
           end
 
-          if p = new_profile(name, is_relative, path)
-            @profiles[name] = p
+          if p = path_for(name, is_relative, path)
+            @profile_paths[name] = p
           end
         end
 
-        def new_profile(name, is_relative, path)
+        def path_for(name, is_relative, path)
           return unless [name, path].any?
           path = is_relative ? File.join(Util.app_data_path, path) : path
-
-          Profile.new(path)
         end
 
       end # ProfilesIni

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors: 
 - Jari Bakken
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 +01:00
+date: 2010-02-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency