pseudo_cleaner 0.0.28 → 0.0.29

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGRjMGFmMTBkN2Y2MjUzNDUxMjdlNGUyMjkxMmUwMjdiOWM1YzY0NA==
+    ODhhODA3NTdjMDkxM2Q5MGIxMjAwMGMyNWMxYzI5NDBkYzJmMmRlYg==
   data.tar.gz: !binary |-
-    NWQzZTg1ODM1ZWMzNzI4MTJkZDA3ZjgzNDE2OGRjNTI2NGQxNzczNw==
+    ZWZkM2E1YmI1ZjI3ZTAwMmY1NzgyMWI1YjRkYmQwNDFhMzY1MDE1NA==
 SHA512:
   metadata.gz: !binary |-
-    ZGQ5NDRjMGZiOTJlMzI2YWVmMTljZGNhMDFlYzhkOTdiMzVjNDI5ZmEzMjIw
-    MmRkZjI5MTE1MThmZDkwNDIyNWE5YjA5NDkxNzcxNmMyYzQwODM1YWY1YTVl
-    Mjc2OTRmZThjYTJjNzZkYmU2ZmUxZjc5Mzk0Zjk1MWNiODBkMmI=
+    YWZlYTk2ODUwNTQ3NTEyNzgyMWFhYjlhNThiYmIzOWEzYjQzODgzOTc4Y2Zi
+    NTgwYmI5MGZkM2YwMDE0MGFlMGZkMDI5OGJmY2FmNmViNGJmZTFkMjgzN2U5
+    ZjY2ZDdiNTQ4YzllZWIwYzNlOTQ5ZDI1M2I3ZThkY2ExMTZlNGE=
   data.tar.gz: !binary |-
-    ODY3ZmIyNDIwZDgyNjI5ODBlZTY4MzA2NDkxZjhmNGRlZGE5YzQ4YmJhZjdi
-    NzI4Yjk3ZTE1NGU1YTU4OWRiYjJlYTgzOTc3NjBlODA2ODYzNWM2MzdmOWYx
-    NmIyMzVjMmY1MjRkYTU0Y2NmOGExMGMzNzNkMmYwM2QyZGVmYTM=
+    NGIxMGFkMWI3MWNmNWQzZTZhM2Q3NDBhMmY2ODUxYzk4YmZlZjM3ZWE4OGFj
+    MWIxZjA5YjQ5ZTUyMzQ4MWQ2OGQ3YmUzNmIzZDEwMmE5ZDJlYjE5MjY1OTIw
+    NjhhYjZlMmI0YzIzNWY1MTBmOThhY2Y4MjVhMDdlM2U4MGRlMDc=

data/lib/pseudo_cleaner/cucumber.rb

@@ -1,41 +1,56 @@
-first_test_run                                     = false
+require "singleton"
 
 # turn off Cucumber's default usage of DatabaseCleaner
 Cucumber::Rails::Database.autorun_database_cleaner = false
 
-Before do |scenario|
-  unless first_test_run
-    first_test_run = true
-    # before tests run...
-    # We start suite in case a custom cleaner wants/needs to.
-    if PseudoCleaner::Configuration.current_instance.clean_database_before_tests
-      PseudoCleaner::MasterCleaner.reset_database
-    else
-      PseudoCleaner::MasterCleaner.start_suite
-    end
+class CucumberHook
+  include Singleton
+
+  attr_accessor :first_test_run
 
-    DatabaseCleaner.strategy = :transaction
+  def initialize
+    @first_test_run = false
   end
-end
 
-Before("~@truncation", "~@deletion") do |scenario|
-  PseudoCleaner::MasterCleaner.start_example(scenario, :pseudo_delete)
+  def run_test(scenario, strategy, block)
+    unless first_test_run
+      @first_test_run = true
+      # before tests run...
+      # We start suite in case a custom cleaner wants/needs to.
+
+      if PseudoCleaner::Configuration.current_instance.clean_database_before_tests
+        PseudoCleaner::MasterCleaner.reset_database
+      else
+        PseudoCleaner::MasterCleaner.start_suite
+      end
+
+      DatabaseCleaner.strategy = :transaction
+    end
+
+    PseudoCleaner::MasterCleaner.start_example(scenario, strategy)
+
+    begin
+      block.call
+    ensure
+      PseudoCleaner::MasterCleaner.end_example(scenario)
+    end
+  end
 end
 
-Before("@truncation") do |scenario|
-  PseudoCleaner::MasterCleaner.start_example(scenario, :truncation)
+Around("~@truncation", "~@deletion") do |scenario, block|
+  CucumberHook.instance.run_test(scenario, :pseudo_delete, block)
 end
 
-Before("@deletion", "~@truncation") do |scenario|
-  PseudoCleaner::MasterCleaner.start_example(scenario, :deletion)
+Around("@truncation") do |scenario, block|
+  CucumberHook.instance.run_test(scenario, :truncation, block)
 end
 
-Before("@none") do |scenario|
-  PseudoCleaner::MasterCleaner.start_example(scenario, :none)
+Around("@deletion", "~@truncation") do |scenario, block|
+  CucumberHook.instance.run_test(scenario, :deletion, block)
 end
 
-After do |scenario|
-  PseudoCleaner::MasterCleaner.end_example(scenario)
+Around("@none") do |scenario, block|
+  CucumberHook.instance.run_test(scenario, :none, block)
 end
 
 at_exit do

data/lib/pseudo_cleaner/rspec.rb

@@ -15,31 +15,30 @@ RSpec.configure do |config|
     PseudoCleaner::MasterCleaner.end_suite
   end
 
-  config.before(:each) do |example|
-    new_strategy = nil
+  config.around(:each) do |example|
+    test_example = example.example if example.respond_to?(:example)
+    test_example ||= self.example if self.respond_to?(:example)
 
-    clean_example = example
-    clean_example = example.example if example.respond_to?(:example)
+    new_strategy = nil
 
-    new_strategy = clean_example.metadata[:strategy]
+    new_strategy = test_example.metadata[:strategy]
 
     if new_strategy && !PseudoCleaner::MasterCleaner::CLEANING_STRATEGIES.include?(new_strategy)
-      PseudoCleaner::Logger.write "*** Unknown/invalid cleaning strategy #{clean_example.metadata[:strategy]}.  Using default: :transaction ***".red.on_light_white
+      PseudoCleaner::Logger.write "*** Unknown/invalid cleaning strategy #{test_example.metadata[:strategy]}.  Using default: :transaction ***".red.on_light_white
       new_strategy = :transaction
     end
-    if clean_example.metadata[:js]
+    if test_example.metadata[:js]
       new_strategy ||= :pseudo_delete
       new_strategy = :pseudo_delete if new_strategy == :transaction
     end
     new_strategy ||= :transaction
 
-    PseudoCleaner::MasterCleaner.start_example(clean_example, new_strategy)
-  end
+    PseudoCleaner::MasterCleaner.start_example(test_example, new_strategy)
 
-  config.after(:each) do |example|
-    clean_example = example
-    clean_example = example.example if example.respond_to?(:example)
-
-    PseudoCleaner::MasterCleaner.end_example(clean_example)
+    begin
+      example.run
+    ensure
+      PseudoCleaner::MasterCleaner.end_example(test_example)
+    end
   end
 end

data/lib/pseudo_cleaner/spinach.rb

@@ -2,7 +2,7 @@ first_test_run = false
 
 # I haven't tested this fully yet, but I think that this should work.
 
-Spinach.hooks.before_scenario do |scenario, step_definitions|
+Spinach.hooks.around_scenario do |scenario_data, step_definitions, &block|
   unless first_test_run
     first_test_run = true
     # before tests run...
@@ -26,10 +26,12 @@ Spinach.hooks.before_scenario do |scenario, step_definitions|
                :pseudo_delete
              end
   PseudoCleaner::MasterCleaner.start_example(scenario, strategy)
-end
 
-Spinach.hooks.after_scenario do |scenario, step_definitions|
-  PseudoCleaner::MasterCleaner.end_example(scenario)
+  begin
+    block.call
+  ensure
+    PseudoCleaner::MasterCleaner.end_example(scenario)
+  end
 end
 
 Spinach.hooks.after_run do |status|

data/lib/pseudo_cleaner/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pseudo_cleaner
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - RealNobody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize