waterpig 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cac3c75de7c346b913bafadf07d0b06d024813c
-  data.tar.gz: 5562e83ea984b490cc8bf19d7dae8d7a438c0224
+  metadata.gz: 5ba1801656f48cbb9745fda0ca698f00774e4559
+  data.tar.gz: 7cbb8eb199b0a1e82e78b644d197e64974b2011d
 SHA512:
-  metadata.gz: 74a8c431b58f9d8e9ba1d3abc47109b4ade0ecde1d276b4bb465dbf462f6581eaeda14306d3222c0db6820958bcf82af5680cd4650172f85010da8b68910e9c4
-  data.tar.gz: dfded4c03470f5dce9c4c59f5c292d1b7b118a4c17047ddbbf263548beb774c0e05c7559569e1c15586dfc078561fb8fb3ff9240ba7a4eda4ef3df160d3f2100
+  metadata.gz: eb0977b22a40cc474c5758fa5f2d4f4bd0841cf5a7ad30f35c7773247937b907d0de010da789c2b07d527b51168b687ae71057809880ac849b9305417c9ca858
+  data.tar.gz: 36eaf853983c69b02deaee21a19220e9cf29f30254a355b7a06a5262897d1a6ec98a5d7923b2ab0556d33cee3846b9f0d6ce2405dc3826280b7f3d3d6dd3d3ff

data/lib/waterpig/database-cleaner.rb

@@ -75,17 +75,16 @@ RSpec.configure do |config|
   config.after(:all) do
     last_type = self.class.metadata[:type].to_s
   end
-
-  config.before(:all, :description => proc{|value, metadata| use_refresh?(config, metadata)}) do
-    Waterpig::RequestWaitMiddleware.wait_for_idle do
+  #Before the first group following a refresh-group, refresh again.
+  #Faster than refreshing before and after all the feature groups
+  config.before(:all, :description => proc{|value, metadata| use_refresh?(config, metadata) }) do
+    unless config.waterpig_reset_types.map(&:to_s).include?(last_type)
       Waterpig::TemplateRefresh.refresh_database(config.waterpig_test_database_config)
     end
   end
 
-  #Before the first group following a refresh-group, refresh again.
-  #Faster than refreshing before and after all the feature groups
-  config.before(:all, :description => proc{|value, metadata| !use_refresh?(config, metadata) }) do
-    if config.waterpig_reset_types.include?(last_type)
+  config.after(:all, :description => proc{|value, metadata| use_refresh?(config, metadata)}) do
+    Waterpig::RequestWaitMiddleware.wait_for_idle do
       Waterpig::TemplateRefresh.refresh_database(config.waterpig_test_database_config)
     end
   end

data/lib/waterpig/template-refresh.rb

@@ -123,4 +123,5 @@ begin
     end
   end
 rescue LoadError
+  warn "ActiveRecord not present"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waterpig
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Judson Lester
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-11 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -105,7 +105,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- waterpig-0.9.1 Documentation
+- waterpig-0.9.2 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement