capybara-rails 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8e2cc99066743bbcf06f90d7c79adbc7b3a60e5
-  data.tar.gz: ea8ac14317cbdb36d5f7b89d0b05a21a6ef4cdbe
+  metadata.gz: bf0b5fc2e26c3956c33e5e1e55af16994d665807
+  data.tar.gz: 7b73f197dbdd21be9dae6821e25e99e7e85302c7
 SHA512:
-  metadata.gz: 3a815484ef1b42dc421203fd2b7e03aa9f2299c0bbb23d09a864bbb9adfafbde7bb750160ffae3ba92b84b9a383134102dfbef14f00e64d61eeabee52dc943c5
-  data.tar.gz: a05c5abe57b6bef85bd1007ab004d1ee521e09655c4d3e3b23b9ca7f3184bce2561de648d7ac5528baab3c269ae3652e24843a9678d609c68f2bfffce995bc2d
+  metadata.gz: 2b1a2e7c64509009dd26945d028dc8700bbdff0ac543afb855475b41c6659871ab64d870ac4eb89403181978ed6c4c88ea00c5854717d6a179d1c232999e0bec
+  data.tar.gz: 5603a8ea66a2715ea654aae23ec509e7c385079270ef34400e1f428e633cec060900504b3b12c6c8b583a022ac6f0bd1ff1d78ed4666adbcb9a052ca6d597605

data/capybara-rails.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "capybara"
   spec.add_runtime_dependency "capybara-console"
   spec.add_runtime_dependency "exception_notification"
+  spec.add_runtime_dependency "database_cleaner"
 end

data/lib/capybara-rails/action_dispatch_integration.rb

@@ -0,0 +1,26 @@
+class ActionDispatch::IntegrationTest
+  include Capybara::DSL
+
+  if defined?(ActiveRecord::Base)
+    setup do
+      ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+      ActiveRecord::Base.descendants.each do |model|
+        model.shared_connection = model.connection
+      end
+      DatabaseCleaner.start
+    end
+
+    teardown do
+      DatabaseCleaner.clean
+    end
+  end
+
+  def saop
+    save_and_open_page
+  end
+
+  def assert_response(type)
+    result = page.status_code == Rack::Utils::SYMBOL_TO_STATUS_CODE[type]
+    assert result, ("Expected response to be a %s, but was %s" % [type, page.status_code])
+  end
+end

data/lib/capybara-rails/activerecord.rb

@@ -1,14 +1,7 @@
-#FIXME autoload
-module Capybara
-  module Rails
-    class ActiveRecord::Base
-      mattr_accessor :shared_connection
-      @@shared_connection = nil
+class ActiveRecord::Base
+  class_attribute :shared_connection
 
-      def self.connection
-        @@shared_connection || ConnectionPool::Wrapper.new(:size => 1) { retrieve_connection }
-      end
-    end
-    ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+  def self.connection
+    self.shared_connection || retrieve_connection
   end
 end

data/lib/capybara-rails/railtie.rb

@@ -7,6 +7,17 @@ module Capybara
         end
 
         require 'capybara/rails'
+
+        if defined?(ActiveRecord::Base)
+          require 'capybara-rails/activerecord'
+          require 'database_cleaner'
+          DatabaseCleaner.strategy = :transaction
+        end
+
+        if defined?(ActionDispatch::Integration)
+          require 'capybara-rails/action_dispatch_integration'
+        end
+
         require 'exception_notification'
 
         exception_logger = Logger.new('log/capybara_exceptions.log')

data/lib/capybara-rails/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Rails
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kirill Mokevnin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: capybara for rails
 email:
 - mokevnin@gmail.com
@@ -94,8 +108,8 @@ files:
 - Rakefile
 - capybara-rails.gemspec
 - lib/capybara-rails.rb
+- lib/capybara-rails/action_dispatch_integration.rb
 - lib/capybara-rails/activerecord.rb
-- lib/capybara-rails/minitest.rb
 - lib/capybara-rails/railtie.rb
 - lib/capybara-rails/version.rb
 homepage: ''

data/lib/capybara-rails/minitest.rb

@@ -1,18 +0,0 @@
-module Capybara
-  module Rails
-    module Minitest
-      ActionDispatch::IntegrationTest.class_eval do
-        include Capybara::DSL
-
-        def saop
-          save_and_open_page
-        end
-
-        def assert_response(type)
-          result = page.status_code == Rack::Utils::SYMBOL_TO_STATUS_CODE[type]
-          assert result, ("Expected response to be a %s, but was %s" % [type, page.status_code])
-        end
-      end
-    end
-  end
-end