watir-webdriver-rails 0.0.2 → 0.0.3

data/README.md

@@ -1,92 +1,98 @@
-watir-webdriver-rails
-===============
-
-watir-webdriver-rails provides a dead-simple integration test of Watir with Rails 3.
-
-Installation
---------
-
-In your Gemfile, drop the below line
-
-``
-gem 'watir-webdriver-rails'
-``
-
-and type:
-
-``
-bundle install
-``
-
-from your command line and Rails's root folder
-
-How to use
--------
-
-In your spec_helper.rb, please place the below lines:
-(watir-webdriver-rails uses RSpec as the testing framework)
-
-```ruby
-
-require 'rspec/rails'
-require 'watir-webdriver-rails'
-
-WatirWebdriverRails.host = "localhost"
-WatirWebdriverRails.port = 57124
-
-```
-
-In your integration test file, it should look something like this:
-
-```ruby
-
-require 'spec_helper'
-
-describe "Test something" do
-
-	it "should go to some page and fill textbox" do
-	
-		browser.goto "/member"
-		
-		browser.text_field(:id=>"first_name").set "Tanin"
-		browser.text_field(:id=>"last_name").set "Na Nakorn"
-		
-		browser.text_field(:id=>"first_name").value.should == "Tanin"
-	end
-end
-
-```
-
-browser is of type Watir::Browser. You may interact with it freely.
-See http://rubydoc.info/gems/watir-webdriver/0.3.2/Watir/Browser
-
-Dependencies
-------------
-
-* watir-webdriver
-* rspec
-
-Development
------------------------------
-
-* Fork the project.
-* Add features or fix bugs
-* Add test cases for it
-* Send me a pull request
-
-Please try running all the test cases first by going to the root folder and type:
-
-``
-bundle exec rspec spec/*
-``
-
-
-License
----------
-
-There are parts which are copied from capybara and capybara-firebug gems. Please also be aware of their licenses.
-Other than that, you can do anything with it.
-
-Author
----------
-Tanin Na Nakorn
+watir-webdriver-rails
+===============
+
+watir-webdriver-rails provides a dead-simple way to use Watir with Rails 3.
+
+Current version
+----------------
+``
+0.0.2
+``
+
+Installation
+--------
+
+In your Gemfile, drop the below line
+
+``
+gem 'watir-webdriver-rails'
+``
+
+and type:
+
+``
+bundle install
+``
+
+from your command line and Rails's root folder
+
+How to use
+-------
+
+In your spec_helper.rb, please place the below lines:
+(watir-webdriver-rails uses RSpec as the testing framework)
+
+```ruby
+
+require 'rspec/rails'
+require 'watir-webdriver-rails'
+
+WatirWebdriverRails.host = "localhost"
+WatirWebdriverRails.port = 57124
+
+```
+
+In your integration test file, it should look something like this:
+
+```ruby
+
+require 'spec_helper'
+
+describe "Test something" do
+
+	it "should go to some page and fill textbox" do
+	
+		browser.goto "/member"
+		
+		browser.text_field(:id=>"first_name").set "Tanin"
+		browser.text_field(:id=>"last_name").set "Na Nakorn"
+		
+		browser.text_field(:id=>"first_name").value.should == "Tanin"
+	end
+end
+
+```
+
+browser is of type Watir::Browser. You may interact with it freely.
+See http://rubydoc.info/gems/watir-webdriver/0.3.2/Watir/Browser
+
+Dependencies
+------------
+
+* watir-webdriver
+* rspec
+
+Development
+-----------------------------
+
+* Fork the project.
+* Add features or fix bugs
+* Add test cases for it
+* Send me a pull request
+
+Please try running all the test cases first by going to the root folder and type:
+
+``
+bundle exec rspec spec/*
+``
+
+
+License
+---------
+
+There are parts which are copied from capybara and capybara-firebug gems. Please also be aware of their licenses.
+Other than that, you can do anything with it.
+
+Author
+---------
+Tanin Na Nakorn

data/lib/watir-webdriver-rails.rb

@@ -14,23 +14,17 @@ require 'watir-webdriver-rails/rspec'
 # start server
 RSpec.configure do |config|
   
-  config.include WatirWebdriverRails::RSpec
+  config.include WatirWebdriverRails::RSpec, :example_group=>{:file_path=>/spec[\\\/](requests|integration)/}
   
-  config.before(:suite) do
-     WatirWebdriverRails.run_server
-     WatirWebdriverRails.initialize_browser
-     
-     WatirWebdriverRails.browser.class_eval do
-       alias_method :old_goto,:goto
-       
-       def goto(*args)
-         
-         if !args[0].match(/^https?:/)
-            args[0] = "http://#{WatirWebdriverRails.host}:#{WatirWebdriverRails.port}#{args[0]}"
-         end
-         
-         old_goto(*args)      
-       end
-     end
+  config.after do
+    if self.class.include?(WatirWebdriverRails::RSpec)
+      browser.clear_cookies
+    end
+  end
+  config.before do
+    if self.class.include?(WatirWebdriverRails::RSpec)
+       WatirWebdriverRails.run_server
+       WatirWebdriverRails.initialize_browser
+    end
   end
 end

data/lib/watir-webdriver-rails/browser.rb

@@ -1,9 +1,27 @@
 module WatirWebdriverRails
   class << self
-    attr_accessor :browser
+    attr_accessor :browser,:browser_initialized
     
     def initialize_browser
+      
+      return if @browser_initialized == true
+      
       @browser = Watir::Browser.new(WatirWebdriverRails.driver)
+      
+      @browser.class_eval do
+         alias_method :old_goto,:goto
+         
+         def goto(*args)
+           
+           if !args[0].match(/^https?:/)
+              args[0] = "http://#{WatirWebdriverRails.host}:#{WatirWebdriverRails.port}#{args[0]}"
+           end
+           
+           old_goto(*args)      
+         end
+      end
+      
+      @browser_initialized = true
     end
     
   end

data/lib/watir-webdriver-rails/rails.rb

@@ -19,11 +19,12 @@ module WatirWebdriverRails
   end
 
   class << self
-    attr_accessor :host, :port, :server_boot_timeout, :app
+    attr_accessor :host, :port, :server_boot_timeout, :app, :server_running
     
     
     
     def run_server
+      return if @server_running == true
       
       @app = Rack::Builder.new {
         map "/" do
@@ -55,6 +56,8 @@ module WatirWebdriverRails
           false 
         end
       end
+      
+      @server_running = true
     end
     
     

data/lib/watir-webdriver-rails/version.rb

@@ -1,3 +1,3 @@
 module WatirWebdriverRails
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/controllers/home_controller_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe HomeController do
+  it "do nothing" do
+    post :index
+    
+  end
+end

data/spec/rails/config/application.rb

@@ -5,7 +5,7 @@ require File.expand_path('../boot', __FILE__)
 # require "active_record/railtie"
 require "action_controller/railtie"
 #require "action_mailer/railtie"
-require "active_resource/railtie"
+#require "active_resource/railtie"
 #require "rails/test_unit/railtie"
 
 

data/spec/rails/script/cucumber

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+vendored_cucumber_bin = Dir["#{File.dirname(__FILE__)}/../vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+if vendored_cucumber_bin
+  load File.expand_path(vendored_cucumber_bin)
+else
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
+  require 'cucumber'
+  load Cucumber::BINARY
+end

data/spec/rails/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby.exe
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/spec/spec_helper.rb

@@ -6,7 +6,8 @@ ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../rails/config/environment", __FILE__)
 
 require 'rspec/rails'
-require 'watir-webdriver-rails'
+#require 'watir-webdriver-rails'
+File.expand_path("../../watir-webdriver-rails", __FILE__)
 
 WatirWebdriverRails.host = "localhost"
 WatirWebdriverRails.port = 57124

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir-webdriver-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-06 00:00:00.000000000Z
+date: 2011-09-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &19865820 !ruby/object:Gem::Requirement
+  requirement: &19468908 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *19865820
+  version_requirements: *19468908
 description: WebDriver-backed Watir for Rails
 email:
 - tanin47@gmail.com
@@ -45,6 +45,7 @@ files:
 - lib/watir-webdriver-rails/rspec.rb
 - lib/watir-webdriver-rails/util/timeout.rb
 - lib/watir-webdriver-rails/version.rb
+- spec/controllers/home_controller_spec.rb
 - spec/integration/rails_spec.rb
 - spec/rails/Gemfile
 - spec/rails/Gemfile.lock
@@ -57,6 +58,8 @@ files:
 - spec/rails/config/environment.rb
 - spec/rails/config/routes.rb
 - spec/rails/log/test.log
+- spec/rails/script/cucumber
+- spec/rails/script/rails
 - spec/spec_helper.rb
 - watir-webdriver-rails.gemspec
 homepage: http://github.com/tanin47/watir-webdriver-rails