waterpig 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f2d3287a8c660f5c387fec3faa77aac784eb25b
-  data.tar.gz: 1943bb35f6eabfbc5c26387dd2ca3dcb58cf25fe
+  metadata.gz: b349b7ddbf6e8b2bebf907efb200cf9057b7b3f3
+  data.tar.gz: 8b2607476872f954ca0534e24410ce86e87c941b
 SHA512:
-  metadata.gz: d0a935eceeb133ac31298cdae3a70887bbe3b48e84d1b4613966bce00a3d7b6eeb7cc730d6e6c7a01862db3698abd0bd22c4c2a61b7135d701011ca586bc37f1
-  data.tar.gz: 4a6fbe79a423eed639bb969165b0619ba4982db1aebff4e7bd547c9f54493b99d35317b1fd77031e6c0b3669fdf894331ccd7cead3856f25c936c88e6cd08884
+  metadata.gz: 236c7fa170196b4a70df0f71cac6747bb92e9537efb2d6f8fd29d81bf6975983afebc80d214fc46f868d7e41bbc2daede5fb258ac8088047efe23853fe510d0f
+  data.tar.gz: c0e54fb386ed33c2aacff72f930c4539ac1923f89e4855e5685836a221a887e572f9b6763cead3c6cfa1576b8c3de5935d1acc92e93b4dfe7099528c8bfa528a

data/lib/waterpig/database-cleaner.rb

@@ -4,7 +4,9 @@ RSpec.configure do |config|
   #config.use_transactional_fixtures = false
   DatabaseCleaner.strategy = :transaction
 
+  config.add_setting :waterpig_exclude_cleaning_key, :default => :manual_database_cleaning
   config.add_setting :waterpig_truncation_types, :default => [:feature]
+  config.add_setting :waterpig_skip_cleaning_types, :default => []
   config.add_setting :waterpig_exclude_seeds_types, :default => []
   config.add_setting :waterpig_database_truncation_config, :default => {:except => %w[spatial_ref_sys]}
   config.add_setting :waterpig_db_seeds, :default => 'db/seeds.rb'
@@ -23,7 +25,21 @@ RSpec.configure do |config|
     end
   end
 
-  config.before :all, :type => proc{ |value| config.waterpig_truncation_types.include?(value)} do
+  def use_truncate?(config, metadata)
+    return false if metadata[config.waterpig_exclude_cleaning_key]
+    return false if config.waterpig_skip_cleaning_types.include?(metadata[:type])
+    return false unless config.waterpig_truncation_types.include?(metadata[:type])
+    return true
+  end
+
+  def use_transaction?(config, metadata)
+    return false if metadata[config.waterpig_exclude_cleaning_key]
+    return false if use_truncate?(config, metadata)
+    return false if config.waterpig_skip_cleaning_types.include?(metadata[:type])
+    return true
+  end
+
+  config.before :all, :description => proc{ |value, metadata| use_truncate?(config, metadata) } do
     with_showing(true, false) do
       DatabaseCleaner.clean_with :truncation, config.waterpig_database_truncation_config
       unless config.waterpig_exclude_seeds_types.include?(self.class.metadata[:type])
@@ -34,7 +50,7 @@ RSpec.configure do |config|
     end
   end
 
-  config.after :all, :type => proc{ |value| config.waterpig_truncation_types.include?(value)} do
+  config.after :all, :description => proc{ |value, metadata| use_truncate?(config, metadata) } do
     with_showing(true, true) do
       Rails.application.config.action_dispatch.show_detailed_exceptions = true
       DatabaseCleaner.clean_with :truncation, config.waterpig_database_truncation_config
@@ -44,11 +60,11 @@ RSpec.configure do |config|
     end
   end
 
-  config.before :each, :type => proc{ |value| !config.waterpig_truncation_types.include?(value) } do
+  config.before :each, :description => proc{ |value, metadata| use_transaction?(config, metadata) } do
     DatabaseCleaner.start
   end
 
-  config.after :each, :type => proc{ |value| !config.waterpig_truncation_types.include?(value) } do
+  config.after :each, :description => proc{ |value, metadata| use_transaction?(config, metadata) } do
     DatabaseCleaner.clean
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waterpig
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Judson Lester
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -77,22 +77,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/waterpig.rb
-- lib/waterpig/browser-console-logger.rb
-- lib/waterpig/browser-integration.rb
-- lib/waterpig/browser-size.rb
-- lib/waterpig/browser-tools.rb
+- lib/waterpig/save-and-open-on-fail.rb
 - lib/waterpig/ckeditor-tools.rb
+- lib/waterpig/selenium_chrome.rb
 - lib/waterpig/database-cleaner.rb
 - lib/waterpig/deadbeat-connections.rb
-- lib/waterpig/poltergeist.rb
-- lib/waterpig/save-and-open-on-fail.rb
-- lib/waterpig/selenium_chrome.rb
-- lib/waterpig/snap-step.rb
 - lib/waterpig/tinymce-tools.rb
+- lib/waterpig/browser-integration.rb
+- lib/waterpig/browser-console-logger.rb
+- lib/waterpig/poltergeist.rb
 - lib/waterpig/warning-suppressor.rb
+- lib/waterpig/snap-step.rb
+- lib/waterpig/browser-tools.rb
+- lib/waterpig/browser-size.rb
 - spec/embarrassing.rb
-- spec_help/gem_test_suite.rb
 - spec_help/spec_helper.rb
+- spec_help/gem_test_suite.rb
 homepage: http://nyarly.github.com/waterpig
 licenses:
 - MIT
@@ -103,7 +103,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- waterpig-0.6.1 Documentation
+- waterpig-0.7.0 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: waterpig
-rubygems_version: 2.4.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Capybara helper stuff