watir-webdriver 0.1.1 → 0.1.2

data/spec/watirspec/forms_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Forms" do
 

data/spec/watirspec/frame_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Frame" do
 

data/spec/watirspec/frames_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 bug "http://github.com/jarib/watir-webdriver/issues#issue/17", :webdriver do
 

data/spec/watirspec/hidden_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Hidden" do
 

data/spec/watirspec/hiddens_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Hiddens" do
 

data/spec/watirspec/hn_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "H1", "H2", "H3", "H4", "H5", "H6" do
 

data/spec/watirspec/hns_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "H1s", "H2s", "H3s", "H4s", "H5s", "H6s" do
   before :each do

data/spec/watirspec/image_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Image" do
 

data/spec/watirspec/images_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Images" do
 

data/spec/watirspec/ins_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Ins" do
 

data/spec/watirspec/inses_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Inses" do
 

data/spec/watirspec/label_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Label" do
 

data/spec/watirspec/labels_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Labels" do
 

data/spec/watirspec/li_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Li" do
 

data/spec/watirspec/lib/{spec_helper.rb → runner.rb}

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module WatirSpec
-  module SpecHelper
+  module Runner
 
     module BrowserHelper
       def browser; @browser; end
@@ -23,12 +23,18 @@ module WatirSpec
       start_server
       configure
       add_guard_hook
+
+      @executed = true
+    end
+
+    def execute_if_necessary
+      execute unless @exectued
     end
 
     def configure
       Thread.abort_on_exception = true
 
-      Spec::Runner.configure do |config|
+      RSpec.configure do |config|
         config.include(MessagesHelper)
 
         if WatirSpec.persistent_browser == false
@@ -45,13 +51,11 @@ module WatirSpec
     end
 
     def load_requires
-      # load spec_helper from containing folder, if it exists
-      hook = File.expand_path("../../spec_helper.rb", File.dirname(__FILE__))
-      raise(Errno::ENOENT, hook) unless File.exist?(hook)
-
-      load hook
+      require "rspec"
       require "fileutils"
-      require "spec"
+
+      implementation = File.expand_path("../../../implementation.rb", __FILE__)
+      load implementation
 
       begin
         require "ruby-debug"

data/spec/watirspec/lib/server.rb

@@ -11,13 +11,7 @@ module WatirSpec
           Thread.new { run! }
           sleep 0.1 until WatirSpec::Server.running?
         when :windows
-          require "win32/process"
-          pid = Process.create(
-            :app_name        => "#{WatirSpec.ruby} #{File.dirname(__FILE__)}/../spec_helper.rb",
-            :process_inherit => true,
-            :thread_inherit  => true,
-            :inherit         => true
-          ).process_id
+          run_in_child_process
         else
           pid = fork { run! }
           sleep 0.5 until listening?
@@ -81,6 +75,19 @@ module WatirSpec
       rescue SocketError, Errno::EADDRINUSE
         false
       end
+
+      private
+
+      def run_in_child_process
+        begin
+          require "childprocess"
+        rescue LoadError => ex
+          raise "please run `gem install childprocess` for WatirSpec on Windows + MRI\n\t(caught: #{ex.message})"
+        end
+
+        process = ChildProcess.build(WatirSpec.ruby, File.expand_path("../../spec_helper", __FILE__))
+        at_exit { process.stop }
+      end
     end # class << Server
 
     set :public,      WatirSpec.html

data/spec/watirspec/link_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Link" do
 

data/spec/watirspec/links_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Links" do
 

data/spec/watirspec/lis_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Lis" do
 

data/spec/watirspec/map_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Map" do
 

data/spec/watirspec/maps_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Maps" do
 

data/spec/watirspec/meta_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Meta" do
   before :each do

data/spec/watirspec/metas_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Metas" do
 

data/spec/watirspec/ol_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Ol" do
 

data/spec/watirspec/ols_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Ols" do
 

data/spec/watirspec/option_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Option" do
 

data/spec/watirspec/p_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "P" do
 

data/spec/watirspec/pre_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Pre" do
 

data/spec/watirspec/pres_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Pres" do
 

data/spec/watirspec/ps_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Ps" do
 

data/spec/watirspec/radio_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Radio" do
 

data/spec/watirspec/radios_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Radios" do
 

data/spec/watirspec/select_list_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "SelectList" do
 

data/spec/watirspec/select_lists_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "SelectLists" do
 

data/spec/watirspec/span_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Span" do
 

data/spec/watirspec/spans_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Spans" do
 

data/spec/watirspec/spec_helper.rb

@@ -8,11 +8,13 @@ require "sinatra/base"
 require "#{File.dirname(__FILE__)}/lib/watirspec"
 require "#{File.dirname(__FILE__)}/lib/implementation"
 require "#{File.dirname(__FILE__)}/lib/server"
-require "#{File.dirname(__FILE__)}/lib/spec_helper"
+require "#{File.dirname(__FILE__)}/lib/runner"
 require "#{File.dirname(__FILE__)}/lib/guards"
 
 if __FILE__ == $0
+  # this is needed in order to have a stable Server on Windows + MRI
   WatirSpec::Server.run!
 else
-  WatirSpec::SpecHelper.execute
+  WatirSpec::Runner.execute_if_necessary
 end
+

data/spec/watirspec/strong_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Strong" do
 

data/spec/watirspec/strongs_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Strongs" do
 

data/spec/watirspec/table_nesting_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Table" do
 

data/spec/watirspec/table_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Table" do
 

data/spec/watirspec/tables_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Tables" do
 

data/spec/watirspec/tbody_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "TableBody" do
 

data/spec/watirspec/tbodys_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "TableBodies" do
 

data/spec/watirspec/td_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "TableCell" do