pseudo_cleaner 0.0.29 → 0.0.30

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODhhODA3NTdjMDkxM2Q5MGIxMjAwMGMyNWMxYzI5NDBkYzJmMmRlYg==
+    OWQ1NjM5ZjVhZThkYTAwMzBmMGUzYjNjZjg1OTI5ODdhZTg0ZWY3Mw==
   data.tar.gz: !binary |-
-    ZWZkM2E1YmI1ZjI3ZTAwMmY1NzgyMWI1YjRkYmQwNDFhMzY1MDE1NA==
+    ODFkNjg4NWJmZTNkZGI0MDdhYWE0MjYyMTI2YjQ4M2RjYWJlYWJiYQ==
 SHA512:
   metadata.gz: !binary |-
-    YWZlYTk2ODUwNTQ3NTEyNzgyMWFhYjlhNThiYmIzOWEzYjQzODgzOTc4Y2Zi
-    NTgwYmI5MGZkM2YwMDE0MGFlMGZkMDI5OGJmY2FmNmViNGJmZTFkMjgzN2U5
-    ZjY2ZDdiNTQ4YzllZWIwYzNlOTQ5ZDI1M2I3ZThkY2ExMTZlNGE=
+    YjBlMGFjN2E2MzVjMGI5NmIzOGM2MzU1NWVjMTE2NjA0YWVhYWM3NDdhNThh
+    MGViMTMxZTQyYmI3YzUxOTcxYTcxMDgyZDlmZjI4NjBlNDlhZGNmOGM1MTMy
+    NDY3YmQ0MTkxYWRhNWU1NWRmY2I4MTIzMjliMjcwZjI1ZGFlM2E=
   data.tar.gz: !binary |-
-    NGIxMGFkMWI3MWNmNWQzZTZhM2Q3NDBhMmY2ODUxYzk4YmZlZjM3ZWE4OGFj
-    MWIxZjA5YjQ5ZTUyMzQ4MWQ2OGQ3YmUzNmIzZDEwMmE5ZDJlYjE5MjY1OTIw
-    NjhhYjZlMmI0YzIzNWY1MTBmOThhY2Y4MjVhMDdlM2U4MGRlMDc=
+    NGNhYWY0Y2M0YmY3YWY0YjllMzllY2U4NDY2Njg3YjEyMTcxMmY1ZjdiMWMw
+    M2Q4OWRiYzk0MzFhOGVjMTFiMjY1NDE1MDI0MzU2MmMyNWRjMDZmZmRmNzVm
+    MDU5NGRlZGQyYzM2NTRiMWI3ZjUwZDA3NjFkZTA3M2Y3MDBmZjA=

data/lib/pseudo_cleaner/configuration.rb

@@ -18,11 +18,11 @@ module PseudoCleaner
     end
 
     def initialize
-      @output_diagnostics = false           # false to keep the noise level down...
+      @output_diagnostics          = false  # false to keep the noise level down...
       @clean_database_before_tests = false  # false because I think it will annoy developers...
-      @reset_auto_increment = true          # true because I think it should be done
-      @single_cleaner_set = true            # true because I hope it will improve performance
-      @post_transaction_analysis = false    # should only be set true if you are searching for a problem
+      @reset_auto_increment        = true   # true because I think it should be done
+      @single_cleaner_set          = true   # true because I hope it will improve performance
+      @post_transaction_analysis   = false  # should only be set true if you are searching for a problem
     end
 
     def self.db_connection=(connection)

data/lib/pseudo_cleaner/cucumber.rb

@@ -3,6 +3,10 @@ require "singleton"
 # turn off Cucumber's default usage of DatabaseCleaner
 Cucumber::Rails::Database.autorun_database_cleaner = false
 
+AfterConfiguration do |config|
+  CucumberHook.instance.init_pseudo
+end
+
 class CucumberHook
   include Singleton
 
@@ -12,7 +16,7 @@ class CucumberHook
     @first_test_run = false
   end
 
-  def run_test(scenario, strategy, block)
+  def init_pseudo
     unless first_test_run
       @first_test_run = true
       # before tests run...
@@ -26,31 +30,90 @@ class CucumberHook
 
       DatabaseCleaner.strategy = :transaction
     end
+  end
 
+  def start_test(scenario, strategy)
     PseudoCleaner::MasterCleaner.start_example(scenario, strategy)
+  end
+
+  def end_test(scenario)
+    PseudoCleaner::MasterCleaner.end_example(scenario)
+  end
+
+  def run_test(scenario, strategy, block)
+    start_test(scenario, strategy)
 
     begin
       block.call
     ensure
-      PseudoCleaner::MasterCleaner.end_example(scenario)
+      end_test(scenario)
     end
   end
 end
 
-Around("~@truncation", "~@deletion") do |scenario, block|
-  CucumberHook.instance.run_test(scenario, :pseudo_delete, block)
-end
+##
+#  Most testing systems do tests as:
+#   * Around
+#   *   Before
+#   *   After
+#
+# Cucumber doesn't.  It does it:
+#   * Before
+#   * Around
+#   * After
+#
+# What is more, it is WAY worse than that.
+#
+# If your Feature has a Background block:
+#     Feature my feature
+#
+#     Background
+#     Scenario
+#
+# Then the Before happens before the Background whereas the Around is only around the
+# Scenario part of the feature.
+#
+# I hope that this gets fixed, but until it does, we can't use Around for database cleaning.
+#
+# This is fixed in Cucumber 2.0.
 
-Around("@truncation") do |scenario, block|
-  CucumberHook.instance.run_test(scenario, :truncation, block)
-end
 
-Around("@deletion", "~@truncation") do |scenario, block|
-  CucumberHook.instance.run_test(scenario, :deletion, block)
-end
+if Cucumber::VERSION.split[0].to_i >= 2
+  Around("~@truncation", "~@deletion") do |scenario, block|
+    CucumberHook.instance.run_test(scenario, :pseudo_delete, block)
+  end
 
-Around("@none") do |scenario, block|
-  CucumberHook.instance.run_test(scenario, :none, block)
+  Around("@truncation") do |scenario, block|
+    CucumberHook.instance.run_test(scenario, :truncation, block)
+  end
+
+  Around("@deletion", "~@truncation") do |scenario, block|
+    CucumberHook.instance.run_test(scenario, :deletion, block)
+  end
+
+  Around("@none") do |scenario, block|
+    CucumberHook.instance.run_test(scenario, :none, block)
+  end
+else
+  Before("~@truncation", "~@deletion") do |scenario|
+    CucumberHook.instance.start_test(scenario, :pseudo_delete)
+  end
+
+  Before("@truncation") do |scenario|
+    CucumberHook.instance.start_test(scenario, :truncation)
+  end
+
+  Before("@deletion", "~@truncation") do |scenario|
+    CucumberHook.instance.start_test(scenario, :deletion)
+  end
+
+  Before("@none") do |scenario|
+    CucumberHook.instance.start_test(scenario, :none)
+  end
+
+  After do |scenario|
+    CucumberHook.instance.end_test(scenario)
+  end
 end
 
 at_exit do

data/lib/pseudo_cleaner/version.rb

@@ -1,3 +1,3 @@
 module PseudoCleaner
-  VERSION = "0.0.29"
+  VERSION = "0.0.30"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pseudo_cleaner
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - RealNobody