rwebspec 1.4.0.2 → 1.6

data/lib/watir_extensions.rb

@@ -1,26 +1,31 @@
-if RUBY_PLATFORM == "java" then
-  # no need to load firefox extension
-else
-  module FireWatir
-    class Firefox
 
-      @@firefox_started = false
+module FireWatir
+  class Firefox
 
-      def initialize(options = {})
-        if(options.kind_of?(Integer))
-          options = {:waitTime => options}
-        end
+    @@firefox_started = false
 
-        if(options[:profile])
-          profile_opt = "-no-remote -P #{options[:profile]}"
-        else
-          profile_opt = ""
-        end
+    def initialize(options = {})
+      if(options.kind_of?(Integer))
+        options = {:waitTime => options}
+      end
+
+      if(options[:profile])
+        profile_opt = "-no-remote -P #{options[:profile]}"
+      else
+        profile_opt = ""
+      end
 
-        waitTime = options[:waitTime] || 2
+      waitTime = options[:waitTime] || 2
 
-        case RUBY_PLATFORM
-        when /mswin/
+      os = RUBY_PLATFORM
+      if RUBY_PLATFORM =~ /java/ then
+        require 'rbconfig'
+        os = Config::CONFIG['host_os']
+      end
+
+      case os
+      when /mswin/
+        begin
           # Get the path to Firefox.exe using Registry.
           require 'win32/registry.rb'
           path_to_bin = ""
@@ -33,37 +38,38 @@ else
               end
             end
           end
-
-        when /linux/i
-          path_to_bin = `which firefox`.strip
-        when /darwin/i
-          path_to_bin = '/Applications/Firefox.app/Contents/MacOS/firefox'
-        when /java/
-          raise "Not implemented: Create a browser finder in JRuby"
+        rescue LoadError => e
+          path_to_bin = '"C:\Program Files\Mozilla Firefox\firefox.exe"'
         end
 
-        @t = Thread.new { system("#{path_to_bin} -jssh #{profile_opt}")} unless @@firefox_started
-
-        sleep waitTime
-        begin
-          set_defaults()
-        rescue Watir::Exception::UnableToStartJSShException
-          if !@t # no new thread starting browser, try again
-            puts "Firefox with JSSH not detected after you indicated @@firefox_started"
-            @t = Thread.new { system("#{path_to_bin} -jssh #{profile_opt}")}
-            sleep waitTime
-            set_defaults
-          end
-        end
-        get_window_number()
-        set_browser_document()
+      when /linux/i
+        path_to_bin = `which firefox`.strip
+      when /darwin/i
+        path_to_bin = '/Applications/Firefox.app/Contents/MacOS/firefox'
+      when /java/
+        raise "Error, should have set using rbconfig: #{os}"
       end
 
-      def self.firefox_started=(value)
-        @@firefox_started = value
+      @t = Thread.new { system("#{path_to_bin} -jssh #{profile_opt}")} unless @@firefox_started
+
+      sleep waitTime
+      begin
+        set_defaults()
+      rescue Watir::Exception::UnableToStartJSShException
+        if !@t # no new thread starting browser, try again
+          puts "Firefox with JSSH not detected after you indicated @@firefox_started"
+          @t = Thread.new { system("#{path_to_bin} -jssh #{profile_opt}")}
+          sleep waitTime
+          set_defaults
+        end
       end
+      get_window_number()
+      set_browser_document()
+    end
 
+    def self.firefox_started=(value)
+      @@firefox_started = value
     end
-  end
 
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rwebspec
 version: !ruby/object:Gem::Version 
-  version: 1.4.0.2
+  version: "1.6"
 platform: ruby
 authors: 
 - Zhimin Zhan
@@ -9,7 +9,7 @@ autorequire: rwebspec
 bindir: bin
 cert_chain: []
 
-date: 2009-09-01 00:00:00 +10:00
+date: 2010-05-16 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.12
     version: 
-- !ruby/object:Gem::Dependency 
-  name: firewatir
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.6.2
-    version: 
 - !ruby/object:Gem::Dependency 
   name: commonwatir
   type: :runtime
@@ -40,17 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.6.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: test-unit
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 1.6.5
     version: 
 description: 
 email: zhimin@agileway.net
@@ -66,18 +46,18 @@ files:
 - CHANGELOG
 - MIT-LICENSE
 - lib/rspec_extensions.rb
-- lib/rwebspec
 - lib/rwebspec/assert.rb
 - lib/rwebspec/clickJSDialog.rb
 - lib/rwebspec/context.rb
+- lib/rwebspec/database_checker.rb
 - lib/rwebspec/driver.rb
-- lib/rwebspec/itest_plugin.rb
-- lib/rwebspec/matchers
+- lib/rwebspec/load_test_helper.rb
 - lib/rwebspec/matchers/contains_text.rb
 - lib/rwebspec/popup.rb
 - lib/rwebspec/rspec_helper.rb
 - lib/rwebspec/test_script.rb
 - lib/rwebspec/test_utils.rb
+- lib/rwebspec/testwise_plugin.rb
 - lib/rwebspec/using_pages.rb
 - lib/rwebspec/web_browser.rb
 - lib/rwebspec/web_page.rb
@@ -87,6 +67,8 @@ files:
 - lib/watir_extensions.rb
 has_rdoc: true
 homepage: http://github.com/zhimin/rwebspec/tree/master
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -107,9 +89,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: rwebspec
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Executable functional specification for web applications in RSpec syntax and Watir
 test_files: []