nofxx-watircuke 0.3.1 → 0.3.2

data/README.rdoc

@@ -27,30 +27,6 @@ cucumber.yml
     watir:   -r features/support/env.rb -r features/support/watir.rb -r features/step_definitions -t watir
 
 
-support/watir.rb
-
-    require 'watircuke'
-    Before do
-      @environment = "http://localhost:3000/
-      sleep 1
-    end
-    # optional
-    # at_exit do
-    #   @browser.close
-    # end
-
-
-support/webrat.rb
-
-    require 'webrat'
-    Webrat.configure do |config|
-      config.mode = :rails
-    end
-    require 'cucumber/rails/rspec'
-    require 'webrat/core/matchers'
-    require 'webratcuke'
-
-
 support/env.rb
 
     ENV["RAILS_ENV"] ||= "cucumber"
@@ -60,6 +36,26 @@ support/env.rb
     Cucumber::Rails.use_transactional_fixtures
     Cucumber::Rails.bypass_rescue # Comment out this line if you want Rails own error handling
 
+    if ENV['CUC_ENV'] == 'watir'
+      require 'watircuke'
+      Before do
+        @environment = "http://localhost:3000/
+        sleep 1
+      end
+      # optional
+      # at_exit do
+      #   @browser.close
+      # end
+    else
+      require 'webrat'
+      Webrat.configure do |config|
+        config.mode = :rails
+      end
+      require 'cucumber/rails/rspec'
+      require 'webrat/core/matchers'
+      require 'webratcuke'
+    end
+
 
 == ABOUT
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/cucumber.yml

@@ -1,2 +1,2 @@
-default: CUC_ENV=watir -r features/support/env.rb -r features/support/paths.rb -r features/support/watir.rb features
-webrat: CUC_ENV=webrat -r features/support/env.rb -r features/support/paths.rb -r features/support/webrat.rb features -t webrat
+default: CUC_ENV=watir -r features/support/env.rb features -t ~webrat
+webrat: CUC_ENV=webrat -r features/support/env.rb features -t webrat

data/features/support/env.rb

@@ -1,3 +1,19 @@
 require 'spec'
-#require 'cucumber/rails/rspec'
-require 'webrat/core/matchers'
+
+if ENV['CUC_ENV'] == 'webrat'
+  require 'webrat/core/matchers'
+  require File.expand_path(File.dirname(__FILE__) + '/../../lib/webratcuke')
+else
+  require File.expand_path(File.dirname(__FILE__) + '/../../lib/watircuke')
+
+  Before do
+    @environment = "http://github.com/"
+    #  sleep 1
+  end
+
+  # "after all"
+  at_exit do
+    @browser.close if @browser
+  end
+
+end

data/watircuke.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{watircuke}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rich Downie", "Marcos Piccinini"]
@@ -21,8 +21,6 @@ Gem::Specification.new do |s|
      "features/sample.feature",
      "features/support/env.rb",
      "features/support/paths.rb",
-     "features/support/watir.rb",
-     "features/support/webrat.rb",
      "lib/watircuke.rb",
      "lib/webratcuke.rb",
      "spec/spec_helper.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-watircuke
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Rich Downie
@@ -32,8 +32,6 @@ files:
 - features/sample.feature
 - features/support/env.rb
 - features/support/paths.rb
-- features/support/watir.rb
-- features/support/webrat.rb
 - lib/watircuke.rb
 - lib/webratcuke.rb
 - spec/spec_helper.rb

data/features/support/watir.rb

@@ -1,11 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../lib/watircuke')
-
-Before do
-  @environment = "http://github.com/"
-#  sleep 1
-end
-
-# "after all"
-at_exit do
-  @browser.close if @browser
-end

data/features/support/webrat.rb

@@ -1,2 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../lib/webratcuke')
-