enginex 0.2.0 → 0.3.0

data/lib/enginex.rb

@@ -6,9 +6,8 @@ require "active_support/core_ext/string"
 require "rails/generators"
 require "generators/rails/app/app_generator"
 
-# TODO Remove webrat hack file
 class Enginex < Thor::Group
-  VERSION = "0.2.0".freeze
+  VERSION = "0.3.0".freeze
 
   include Thor::Actions
   check_unknown_options!
@@ -59,6 +58,12 @@ class Enginex < Thor::Group
     store_application_definition!
     template "rails/boot.rb", "test/dummy/config/boot.rb", :force => true
     template "rails/application.rb", "test/dummy/config/application.rb", :force => true
+    gsub_file "test/dummy/config/environments/test.rb", "end\n", <<-CONTENT
+
+  # Remove show exceptions middleware from tests, so we always Ruby failures.
+  config.middleware.delete "ActionDispatch::ShowExceptions"
+end
+    CONTENT
   end
 
   say_step "Removing unneeded files"

data/lib/templates/root/Gemfile.tt

@@ -1,7 +1,7 @@
 source "http://gemcutter.org"
 
 gem "rails", "<%= ActiveSupport::VERSION::STRING %>"
-gem "webrat", "0.7"
+gem "capybara", "0.3.5"
 gem "sqlite3-ruby", :require => "sqlite3"
 
 if RUBY_VERSION < '1.9'

data/lib/templates/root/test/integration/navigation_test.rb.tt

@@ -1,6 +1,8 @@
 require 'test_helper'
 
-class NagivationTest < ActionController::IntegrationTest
+class NagivationTest < ActiveSupport::TestCase
+  include Capybara
+
   test "truth" do
     assert_kind_of Dummy::Application, Rails.application
   end

data/lib/templates/root/test/test_helper.rb

@@ -8,12 +8,9 @@ ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
 ActionMailer::Base.default_url_options[:host] = "test.com"
 
-$:.unshift File.dirname(__FILE__)
 Rails.backtrace_cleaner.remove_silencers!
 
-Webrat.configure do |config|
-  config.mode = :rails
-  config.open_error_files = false
-end
+require "capybara/rails"
+Capybara.default_driver = :rack_test
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/test/enginex_test.rb

@@ -5,7 +5,7 @@ class EnginexTest < ActiveSupport::TestCase
     run_enginex do
       # Root
       assert_file "Rakefile"
-      assert_file "Gemfile", /gem "rails"/, /gem "webrat"/
+      assert_file "Gemfile", /gem "rails"/, /gem "capybara"/
       assert_file ".gitignore", /\.bundle/, /db\/\*\.sqlite3/
 
       # Lib
@@ -21,6 +21,7 @@ class EnginexTest < ActiveSupport::TestCase
 
       # Vendored Rails
       assert_file "test/dummy/config/application.rb"
+      assert_file "test/dummy/config/environments/test.rb", /ActionDispatch::ShowExceptions/
     end
   end
 

data/test/test_helper.rb

@@ -6,6 +6,7 @@ rescue LoadError
 end
 
 ENV["RAILS_ENV"] ||= "test"
+require 'fileutils'
 require 'test/unit'
 require 'active_support'
 require 'active_support/test_case'
@@ -20,7 +21,6 @@ FileUtils.rm_rf(DESTINATION_ROOT)
 $:.unshift LIB_PATH
 require 'enginex'
 
-
 class ActiveSupport::TestCase
   def run_enginex
     $counter += 1

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: enginex
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,49 +14,64 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 +01:00
+date: 2010-03-17 00:00:00 +01:00
 default_executable: enginex
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 13
+        - 0
         version: 0.13.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bundler
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 0
         version: 0.9.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rails
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
         version: "0.8"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 description: Creates a Rails 3 engine with Rakefile, Gemfile and running tests
 email: jose.valim@plataformatec.com.br
 executables: 
@@ -74,7 +94,6 @@ files:
 - lib/templates/root/test/%underscored%_test.rb.tt
 - lib/templates/root/test/integration/navigation_test.rb.tt
 - lib/templates/root/test/test_helper.rb
-- lib/templates/root/test/webrat/integrations/rails.rb
 has_rdoc: true
 homepage: http://github.com/josevalim/enginex
 licenses: []
@@ -88,18 +107,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Creates a Rails 3 engine with Rakefile, Gemfile and running tests

data/lib/templates/root/test/webrat/integrations/rails.rb

@@ -1,31 +0,0 @@
-require 'webrat/core/elements/field'
-
-module Webrat
-  Field.class_eval do
-    def parse_rails_request_params(params)
-      Rack::Utils.parse_nested_query(params)
-    end
-  end
-end
-
-module ActionController #:nodoc:
-  IntegrationTest.class_eval do
-    include Webrat::Methods
-    include Webrat::Matchers
- 
-    # The Rails version of within supports passing in a model and Webrat
-    # will apply a scope based on Rails' dom_id for that model.
-    #
-    # Example:
-    #   within User.last do
-    #     click_link "Delete"
-    #   end
-    def within(selector_or_object, &block)
-      if selector_or_object.is_a?(String)
-        super
-      else
-        super('#' + RecordIdentifier.dom_id(selector_or_object), &block)
-      end
-    end
-  end
-end